From 13e89f3197245c5888e32971c39ccb143f898ae3 Mon Sep 17 00:00:00 2001
From: Peter Donald <donaldp@apache.org>
Date: Thu, 14 Feb 2002 10:49:34 +0000
Subject: [PATCH] Move filter class into framework

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@271337 13f79535-47bb-0310-9956-ffa450edef68
---
 .../apache/myrmidon/framework}/Filter.java    |  2 +-
 .../org/apache/tools/ant/types/FilterSet.java |  1 +
 .../org/apache/tools/ant/types/Filter.java    | 78 -------------------
 .../org/apache/tools/ant/types/FilterSet.java |  1 +
 4 files changed, 3 insertions(+), 79 deletions(-)
 rename proposal/myrmidon/src/{main/org/apache/tools/ant/types => java/org/apache/myrmidon/framework}/Filter.java (97%)
 delete mode 100644 proposal/myrmidon/src/todo/org/apache/tools/ant/types/Filter.java

diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/types/Filter.java b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/Filter.java
similarity index 97%
rename from proposal/myrmidon/src/main/org/apache/tools/ant/types/Filter.java
rename to proposal/myrmidon/src/java/org/apache/myrmidon/framework/Filter.java
index b82949da8..d8e3e9fe3 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/types/Filter.java
+++ b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/Filter.java
@@ -5,7 +5,7 @@
  * version 1.1, a copy of which has been included  with this distribution in
  * the LICENSE.txt file.
  */
-package org.apache.tools.ant.types;
+package org.apache.myrmidon.framework;
 
 /**
  * Individual filter component of filterset
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/types/FilterSet.java b/proposal/myrmidon/src/main/org/apache/tools/ant/types/FilterSet.java
index 19973aefc..c59ab4c1a 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/types/FilterSet.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/types/FilterSet.java
@@ -16,6 +16,7 @@ import java.util.Hashtable;
 import java.util.Iterator;
 import java.util.Properties;
 import org.apache.myrmidon.api.TaskException;
+import org.apache.myrmidon.framework.Filter;
 import org.apache.tools.ant.ProjectComponent;
 
 /**
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/types/Filter.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/types/Filter.java
deleted file mode 100644
index b82949da8..000000000
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/types/Filter.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright (C) The Apache Software Foundation. All rights reserved.
- *
- * This software is published under the terms of the Apache Software License
- * version 1.1, a copy of which has been included  with this distribution in
- * the LICENSE.txt file.
- */
-package org.apache.tools.ant.types;
-
-/**
- * Individual filter component of filterset
- *
- * @author Michael McCallum
- * @created 14 March 2001
- */
-public class Filter
-{
-    /**
-     * Token which will be replaced in the filter operation
-     */
-    private String m_token;
-
-    /**
-     * The value which will replace the token in the filtering operation
-     */
-    private String m_value;
-
-    /**
-     * Constructor for the Filter object
-     *
-     * @param token The token which will be replaced when filtering
-     * @param value The value which will replace the token when filtering
-     */
-    public Filter( final String token, final String value )
-    {
-        m_token = token;
-        m_value = value;
-    }
-
-    /**
-     * No argument conmstructor
-     */
-    public Filter()
-    {
-    }
-
-    /**
-     * Sets the Token attribute of the Filter object
-     */
-    public void setToken( final String token )
-    {
-        m_token = token;
-    }
-
-    /**
-     * Sets the Value attribute of the Filter object
-     */
-    public void setValue( final String value )
-    {
-        m_value = value;
-    }
-
-    /**
-     * Gets the Token attribute of the Filter object
-     */
-    public String getToken()
-    {
-        return m_token;
-    }
-
-    /**
-     * Gets the Value attribute of the Filter object
-     */
-    public String getValue()
-    {
-        return m_value;
-    }
-}
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/types/FilterSet.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/types/FilterSet.java
index 19973aefc..c59ab4c1a 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/types/FilterSet.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/types/FilterSet.java
@@ -16,6 +16,7 @@ import java.util.Hashtable;
 import java.util.Iterator;
 import java.util.Properties;
 import org.apache.myrmidon.api.TaskException;
+import org.apache.myrmidon.framework.Filter;
 import org.apache.tools.ant.ProjectComponent;
 
 /**