Browse Source

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
master
Peter Donald 23 years ago
parent
commit
d052a7f47b
2 changed files with 4 additions and 50 deletions
  1. +2
    -25
      proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/file/Copy.java
  2. +2
    -25
      proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/file/Copy.java

+ 2
- 25
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/file/Copy.java View File

@@ -55,7 +55,6 @@ public class Copy
private boolean m_preserveLastModified; private boolean m_preserveLastModified;
private boolean m_forceOverwrite; private boolean m_forceOverwrite;
private boolean m_flatten; private boolean m_flatten;
private int m_verbosity = Project.MSG_VERBOSE;
private boolean m_includeEmpty = true; private boolean m_includeEmpty = true;


private Hashtable m_fileCopyMap = new Hashtable(); private Hashtable m_fileCopyMap = new Hashtable();
@@ -148,23 +147,6 @@ public class Copy
m_destFile = destFile; 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). * Adds a set of files (nested fileset attribute).
* *
@@ -200,7 +182,7 @@ public class Copy
{ {
throw new TaskException( "Cannot define more than one mapper" ); throw new TaskException( "Cannot define more than one mapper" );
} }
m_mapperElement = new Mapper( getProject() );
m_mapperElement = new Mapper();
return m_mapperElement; return m_mapperElement;
} }


@@ -413,7 +395,7 @@ public class Copy
} }
} }


private FilterSetCollection buildFilterSet()
protected final FilterSetCollection buildFilterSet()
{ {
final FilterSetCollection executionFilters = new FilterSetCollection(); final FilterSetCollection executionFilters = new FilterSetCollection();
if( m_filtering ) if( m_filtering )
@@ -550,11 +532,6 @@ public class Copy
return m_forceOverwrite; return m_forceOverwrite;
} }


protected int getVerbosity()
{
return m_verbosity;
}

protected boolean isIncludeEmpty() protected boolean isIncludeEmpty()
{ {
return m_includeEmpty; return m_includeEmpty;


+ 2
- 25
proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/file/Copy.java View File

@@ -55,7 +55,6 @@ public class Copy
private boolean m_preserveLastModified; private boolean m_preserveLastModified;
private boolean m_forceOverwrite; private boolean m_forceOverwrite;
private boolean m_flatten; private boolean m_flatten;
private int m_verbosity = Project.MSG_VERBOSE;
private boolean m_includeEmpty = true; private boolean m_includeEmpty = true;


private Hashtable m_fileCopyMap = new Hashtable(); private Hashtable m_fileCopyMap = new Hashtable();
@@ -148,23 +147,6 @@ public class Copy
m_destFile = destFile; 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). * Adds a set of files (nested fileset attribute).
* *
@@ -200,7 +182,7 @@ public class Copy
{ {
throw new TaskException( "Cannot define more than one mapper" ); throw new TaskException( "Cannot define more than one mapper" );
} }
m_mapperElement = new Mapper( getProject() );
m_mapperElement = new Mapper();
return m_mapperElement; return m_mapperElement;
} }


@@ -413,7 +395,7 @@ public class Copy
} }
} }


private FilterSetCollection buildFilterSet()
protected final FilterSetCollection buildFilterSet()
{ {
final FilterSetCollection executionFilters = new FilterSetCollection(); final FilterSetCollection executionFilters = new FilterSetCollection();
if( m_filtering ) if( m_filtering )
@@ -550,11 +532,6 @@ public class Copy
return m_forceOverwrite; return m_forceOverwrite;
} }


protected int getVerbosity()
{
return m_verbosity;
}

protected boolean isIncludeEmpty() protected boolean isIncludeEmpty()
{ {
return m_includeEmpty; return m_includeEmpty;


Loading…
Cancel
Save