Browse Source

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


git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@274631 13f79535-47bb-0310-9956-ffa450edef68
master
Antoine Levy-Lambert 22 years ago
parent
commit
bca445f362
2 changed files with 30 additions and 0 deletions
  1. +19
    -0
      src/main/org/apache/tools/ant/taskdefs/MatchingTask.java
  2. +11
    -0
      src/main/org/apache/tools/ant/types/selectors/SelectorContainer.java

+ 19
- 0
src/main/org/apache/tools/ant/taskdefs/MatchingTask.java View File

@@ -68,6 +68,7 @@ import org.apache.tools.ant.types.selectors.ContainsSelector;
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.PresentSelector;
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
@@ -416,6 +418,23 @@ public abstract class MatchingTask extends Task implements SelectorContainer {
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);
}

/**
* Accessor for the implict fileset.
*


+ 11
- 0
src/main/org/apache/tools/ant/types/selectors/SelectorContainer.java View File

@@ -178,5 +178,16 @@ public interface SelectorContainer {
*/
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);
}


Loading…
Cancel
Save