From 7c59613e550be20653ba5a61017ce1d0e2c954b5 Mon Sep 17 00:00:00 2001
From: Peter Donald <donaldp@apache.org>
Date: Sun, 27 Jan 2002 09:37:35 +0000
Subject: [PATCH] Extend the framework fileset

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@270936 13f79535-47bb-0310-9956-ffa450edef68
---
 .../org/apache/tools/ant/types/FileSet.java   | 76 +------------------
 .../org/apache/tools/ant/types/FileSet.java   | 76 +------------------
 2 files changed, 2 insertions(+), 150 deletions(-)

diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/types/FileSet.java b/proposal/myrmidon/src/main/org/apache/tools/ant/types/FileSet.java
index 10dbab09d..0087d200d 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/types/FileSet.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/types/FileSet.java
@@ -25,10 +25,8 @@ import org.apache.myrmidon.framework.PatternSet;
  * @author <a href="mailto:umagesh@rediffmail.com">Magesh Umasankar</a>
  */
 public class FileSet
+    extends org.apache.myrmidon.framework.FileSet
 {
-    private File m_dir;
-    private PatternSet m_patternSet = new PatternSet();
-    private boolean m_useDefaultExcludes = true;
     private boolean m_isCaseSensitive = true;
 
     /**
@@ -39,80 +37,8 @@ public class FileSet
         m_isCaseSensitive = isCaseSensitive;
     }
 
-    /**
-     * Sets whether default exclusions should be used or not.
-     */
-    public void setDefaultexcludes( final boolean useDefaultExcludes )
-    {
-        m_useDefaultExcludes = useDefaultExcludes;
-    }
-
-    public void setDir( final File dir )
-        throws TaskException
-    {
-        m_dir = dir;
-    }
-
-    /**
-     * Sets the set of exclude patterns. Patterns may be separated by a comma or
-     * a space.
-     *
-     * @param excludes the string containing the exclude patterns
-     */
-    public void setExcludes( final String excludes )
-    {
-        m_patternSet.setExcludes( excludes );
-    }
-
-    /**
-     * add a name entry on the exclude list
-     */
-    public void addExclude( final Pattern pattern )
-    {
-        m_patternSet.addExclude( pattern );
-    }
-
-    /**
-     * add a name entry on the include list
-     */
-    public void addInclude( final Pattern pattern )
-    {
-        m_patternSet.addInclude( pattern );
-    }
-
-    public void addPatternSet( final PatternSet set )
-    {
-        m_patternSet.append( set );
-    }
-
-    /**
-     * Sets the set of include patterns. Patterns may be separated by a comma or
-     * a space.
-     *
-     * @param includes the string containing the include patterns
-     */
-    public void setIncludes( final String includes )
-    {
-        m_patternSet.setIncludes( includes );
-    }
-
-    public final PatternSet getPatternSet()
-    {
-        return m_patternSet;
-    }
-
     public boolean isCaseSensitive()
     {
         return m_isCaseSensitive;
     }
-
-    public boolean useDefaultExcludes()
-    {
-        return m_useDefaultExcludes;
-    }
-
-    public File getDir()
-    {
-        return m_dir;
-    }
 }
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/types/FileSet.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/types/FileSet.java
index 10dbab09d..0087d200d 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/types/FileSet.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/types/FileSet.java
@@ -25,10 +25,8 @@ import org.apache.myrmidon.framework.PatternSet;
  * @author <a href="mailto:umagesh@rediffmail.com">Magesh Umasankar</a>
  */
 public class FileSet
+    extends org.apache.myrmidon.framework.FileSet
 {
-    private File m_dir;
-    private PatternSet m_patternSet = new PatternSet();
-    private boolean m_useDefaultExcludes = true;
     private boolean m_isCaseSensitive = true;
 
     /**
@@ -39,80 +37,8 @@ public class FileSet
         m_isCaseSensitive = isCaseSensitive;
     }
 
-    /**
-     * Sets whether default exclusions should be used or not.
-     */
-    public void setDefaultexcludes( final boolean useDefaultExcludes )
-    {
-        m_useDefaultExcludes = useDefaultExcludes;
-    }
-
-    public void setDir( final File dir )
-        throws TaskException
-    {
-        m_dir = dir;
-    }
-
-    /**
-     * Sets the set of exclude patterns. Patterns may be separated by a comma or
-     * a space.
-     *
-     * @param excludes the string containing the exclude patterns
-     */
-    public void setExcludes( final String excludes )
-    {
-        m_patternSet.setExcludes( excludes );
-    }
-
-    /**
-     * add a name entry on the exclude list
-     */
-    public void addExclude( final Pattern pattern )
-    {
-        m_patternSet.addExclude( pattern );
-    }
-
-    /**
-     * add a name entry on the include list
-     */
-    public void addInclude( final Pattern pattern )
-    {
-        m_patternSet.addInclude( pattern );
-    }
-
-    public void addPatternSet( final PatternSet set )
-    {
-        m_patternSet.append( set );
-    }
-
-    /**
-     * Sets the set of include patterns. Patterns may be separated by a comma or
-     * a space.
-     *
-     * @param includes the string containing the include patterns
-     */
-    public void setIncludes( final String includes )
-    {
-        m_patternSet.setIncludes( includes );
-    }
-
-    public final PatternSet getPatternSet()
-    {
-        return m_patternSet;
-    }
-
     public boolean isCaseSensitive()
     {
         return m_isCaseSensitive;
     }
-
-    public boolean useDefaultExcludes()
-    {
-        return m_useDefaultExcludes;
-    }
-
-    public File getDir()
-    {
-        return m_dir;
-    }
 }