cvs commit: jakarta-ant/src/main/org/apache/tools/ant Project.java

[bodewig]

bodewig     00/09/18 01:50:08

  Modified:    src/main/org/apache/tools/ant Project.java
  Log:
  Make filtering of the copy tasks work with leading @ characters.
  PR: #129 (bug #32)
  
  Revision  Changes    Path
  1.39      +3 -3      jakarta-ant/src/main/org/apache/tools/ant/Project.java
  
  Index: Project.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/Project.java,v
  retrieving revision 1.38
  retrieving revision 1.39
  diff -u -r1.38 -r1.39
  --- Project.java      2000/09/18 07:54:58     1.38
  +++ Project.java      2000/09/18 08:50:08     1.39
  @@ -769,12 +769,12 @@
                           value = (String) tokens.get(token);
                           log("Replacing: " + TOKEN_START + token + TOKEN_END 
+ " -> " + value, MSG_VERBOSE);
                           b.append(value);
  +                        i = index + TOKEN_START.length() + token.length() + 
TOKEN_END.length();
                       } else {
  +                        // just append TOKEN_START and search further
                           b.append(TOKEN_START);
  -                        b.append(token);
  -                        b.append(TOKEN_END);
  +                        i = index + TOKEN_START.length();
                       }
  -                    i = index + TOKEN_START.length() + token.length() + 
TOKEN_END.length();
                   } while ((index = s.indexOf(TOKEN_START, i)) > -1);
   
                   b.append(s.substring(i));