From d052a7f47b6c32077a772c02be1eb53b520ca680 Mon Sep 17 00:00:00 2001
From: Peter Donald <donaldp@apache.org>
Date: Sun, 30 Dec 2001 00:11:44 +0000
Subject: [PATCH] made method to create filters protected so it can be used by
 Move subclass

Removed all notion of setting log level as it is no longer used.


git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@270412 13f79535-47bb-0310-9956-ffa450edef68
---
 .../apache/tools/ant/taskdefs/file/Copy.java  | 27 ++-----------------
 .../apache/tools/ant/taskdefs/file/Copy.java  | 27 ++-----------------
 2 files changed, 4 insertions(+), 50 deletions(-)

diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/file/Copy.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/file/Copy.java
index ca570f749..1386b0b87 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/file/Copy.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/file/Copy.java
@@ -55,7 +55,6 @@ public class Copy
     private boolean m_preserveLastModified;
     private boolean m_forceOverwrite;
     private boolean m_flatten;
-    private int m_verbosity = Project.MSG_VERBOSE;
     private boolean m_includeEmpty = true;
 
     private Hashtable m_fileCopyMap = new Hashtable();
@@ -148,23 +147,6 @@ public class Copy
         m_destFile = destFile;
     }
 
-    /**
-     * Used to force listing of all names of copied files.
-     *
-     * @param verbose The new Verbose value
-     */
-    public void setVerbose( final boolean verbose )
-    {
-        if( verbose )
-        {
-            m_verbosity = Project.MSG_INFO;
-        }
-        else
-        {
-            m_verbosity = Project.MSG_VERBOSE;
-        }
-    }
-
     /**
      * Adds a set of files (nested fileset attribute).
      *
@@ -200,7 +182,7 @@ public class Copy
         {
             throw new TaskException( "Cannot define more than one mapper" );
         }
-        m_mapperElement = new Mapper( getProject() );
+        m_mapperElement = new Mapper();
         return m_mapperElement;
     }
 
@@ -413,7 +395,7 @@ public class Copy
         }
     }
 
-    private FilterSetCollection buildFilterSet()
+    protected final FilterSetCollection buildFilterSet()
     {
         final FilterSetCollection executionFilters = new FilterSetCollection();
         if( m_filtering )
@@ -550,11 +532,6 @@ public class Copy
         return m_forceOverwrite;
     }
 
-    protected int getVerbosity()
-    {
-        return m_verbosity;
-    }
-
     protected boolean isIncludeEmpty()
     {
         return m_includeEmpty;
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/file/Copy.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/file/Copy.java
index ca570f749..1386b0b87 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/file/Copy.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/file/Copy.java
@@ -55,7 +55,6 @@ public class Copy
     private boolean m_preserveLastModified;
     private boolean m_forceOverwrite;
     private boolean m_flatten;
-    private int m_verbosity = Project.MSG_VERBOSE;
     private boolean m_includeEmpty = true;
 
     private Hashtable m_fileCopyMap = new Hashtable();
@@ -148,23 +147,6 @@ public class Copy
         m_destFile = destFile;
     }
 
-    /**
-     * Used to force listing of all names of copied files.
-     *
-     * @param verbose The new Verbose value
-     */
-    public void setVerbose( final boolean verbose )
-    {
-        if( verbose )
-        {
-            m_verbosity = Project.MSG_INFO;
-        }
-        else
-        {
-            m_verbosity = Project.MSG_VERBOSE;
-        }
-    }
-
     /**
      * Adds a set of files (nested fileset attribute).
      *
@@ -200,7 +182,7 @@ public class Copy
         {
             throw new TaskException( "Cannot define more than one mapper" );
         }
-        m_mapperElement = new Mapper( getProject() );
+        m_mapperElement = new Mapper();
         return m_mapperElement;
     }
 
@@ -413,7 +395,7 @@ public class Copy
         }
     }
 
-    private FilterSetCollection buildFilterSet()
+    protected final FilterSetCollection buildFilterSet()
     {
         final FilterSetCollection executionFilters = new FilterSetCollection();
         if( m_filtering )
@@ -550,11 +532,6 @@ public class Copy
         return m_forceOverwrite;
     }
 
-    protected int getVerbosity()
-    {
-        return m_verbosity;
-    }
-
     protected boolean isIncludeEmpty()
     {
         return m_includeEmpty;