Browse Source

Ugly hack to remove references to Project

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@271486 13f79535-47bb-0310-9956-ffa450edef68
master
Peter Donald 24 years ago
parent
commit
7fe3d2cd00
2 changed files with 22 additions and 8 deletions
  1. +11
    -4
      proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Filter.java
  2. +11
    -4
      proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Filter.java

+ 11
- 4
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Filter.java View File

@@ -8,8 +8,9 @@
package org.apache.tools.ant.taskdefs; package org.apache.tools.ant.taskdefs;


import java.io.File; import java.io.File;
import org.apache.myrmidon.api.AbstractTask;
import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.api.TaskException;
import org.apache.tools.ant.Task;
import org.apache.tools.ant.types.FilterSet;


/** /**
* This task sets a token filter that is used by the file copy methods of the * This task sets a token filter that is used by the file copy methods of the
@@ -22,7 +23,7 @@ import org.apache.tools.ant.Task;
* @author <A href="gholam@xtra.co.nz">Michael McCallum</A> * @author <A href="gholam@xtra.co.nz">Michael McCallum</A>
*/ */
public class Filter public class Filter
extends Task
extends AbstractTask
{ {
private File filtersFile; private File filtersFile;


@@ -57,7 +58,7 @@ public class Filter


if( isSingleFilter ) if( isSingleFilter )
{ {
getProject().getGlobalFilterSet().addFilter( token, value );
getGlobalFilterSet().addFilter( token, value );
} }


if( isFiltersFromFile ) if( isFiltersFromFile )
@@ -70,6 +71,12 @@ public class Filter
throws TaskException throws TaskException
{ {
getLogger().debug( "Reading filters from " + filtersFile ); getLogger().debug( "Reading filters from " + filtersFile );
getProject().getGlobalFilterSet().readFiltersFromFile( filtersFile );
getGlobalFilterSet().readFiltersFromFile( filtersFile );
}

private FilterSet getGlobalFilterSet()
{
//Get filterset from a well known propety and replace it there
return null;
} }
} }

+ 11
- 4
proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Filter.java View File

@@ -8,8 +8,9 @@
package org.apache.tools.ant.taskdefs; package org.apache.tools.ant.taskdefs;


import java.io.File; import java.io.File;
import org.apache.myrmidon.api.AbstractTask;
import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.api.TaskException;
import org.apache.tools.ant.Task;
import org.apache.tools.ant.types.FilterSet;


/** /**
* This task sets a token filter that is used by the file copy methods of the * This task sets a token filter that is used by the file copy methods of the
@@ -22,7 +23,7 @@ import org.apache.tools.ant.Task;
* @author <A href="gholam@xtra.co.nz">Michael McCallum</A> * @author <A href="gholam@xtra.co.nz">Michael McCallum</A>
*/ */
public class Filter public class Filter
extends Task
extends AbstractTask
{ {
private File filtersFile; private File filtersFile;


@@ -57,7 +58,7 @@ public class Filter


if( isSingleFilter ) if( isSingleFilter )
{ {
getProject().getGlobalFilterSet().addFilter( token, value );
getGlobalFilterSet().addFilter( token, value );
} }


if( isFiltersFromFile ) if( isFiltersFromFile )
@@ -70,6 +71,12 @@ public class Filter
throws TaskException throws TaskException
{ {
getLogger().debug( "Reading filters from " + filtersFile ); getLogger().debug( "Reading filters from " + filtersFile );
getProject().getGlobalFilterSet().readFiltersFromFile( filtersFile );
getGlobalFilterSet().readFiltersFromFile( filtersFile );
}

private FilterSet getGlobalFilterSet()
{
//Get filterset from a well known propety and replace it there
return null;
} }
} }

Loading…
Cancel
Save