peterreilly    2003/08/13 06:44:26

  Modified:    src/main/org/apache/tools/ant UnknownElement.java
               src/main/org/apache/tools/ant/filters TokenFilter.java
  Log:
  Two of the files in 22326
  PR: 22326
  Obtained from: Martijn Kruithof
  
  Revision  Changes    Path
  1.61      +1 -1      ant/src/main/org/apache/tools/ant/UnknownElement.java
  
  Index: UnknownElement.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/UnknownElement.java,v
  retrieving revision 1.60
  retrieving revision 1.61
  diff -u -r1.60 -r1.61
  --- UnknownElement.java       13 Aug 2003 13:18:54 -0000      1.60
  +++ UnknownElement.java       13 Aug 2003 13:44:26 -0000      1.61
  @@ -159,7 +159,7 @@
        * @return the configuration info.
        */
       public RuntimeConfigurable getWrapper() {
  -        return wrapper;
  +        return super.getWrapper();
       }
   
       /**
  
  
  
  1.11      +1 -1      
ant/src/main/org/apache/tools/ant/filters/TokenFilter.java
  
  Index: TokenFilter.java
  ===================================================================
  RCS file: 
/home/cvs/ant/src/main/org/apache/tools/ant/filters/TokenFilter.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- TokenFilter.java  23 Jul 2003 11:32:12 -0000      1.10
  +++ TokenFilter.java  13 Aug 2003 13:44:26 -0000      1.11
  @@ -654,7 +654,7 @@
               }
               regularExpression = new RegularExpression();
               regularExpression.setPattern(from);
  -            regexp = regularExpression.getRegexp(project);
  +            regexp = regularExpression.getRegexp(getProject());
               if (to == null) {
                   to = "";
               }
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to