adammurdoch 2002/06/25 00:44:18
Modified: framework/src/java/org/apache/myrmidon/framework
Pattern.java
framework/src/java/org/apache/myrmidon/framework/conditions
AndCondition.java
framework/src/java/org/apache/myrmidon/framework/file
Path.java
framework/src/test/org/apache/myrmidon/framework/test
TestType.java
antlib/src/java/org/apache/antlib/extensions
ExtensionAdapter.java ExtensionSet.java
antlib/src/java/org/apache/antlib/vfile FileList.java
FileSet.java
antlib/src/java/org/apache/antlib/vfile/selectors
AndFileSelector.java
antlib/src/test/org/apache/antlib/core/test
PropertyTestType.java
antlib/src/test/org/apache/antlib/runtime/test
ConverterDefTestType.java TypeDefTestType.java
Log:
Not need to implement DataType any more.
Revision Changes Path
1.3 +1 -2
jakarta-ant-myrmidon/framework/src/java/org/apache/myrmidon/framework/Pattern.java
Index: Pattern.java
===================================================================
RCS file:
/home/cvs/jakarta-ant-myrmidon/framework/src/java/org/apache/myrmidon/framework/Pattern.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Pattern.java 23 May 2002 01:50:26 -0000 1.2
+++ Pattern.java 25 Jun 2002 07:44:18 -0000 1.3
@@ -23,7 +23,6 @@
* @ant.data-type name="pattern"
*/
public class Pattern
- implements DataType
{
private static final Resources REZ =
ResourceManager.getPackageResources( Pattern.class );
1.3 +2 -3
jakarta-ant-myrmidon/framework/src/java/org/apache/myrmidon/framework/conditions/AndCondition.java
Index: AndCondition.java
===================================================================
RCS file:
/home/cvs/jakarta-ant-myrmidon/framework/src/java/org/apache/myrmidon/framework/conditions/AndCondition.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AndCondition.java 23 Jun 2002 10:44:40 -0000 1.2
+++ AndCondition.java 25 Jun 2002 07:44:18 -0000 1.3
@@ -10,7 +10,6 @@
import java.util.ArrayList;
import org.apache.myrmidon.api.TaskContext;
import org.apache.myrmidon.api.TaskException;
-import org.apache.myrmidon.framework.DataType;
/**
* <and> condition container. <p>
@@ -25,7 +24,7 @@
* @ant.data-type name="condition-set"
*/
public class AndCondition
- implements Condition, DataType
+ implements Condition
{
private final ArrayList m_conditions = new ArrayList();
1.4 +1 -2
jakarta-ant-myrmidon/framework/src/java/org/apache/myrmidon/framework/file/Path.java
Index: Path.java
===================================================================
RCS file:
/home/cvs/jakarta-ant-myrmidon/framework/src/java/org/apache/myrmidon/framework/file/Path.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Path.java 27 May 2002 13:04:03 -0000 1.3
+++ Path.java 25 Jun 2002 07:44:18 -0000 1.4
@@ -11,7 +11,6 @@
import java.util.ArrayList;
import org.apache.myrmidon.api.TaskContext;
import org.apache.myrmidon.api.TaskException;
-import org.apache.myrmidon.framework.DataType;
import org.apache.myrmidon.framework.FileSet;
import org.apache.tools.todo.types.DirectoryScanner;
import org.apache.tools.todo.types.ScannerUtil;
@@ -52,7 +51,7 @@
* @ant.type type="path" name="path"
*/
public class Path
- implements DataType, FileList
+ implements FileList
{
private final ArrayList m_elements = new ArrayList();
1.2 +2 -3
jakarta-ant-myrmidon/framework/src/test/org/apache/myrmidon/framework/test/TestType.java
Index: TestType.java
===================================================================
RCS file:
/home/cvs/jakarta-ant-myrmidon/framework/src/test/org/apache/myrmidon/framework/test/TestType.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestType.java 5 Jun 2002 07:58:22 -0000 1.1
+++ TestType.java 25 Jun 2002 07:44:18 -0000 1.2
@@ -8,7 +8,6 @@
package org.apache.myrmidon.framework.test;
import org.apache.aut.AbstractAutTestCase;
-import org.apache.myrmidon.framework.DataType;
/**
* A test data-type.
@@ -18,7 +17,7 @@
*
* @ant.data-type name="test-type"
*/
-public class TestType implements DataType
+public class TestType
{
private String m_prop1;
1.3 +1 -3
jakarta-ant-myrmidon/antlib/src/java/org/apache/antlib/extensions/ExtensionAdapter.java
Index: ExtensionAdapter.java
===================================================================
RCS file:
/home/cvs/jakarta-ant-myrmidon/antlib/src/java/org/apache/antlib/extensions/ExtensionAdapter.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ExtensionAdapter.java 16 Apr 2002 11:13:36 -0000 1.2
+++ ExtensionAdapter.java 25 Jun 2002 07:44:18 -0000 1.3
@@ -12,7 +12,6 @@
import org.apache.avalon.excalibur.i18n.ResourceManager;
import org.apache.avalon.excalibur.i18n.Resources;
import org.apache.myrmidon.api.TaskException;
-import org.apache.myrmidon.framework.DataType;
/**
* Simple class that represents an Extension and conforms to Ants
@@ -23,7 +22,6 @@
* @ant.data-type name="extension"
*/
public class ExtensionAdapter
- implements DataType
{
private static final Resources REZ =
ResourceManager.getPackageResources( ExtensionAdapter.class );
1.2 +1 -3
jakarta-ant-myrmidon/antlib/src/java/org/apache/antlib/extensions/ExtensionSet.java
Index: ExtensionSet.java
===================================================================
RCS file:
/home/cvs/jakarta-ant-myrmidon/antlib/src/java/org/apache/antlib/extensions/ExtensionSet.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ExtensionSet.java 14 Apr 2002 10:55:07 -0000 1.1
+++ ExtensionSet.java 25 Jun 2002 07:44:18 -0000 1.2
@@ -10,7 +10,6 @@
import java.util.ArrayList;
import org.apache.avalon.excalibur.extension.Extension;
import org.apache.myrmidon.api.TaskException;
-import org.apache.myrmidon.framework.DataType;
/**
* The Extension set lists a set of "Optional Packages" /
@@ -21,7 +20,6 @@
* @ant.data-type name="extension-set"
*/
public class ExtensionSet
- implements DataType
{
/**
* ExtensionAdapter objects representing extensions.
1.3 +0 -2
jakarta-ant-myrmidon/antlib/src/java/org/apache/antlib/vfile/FileList.java
Index: FileList.java
===================================================================
RCS file:
/home/cvs/jakarta-ant-myrmidon/antlib/src/java/org/apache/antlib/vfile/FileList.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- FileList.java 24 Apr 2002 02:20:58 -0000 1.2
+++ FileList.java 25 Jun 2002 07:44:18 -0000 1.3
@@ -10,7 +10,6 @@
import org.apache.aut.vfs.FileObject;
import org.apache.myrmidon.api.TaskContext;
import org.apache.myrmidon.api.TaskException;
-import org.apache.myrmidon.framework.DataType;
/**
* An ordered list of files.
@@ -20,7 +19,6 @@
* @ant.role name="v-path"
*/
public interface FileList
- extends DataType
{
/**
* Returns the files in the list.
1.3 +0 -2
jakarta-ant-myrmidon/antlib/src/java/org/apache/antlib/vfile/FileSet.java
Index: FileSet.java
===================================================================
RCS file:
/home/cvs/jakarta-ant-myrmidon/antlib/src/java/org/apache/antlib/vfile/FileSet.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- FileSet.java 24 Apr 2002 02:20:58 -0000 1.2
+++ FileSet.java 25 Jun 2002 07:44:18 -0000 1.3
@@ -9,7 +9,6 @@
import org.apache.myrmidon.api.TaskContext;
import org.apache.myrmidon.api.TaskException;
-import org.apache.myrmidon.framework.DataType;
/**
* A set of files, where each file in the list has a virtual path associated
@@ -20,7 +19,6 @@
* @ant.role name="v-fileset"
*/
public interface FileSet
- extends DataType
{
/**
* Returns the contents of the set.
1.3 +2 -3
jakarta-ant-myrmidon/antlib/src/java/org/apache/antlib/vfile/selectors/AndFileSelector.java
Index: AndFileSelector.java
===================================================================
RCS file:
/home/cvs/jakarta-ant-myrmidon/antlib/src/java/org/apache/antlib/vfile/selectors/AndFileSelector.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AndFileSelector.java 23 Jun 2002 10:43:49 -0000 1.2
+++ AndFileSelector.java 25 Jun 2002 07:44:18 -0000 1.3
@@ -11,7 +11,6 @@
import org.apache.aut.vfs.FileObject;
import org.apache.myrmidon.api.TaskContext;
import org.apache.myrmidon.api.TaskException;
-import org.apache.myrmidon.framework.DataType;
/**
* A file selector that performs an AND of nested selectors. Performs
@@ -24,7 +23,7 @@
* @ant.data-type name="selector-set"
*/
public class AndFileSelector
- implements FileSelector, DataType
+ implements FileSelector
{
private final ArrayList m_selectors = new ArrayList();
1.2 +1 -4
jakarta-ant-myrmidon/antlib/src/test/org/apache/antlib/core/test/PropertyTestType.java
Index: PropertyTestType.java
===================================================================
RCS file:
/home/cvs/jakarta-ant-myrmidon/antlib/src/test/org/apache/antlib/core/test/PropertyTestType.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PropertyTestType.java 14 Apr 2002 10:48:03 -0000 1.1
+++ PropertyTestType.java 25 Jun 2002 07:44:18 -0000 1.2
@@ -7,8 +7,6 @@
*/
package org.apache.antlib.core.test;
-import org.apache.myrmidon.framework.DataType;
-
/**
* A test data-type used by the property tests.
*
@@ -18,7 +16,6 @@
* @ant.data-type name="property-test-type"
*/
public class PropertyTestType
- implements DataType
{
private String m_value;
1.2 +1 -4
jakarta-ant-myrmidon/antlib/src/test/org/apache/antlib/runtime/test/ConverterDefTestType.java
Index: ConverterDefTestType.java
===================================================================
RCS file:
/home/cvs/jakarta-ant-myrmidon/antlib/src/test/org/apache/antlib/runtime/test/ConverterDefTestType.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ConverterDefTestType.java 22 May 2002 07:36:21 -0000 1.1
+++ ConverterDefTestType.java 25 Jun 2002 07:44:18 -0000 1.2
@@ -7,8 +7,6 @@
*/
package org.apache.antlib.runtime.test;
-import org.apache.myrmidon.framework.DataType;
-
/**
* A data-type used by the <converter-def> test cases.
*
@@ -18,7 +16,6 @@
* @ant.data-type name="converter-def-test-type"
*/
public class ConverterDefTestType
- implements DataType
{
private String m_content;
1.2 +1 -4
jakarta-ant-myrmidon/antlib/src/test/org/apache/antlib/runtime/test/TypeDefTestType.java
Index: TypeDefTestType.java
===================================================================
RCS file:
/home/cvs/jakarta-ant-myrmidon/antlib/src/test/org/apache/antlib/runtime/test/TypeDefTestType.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TypeDefTestType.java 22 May 2002 07:36:21 -0000 1.1
+++ TypeDefTestType.java 25 Jun 2002 07:44:18 -0000 1.2
@@ -7,8 +7,6 @@
*/
package org.apache.antlib.runtime.test;
-import org.apache.myrmidon.framework.DataType;
-
/**
* A test data-type for the <type-def> task.
*
@@ -16,7 +14,6 @@
* @version $Revision$ $Date$
*/
public class TypeDefTestType
- implements DataType
{
private String m_content;
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
