ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From umag...@apache.org
Subject cvs commit: jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/i18n Translate.java
Date Tue, 14 Jan 2003 18:39:57 GMT
umagesh     2003/01/14 10:39:56

  Modified:    .        WHATSNEW
               src/main/org/apache/tools/ant/taskdefs/optional/i18n
                        Translate.java
  Log:
  Translate not ignoring comment lines
  
  PR: 16042
  Submitted by: morpheus@smi.stanford.edu (Mark Woon)
  
  Revision  Changes    Path
  1.339     +2 -0      jakarta-ant/WHATSNEW
  
  Index: WHATSNEW
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/WHATSNEW,v
  retrieving revision 1.338
  retrieving revision 1.339
  diff -u -r1.338 -r1.339
  --- WHATSNEW	13 Jan 2003 15:52:11 -0000	1.338
  +++ WHATSNEW	14 Jan 2003 18:39:55 -0000	1.339
  @@ -19,6 +19,8 @@
   
   Fixed bugs:
   -----------
  +* <translate> was not ignoring comment lines.
  +
   * Expand tasks did not behave as expected with PatternSets.
   
   * <property environment=... /> now works on OS/400.
  
  
  
  1.18      +1 -2      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/i18n/Translate.java
  
  Index: Translate.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/i18n/Translate.java,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- Translate.java	21 Nov 2002 21:35:41 -0000	1.17
  +++ Translate.java	14 Jan 2003 18:39:56 -0000	1.18
  @@ -410,8 +410,7 @@
               String line = null;
               while ((line = in.readLine()) != null) {
                   //So long as the line isn't empty and isn't a comment...
  -                if (line.trim().length() > 1 &&
  -                   ('#' != line.charAt(0) || '!' != line.charAt(0))) {
  +                if (line.trim().length() > 1 && '#' != line.charAt(0) &&
'!' != line.charAt(0)) {
                       //Legal Key-Value separators are :, = and white space.
                       int sepIndex = line.indexOf('=');
                       if (-1 == sepIndex) {
  
  
  

--
To unsubscribe, e-mail:   <mailto:ant-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:ant-dev-help@jakarta.apache.org>


Mime
View raw message