From bca445f362aa827e1cd05dc87699faea1616f646 Mon Sep 17 00:00:00 2001 From: Antoine Levy-Lambert Date: Wed, 28 May 2003 13:21:24 +0000 Subject: [PATCH] Followed Peter Reilly's suggestion and added support for the selectors and 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 --- .../tools/ant/taskdefs/MatchingTask.java | 19 +++++++++++++++++++ .../types/selectors/SelectorContainer.java | 11 +++++++++++ 2 files changed, 30 insertions(+) diff --git a/src/main/org/apache/tools/ant/taskdefs/MatchingTask.java b/src/main/org/apache/tools/ant/taskdefs/MatchingTask.java index 0273e8407..b7f72962b 100644 --- a/src/main/org/apache/tools/ant/taskdefs/MatchingTask.java +++ b/src/main/org/apache/tools/ant/taskdefs/MatchingTask.java @@ -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. * diff --git a/src/main/org/apache/tools/ant/types/selectors/SelectorContainer.java b/src/main/org/apache/tools/ant/types/selectors/SelectorContainer.java index 58095bdc6..07b4b64d9 100644 --- a/src/main/org/apache/tools/ant/types/selectors/SelectorContainer.java +++ b/src/main/org/apache/tools/ant/types/selectors/SelectorContainer.java @@ -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); }