cvs commit: ant/src/main/org/apache/tools/ant/types/selectors SelectorContainer.java

[antoine]

antoine     2003/05/28 06:21:24

  Modified:    src/main/org/apache/tools/ant/taskdefs MatchingTask.java
               src/main/org/apache/tools/ant/types/selectors
                        SelectorContainer.java
  Log:
  Followed Peter Reilly's suggestion and added support for the selectors
  <different> and <type> in SelectorContainer and MatchingTask.
  This type of changes will soon become history.
  PR: 20220
  
  Revision  Changes    Path
  1.35      +19 -0     
ant/src/main/org/apache/tools/ant/taskdefs/MatchingTask.java
  
  Index: MatchingTask.java
  ===================================================================
  RCS file: 
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/MatchingTask.java,v
  retrieving revision 1.34
  retrieving revision 1.35
  diff -u -r1.34 -r1.35
  --- MatchingTask.java 14 Apr 2003 07:53:07 -0000      1.34
  +++ MatchingTask.java 28 May 2003 13:21:24 -0000      1.35
  @@ -68,6 +68,7 @@
   import org.apache.tools.ant.types.selectors.DateSelector;
   import org.apache.tools.ant.types.selectors.DependSelector;
   import org.apache.tools.ant.types.selectors.DepthSelector;
  +import org.apache.tools.ant.types.selectors.DifferentSelector;
   import org.apache.tools.ant.types.selectors.ExtendSelector;
   import org.apache.tools.ant.types.selectors.FileSelector;
   import org.apache.tools.ant.types.selectors.FilenameSelector;
  @@ -79,6 +80,7 @@
   import org.apache.tools.ant.types.selectors.SelectSelector;
   import org.apache.tools.ant.types.selectors.SelectorContainer;
   import org.apache.tools.ant.types.selectors.SizeSelector;
  +import org.apache.tools.ant.types.selectors.TypeSelector;
   
   /**
    * This is an abstract task that should be used by all those tasks that
  @@ -414,6 +416,23 @@
        */
       public void addContainsRegexp(ContainsRegexpSelector selector) {
           fileset.addContainsRegexp(selector);
  +    }
  +
  +    /**
  +     * add a type selector entry on the type list
  +     * @param selector
  +     * @since ant 1.6
  +     */
  +    public void addDifferent(DifferentSelector selector) {
  +        fileset.addDifferent(selector);
  +    }
  +    /**
  +     * add a type selector entry on the type list
  +     * @param selector
  +     * @since ant 1.6
  +     */
  +    public void addType(TypeSelector selector) {
  +        fileset.addType(selector);
       }
   
       /**
  
  
  
  1.6       +11 -0     
ant/src/main/org/apache/tools/ant/types/selectors/SelectorContainer.java
  
  Index: SelectorContainer.java
  ===================================================================
  RCS file: 
/home/cvs/ant/src/main/org/apache/tools/ant/types/selectors/SelectorContainer.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- SelectorContainer.java    14 Apr 2003 07:53:07 -0000      1.5
  +++ SelectorContainer.java    28 May 2003 13:21:24 -0000      1.6
  @@ -178,5 +178,16 @@
        */
       public void addContainsRegexp(ContainsRegexpSelector selector);
   
  +    /**
  +     * add the type selector
  +     * @since ant 1.6
  +     */
  +    public void addType(TypeSelector selector);
  +
  +    /**
  +     * add the different selector
  +     * @since ant 1.6
  +     */
  +    public void addDifferent(DifferentSelector selector);
   }