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

[bodewig]

bodewig     01/09/27 04:27:24

  Modified:    src/main/org/apache/tools/ant Tag: ANT_14_BRANCH
                        ProjectHelper.java Target.java
  Log:
  More robust parsing of Target's depends attribute.
  
  PR: 3390
  Submitted by: Phil Hanna <[EMAIL PROTECTED]>
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.60.2.2  +1 -5      
jakarta-ant/src/main/org/apache/tools/ant/ProjectHelper.java
  
  Index: ProjectHelper.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-ant/src/main/org/apache/tools/ant/ProjectHelper.java,v
  retrieving revision 1.60.2.1
  retrieving revision 1.60.2.2
  diff -u -r1.60.2.1 -r1.60.2.2
  --- ProjectHelper.java        2001/08/19 05:48:27     1.60.2.1
  +++ ProjectHelper.java        2001/09/27 11:27:24     1.60.2.2
  @@ -421,11 +421,7 @@
               // take care of dependencies
   
               if (depends.length() > 0) {
  -                StringTokenizer tok =
  -                    new StringTokenizer(depends, ",", false);
  -                while (tok.hasMoreTokens()) {
  -                    target.addDependency(tok.nextToken().trim());
  -                }
  +                target.setDepends(depends);
               }
           }
   
  
  
  
  1.22.2.1  +4 -1      jakarta-ant/src/main/org/apache/tools/ant/Target.java
  
  Index: Target.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/Target.java,v
  retrieving revision 1.22
  retrieving revision 1.22.2.1
  diff -u -r1.22 -r1.22.2.1
  --- Target.java       2001/08/02 11:42:55     1.22
  +++ Target.java       2001/09/27 11:27:24     1.22.2.1
  @@ -85,7 +85,10 @@
               StringTokenizer tok =
                   new StringTokenizer(depS, ",", false);
               while (tok.hasMoreTokens()) {
  -                addDependency(tok.nextToken().trim());
  +                String token = tok.nextToken().trim();
  +                if (!token.equals("")) {
  +                    addDependency(token);
  +                }
               }
           }
       }