From c0573282fdd6a28d444aa7036647b81bcd848e8d Mon Sep 17 00:00:00 2001 From: adammurdoch Date: Mon, 18 Mar 2002 09:15:10 +0000 Subject: [PATCH] Ran IDEA's optimise imports. git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@271889 13f79535-47bb-0310-9956-ffa450edef68 --- .../myrmidon/src/java/org/apache/antlib/archive/Pack.java | 1 - .../myrmidon/src/java/org/apache/antlib/archive/Unpack.java | 1 - .../myrmidon/src/java/org/apache/antlib/build/Checksum.java | 2 -- .../myrmidon/src/java/org/apache/antlib/build/Patch.java | 1 - .../src/java/org/apache/antlib/build/SleepTask.java | 1 - .../src/java/org/apache/antlib/core/ConditionTask.java | 2 +- .../src/java/org/apache/antlib/core/LoadProperties.java | 1 - proposal/myrmidon/src/java/org/apache/antlib/core/Log.java | 1 - .../myrmidon/src/java/org/apache/antlib/cvslib/CVSPass.java | 1 - .../myrmidon/src/java/org/apache/antlib/cvslib/Cvs.java | 1 - .../myrmidon/src/java/org/apache/antlib/dotnet/CSharp.java | 3 --- .../myrmidon/src/java/org/apache/antlib/dotnet/Ilasm.java | 3 --- .../myrmidon/src/java/org/apache/antlib/file/CopyTask.java | 1 - .../myrmidon/src/java/org/apache/antlib/file/Delete.java | 1 - .../myrmidon/src/java/org/apache/antlib/file/Mkdir.java | 1 - .../myrmidon/src/java/org/apache/antlib/file/Touch.java | 1 - .../java/org/apache/antlib/nativelib/LoadEnvironment.java | 1 - .../src/java/org/apache/antlib/security/GenerateKey.java | 2 -- .../src/java/org/apache/antlib/security/SignJar.java | 2 -- .../java/org/apache/antlib/selftest/PrimitiveTypesTest.java | 1 - .../src/java/org/apache/antlib/sound/SoundTask.java | 1 - .../src/java/org/apache/antlib/vfile/CopyFilesTask.java | 1 - .../src/java/org/apache/antlib/vfile/ListFileSetTask.java | 1 - .../src/java/org/apache/antlib/vfile/ListFilesTask.java | 1 - .../apache/antlib/vfile/selectors/ConditionSelector.java | 6 +++--- .../org/apache/antlib/vfile/selectors/FileSelector.java | 1 - .../apache/antlib/vfile/selectors/FileTestCondition.java | 6 +++--- .../org/apache/antlib/vfile/selectors/NameFileSelector.java | 2 +- .../org/apache/antlib/vfile/selectors/NotFileSelector.java | 4 ++-- .../src/java/org/apache/antlib/xml/LocalResolver.java | 2 +- .../java/org/apache/antlib/xml/ValidatorErrorHandler.java | 2 +- .../src/java/org/apache/antlib/xml/XSLTProcess.java | 2 -- .../components/property/ClassicPropertyResolver.java | 2 +- .../apache/myrmidon/framework/AbstractContainerTask.java | 4 ++-- .../src/java/org/apache/myrmidon/framework/Execute.java | 4 ++-- .../src/java/org/apache/myrmidon/framework/Pattern.java | 2 +- .../apache/myrmidon/framework/conditions/AndCondition.java | 3 +-- .../myrmidon/framework/conditions/IsSetCondition.java | 4 ++-- .../apache/myrmidon/framework/conditions/NotCondition.java | 2 +- .../apache/myrmidon/framework/conditions/OrCondition.java | 3 +-- .../myrmidon/interfaces/property/PropertyResolver.java | 2 +- 41 files changed, 24 insertions(+), 59 deletions(-) diff --git a/proposal/myrmidon/src/java/org/apache/antlib/archive/Pack.java b/proposal/myrmidon/src/java/org/apache/antlib/archive/Pack.java index 92f508c13..8bdde5bd8 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/archive/Pack.java +++ b/proposal/myrmidon/src/java/org/apache/antlib/archive/Pack.java @@ -15,7 +15,6 @@ import java.io.OutputStream; import org.apache.avalon.excalibur.io.IOUtil; import org.apache.myrmidon.api.AbstractTask; import org.apache.myrmidon.api.TaskException; -import org.apache.myrmidon.api.TaskContext; /** * Abstract Base class for pack tasks. diff --git a/proposal/myrmidon/src/java/org/apache/antlib/archive/Unpack.java b/proposal/myrmidon/src/java/org/apache/antlib/archive/Unpack.java index 63cbfcd6c..778a3b00f 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/archive/Unpack.java +++ b/proposal/myrmidon/src/java/org/apache/antlib/archive/Unpack.java @@ -16,7 +16,6 @@ import java.io.OutputStream; import org.apache.avalon.excalibur.io.IOUtil; import org.apache.myrmidon.api.AbstractTask; import org.apache.myrmidon.api.TaskException; -import org.apache.myrmidon.api.TaskContext; /** * Abstract Base class for unpack tasks. diff --git a/proposal/myrmidon/src/java/org/apache/antlib/build/Checksum.java b/proposal/myrmidon/src/java/org/apache/antlib/build/Checksum.java index d95c80734..774961bad 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/build/Checksum.java +++ b/proposal/myrmidon/src/java/org/apache/antlib/build/Checksum.java @@ -21,8 +21,6 @@ import java.util.Enumeration; import java.util.Hashtable; import org.apache.avalon.excalibur.io.IOUtil; import org.apache.myrmidon.api.TaskException; -import org.apache.myrmidon.api.AbstractTask; -import org.apache.myrmidon.api.TaskContext; import org.apache.myrmidon.framework.AbstractMatchingTask; import org.apache.tools.todo.types.DirectoryScanner; import org.apache.tools.todo.types.FileSet; diff --git a/proposal/myrmidon/src/java/org/apache/antlib/build/Patch.java b/proposal/myrmidon/src/java/org/apache/antlib/build/Patch.java index f4b20b0b0..b69d76c06 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/build/Patch.java +++ b/proposal/myrmidon/src/java/org/apache/antlib/build/Patch.java @@ -8,7 +8,6 @@ package org.apache.antlib.build; import java.io.File; -import org.apache.aut.nativelib.ExecManager; import org.apache.avalon.excalibur.i18n.ResourceManager; import org.apache.avalon.excalibur.i18n.Resources; import org.apache.myrmidon.api.AbstractTask; diff --git a/proposal/myrmidon/src/java/org/apache/antlib/build/SleepTask.java b/proposal/myrmidon/src/java/org/apache/antlib/build/SleepTask.java index 989b51b8b..c85e8f05a 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/build/SleepTask.java +++ b/proposal/myrmidon/src/java/org/apache/antlib/build/SleepTask.java @@ -11,7 +11,6 @@ import org.apache.avalon.excalibur.i18n.ResourceManager; import org.apache.avalon.excalibur.i18n.Resources; import org.apache.myrmidon.api.AbstractTask; import org.apache.myrmidon.api.TaskException; -import org.apache.myrmidon.api.TaskContext; /** * A task to sleep for a period of time diff --git a/proposal/myrmidon/src/java/org/apache/antlib/core/ConditionTask.java b/proposal/myrmidon/src/java/org/apache/antlib/core/ConditionTask.java index 681dfdaa0..16032cda5 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/core/ConditionTask.java +++ b/proposal/myrmidon/src/java/org/apache/antlib/core/ConditionTask.java @@ -7,8 +7,8 @@ */ package org.apache.antlib.core; -import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.api.AbstractTask; +import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.framework.conditions.AndCondition; import org.apache.myrmidon.framework.conditions.Condition; diff --git a/proposal/myrmidon/src/java/org/apache/antlib/core/LoadProperties.java b/proposal/myrmidon/src/java/org/apache/antlib/core/LoadProperties.java index 272ef6f58..cbcd1ff96 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/core/LoadProperties.java +++ b/proposal/myrmidon/src/java/org/apache/antlib/core/LoadProperties.java @@ -16,7 +16,6 @@ import org.apache.avalon.excalibur.i18n.Resources; import org.apache.avalon.excalibur.io.IOUtil; import org.apache.myrmidon.api.AbstractTask; import org.apache.myrmidon.api.TaskException; -import org.apache.myrmidon.api.TaskContext; /** * This task loads properties from a property file and places them in the context. diff --git a/proposal/myrmidon/src/java/org/apache/antlib/core/Log.java b/proposal/myrmidon/src/java/org/apache/antlib/core/Log.java index 73e52270c..a3f20b3af 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/core/Log.java +++ b/proposal/myrmidon/src/java/org/apache/antlib/core/Log.java @@ -9,7 +9,6 @@ package org.apache.antlib.core; import org.apache.myrmidon.api.AbstractTask; import org.apache.myrmidon.api.TaskException; -import org.apache.myrmidon.api.TaskContext; import org.apache.myrmidon.framework.LogLevel; /** diff --git a/proposal/myrmidon/src/java/org/apache/antlib/cvslib/CVSPass.java b/proposal/myrmidon/src/java/org/apache/antlib/cvslib/CVSPass.java index fd7e6a5ea..1c1309029 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/cvslib/CVSPass.java +++ b/proposal/myrmidon/src/java/org/apache/antlib/cvslib/CVSPass.java @@ -16,7 +16,6 @@ import java.io.PrintWriter; import org.apache.avalon.excalibur.util.StringUtil; import org.apache.myrmidon.api.AbstractTask; import org.apache.myrmidon.api.TaskException; -import org.apache.myrmidon.api.TaskContext; /** * CVSLogin Adds an new entry to a CVS password file diff --git a/proposal/myrmidon/src/java/org/apache/antlib/cvslib/Cvs.java b/proposal/myrmidon/src/java/org/apache/antlib/cvslib/Cvs.java index d0af60127..af7444ca0 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/cvslib/Cvs.java +++ b/proposal/myrmidon/src/java/org/apache/antlib/cvslib/Cvs.java @@ -9,7 +9,6 @@ package org.apache.antlib.cvslib; import java.io.File; import java.util.Properties; -import org.apache.aut.nativelib.ExecManager; import org.apache.myrmidon.api.AbstractTask; import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.framework.Execute; diff --git a/proposal/myrmidon/src/java/org/apache/antlib/dotnet/CSharp.java b/proposal/myrmidon/src/java/org/apache/antlib/dotnet/CSharp.java index 2998454b9..8ac2471cb 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/dotnet/CSharp.java +++ b/proposal/myrmidon/src/java/org/apache/antlib/dotnet/CSharp.java @@ -8,10 +8,7 @@ package org.apache.antlib.dotnet; import java.io.File; -import org.apache.aut.nativelib.ExecManager; import org.apache.myrmidon.api.TaskException; -import org.apache.myrmidon.api.AbstractTask; -import org.apache.myrmidon.api.TaskContext; import org.apache.myrmidon.framework.Execute; import org.apache.tools.todo.taskdefs.MatchingTask; import org.apache.tools.todo.types.Commandline; diff --git a/proposal/myrmidon/src/java/org/apache/antlib/dotnet/Ilasm.java b/proposal/myrmidon/src/java/org/apache/antlib/dotnet/Ilasm.java index 9dbaedf60..8ad25c984 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/dotnet/Ilasm.java +++ b/proposal/myrmidon/src/java/org/apache/antlib/dotnet/Ilasm.java @@ -8,10 +8,7 @@ package org.apache.antlib.dotnet; import java.io.File; -import org.apache.aut.nativelib.ExecManager; import org.apache.myrmidon.api.TaskException; -import org.apache.myrmidon.api.AbstractTask; -import org.apache.myrmidon.api.TaskContext; import org.apache.myrmidon.framework.Execute; import org.apache.tools.todo.taskdefs.MatchingTask; import org.apache.tools.todo.types.Commandline; diff --git a/proposal/myrmidon/src/java/org/apache/antlib/file/CopyTask.java b/proposal/myrmidon/src/java/org/apache/antlib/file/CopyTask.java index 0521b0438..d309074b0 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/file/CopyTask.java +++ b/proposal/myrmidon/src/java/org/apache/antlib/file/CopyTask.java @@ -18,7 +18,6 @@ import org.apache.avalon.excalibur.i18n.Resources; import org.apache.avalon.excalibur.io.FileUtil; import org.apache.myrmidon.api.AbstractTask; import org.apache.myrmidon.api.TaskException; -import org.apache.myrmidon.api.TaskContext; import org.apache.myrmidon.framework.FileNameMapper; import org.apache.tools.todo.types.DirectoryScanner; import org.apache.tools.todo.types.FileSet; diff --git a/proposal/myrmidon/src/java/org/apache/antlib/file/Delete.java b/proposal/myrmidon/src/java/org/apache/antlib/file/Delete.java index 6390a0b0e..40040b6d8 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/file/Delete.java +++ b/proposal/myrmidon/src/java/org/apache/antlib/file/Delete.java @@ -13,7 +13,6 @@ import org.apache.avalon.excalibur.i18n.ResourceManager; import org.apache.avalon.excalibur.i18n.Resources; import org.apache.myrmidon.api.AbstractTask; import org.apache.myrmidon.api.TaskException; -import org.apache.myrmidon.api.TaskContext; import org.apache.tools.todo.types.DirectoryScanner; import org.apache.tools.todo.types.FileSet; import org.apache.tools.todo.types.ScannerUtil; diff --git a/proposal/myrmidon/src/java/org/apache/antlib/file/Mkdir.java b/proposal/myrmidon/src/java/org/apache/antlib/file/Mkdir.java index a1a2f47c5..32b3b73d3 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/file/Mkdir.java +++ b/proposal/myrmidon/src/java/org/apache/antlib/file/Mkdir.java @@ -12,7 +12,6 @@ import org.apache.avalon.excalibur.i18n.ResourceManager; import org.apache.avalon.excalibur.i18n.Resources; import org.apache.myrmidon.api.AbstractTask; import org.apache.myrmidon.api.TaskException; -import org.apache.myrmidon.api.TaskContext; /** * Creates specified directory. diff --git a/proposal/myrmidon/src/java/org/apache/antlib/file/Touch.java b/proposal/myrmidon/src/java/org/apache/antlib/file/Touch.java index 55700ff03..f86455a0f 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/file/Touch.java +++ b/proposal/myrmidon/src/java/org/apache/antlib/file/Touch.java @@ -18,7 +18,6 @@ import org.apache.avalon.excalibur.i18n.ResourceManager; import org.apache.avalon.excalibur.i18n.Resources; import org.apache.myrmidon.api.AbstractTask; import org.apache.myrmidon.api.TaskException; -import org.apache.myrmidon.api.TaskContext; import org.apache.tools.todo.types.DirectoryScanner; import org.apache.tools.todo.types.FileSet; import org.apache.tools.todo.types.ScannerUtil; diff --git a/proposal/myrmidon/src/java/org/apache/antlib/nativelib/LoadEnvironment.java b/proposal/myrmidon/src/java/org/apache/antlib/nativelib/LoadEnvironment.java index ee5045d60..2cd75d42b 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/nativelib/LoadEnvironment.java +++ b/proposal/myrmidon/src/java/org/apache/antlib/nativelib/LoadEnvironment.java @@ -15,7 +15,6 @@ import org.apache.avalon.excalibur.i18n.ResourceManager; import org.apache.avalon.excalibur.i18n.Resources; import org.apache.myrmidon.api.AbstractTask; import org.apache.myrmidon.api.TaskException; -import org.apache.myrmidon.api.TaskContext; /** * This task is responsible for loading that OS-specific environment diff --git a/proposal/myrmidon/src/java/org/apache/antlib/security/GenerateKey.java b/proposal/myrmidon/src/java/org/apache/antlib/security/GenerateKey.java index 973cff9ae..f7e98bfed 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/security/GenerateKey.java +++ b/proposal/myrmidon/src/java/org/apache/antlib/security/GenerateKey.java @@ -7,10 +7,8 @@ */ package org.apache.antlib.security; -import org.apache.aut.nativelib.ExecManager; import org.apache.myrmidon.api.AbstractTask; import org.apache.myrmidon.api.TaskException; -import org.apache.myrmidon.api.TaskContext; import org.apache.myrmidon.framework.Execute; import org.apache.tools.todo.types.Commandline; diff --git a/proposal/myrmidon/src/java/org/apache/antlib/security/SignJar.java b/proposal/myrmidon/src/java/org/apache/antlib/security/SignJar.java index 72bbf5b93..9d82022f4 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/security/SignJar.java +++ b/proposal/myrmidon/src/java/org/apache/antlib/security/SignJar.java @@ -13,10 +13,8 @@ import java.util.ArrayList; import java.util.Enumeration; import java.util.zip.ZipEntry; import java.util.zip.ZipFile; -import org.apache.aut.nativelib.ExecManager; import org.apache.myrmidon.api.AbstractTask; import org.apache.myrmidon.api.TaskException; -import org.apache.myrmidon.api.TaskContext; import org.apache.myrmidon.framework.Execute; import org.apache.tools.todo.types.Commandline; import org.apache.tools.todo.types.DirectoryScanner; diff --git a/proposal/myrmidon/src/java/org/apache/antlib/selftest/PrimitiveTypesTest.java b/proposal/myrmidon/src/java/org/apache/antlib/selftest/PrimitiveTypesTest.java index a02bf72d7..b0f105fc7 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/selftest/PrimitiveTypesTest.java +++ b/proposal/myrmidon/src/java/org/apache/antlib/selftest/PrimitiveTypesTest.java @@ -9,7 +9,6 @@ package org.apache.antlib.selftest; import org.apache.myrmidon.api.AbstractTask; import org.apache.myrmidon.api.TaskException; -import org.apache.myrmidon.api.TaskContext; /** * Test conversion of all the primitive types. diff --git a/proposal/myrmidon/src/java/org/apache/antlib/sound/SoundTask.java b/proposal/myrmidon/src/java/org/apache/antlib/sound/SoundTask.java index e599242a3..04a39abea 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/sound/SoundTask.java +++ b/proposal/myrmidon/src/java/org/apache/antlib/sound/SoundTask.java @@ -14,7 +14,6 @@ import org.apache.avalon.excalibur.i18n.ResourceManager; import org.apache.avalon.excalibur.i18n.Resources; import org.apache.myrmidon.api.AbstractTask; import org.apache.myrmidon.api.TaskException; -import org.apache.myrmidon.api.TaskContext; import org.apache.myrmidon.interfaces.workspace.Workspace; /** diff --git a/proposal/myrmidon/src/java/org/apache/antlib/vfile/CopyFilesTask.java b/proposal/myrmidon/src/java/org/apache/antlib/vfile/CopyFilesTask.java index 4502a3131..1ad4f706b 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/vfile/CopyFilesTask.java +++ b/proposal/myrmidon/src/java/org/apache/antlib/vfile/CopyFilesTask.java @@ -17,7 +17,6 @@ import org.apache.avalon.excalibur.i18n.ResourceManager; import org.apache.avalon.excalibur.i18n.Resources; import org.apache.myrmidon.api.AbstractTask; import org.apache.myrmidon.api.TaskException; -import org.apache.myrmidon.api.TaskContext; /** * A task that copies files. diff --git a/proposal/myrmidon/src/java/org/apache/antlib/vfile/ListFileSetTask.java b/proposal/myrmidon/src/java/org/apache/antlib/vfile/ListFileSetTask.java index f3f35c2ab..038c61bc1 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/vfile/ListFileSetTask.java +++ b/proposal/myrmidon/src/java/org/apache/antlib/vfile/ListFileSetTask.java @@ -11,7 +11,6 @@ import java.util.ArrayList; import org.apache.aut.vfs.FileObject; import org.apache.myrmidon.api.AbstractTask; import org.apache.myrmidon.api.TaskException; -import org.apache.myrmidon.api.TaskContext; /** * A debug task, that lists the contents of a {@link FileSet}. diff --git a/proposal/myrmidon/src/java/org/apache/antlib/vfile/ListFilesTask.java b/proposal/myrmidon/src/java/org/apache/antlib/vfile/ListFilesTask.java index 684fa7dcd..fe381bfd3 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/vfile/ListFilesTask.java +++ b/proposal/myrmidon/src/java/org/apache/antlib/vfile/ListFilesTask.java @@ -10,7 +10,6 @@ package org.apache.antlib.vfile; import org.apache.aut.vfs.FileObject; import org.apache.myrmidon.api.AbstractTask; import org.apache.myrmidon.api.TaskException; -import org.apache.myrmidon.api.TaskContext; /** * A debug task, which prints out the files in a file list. diff --git a/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/ConditionSelector.java b/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/ConditionSelector.java index b3e080db3..ea0326b31 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/ConditionSelector.java +++ b/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/ConditionSelector.java @@ -7,11 +7,11 @@ */ package org.apache.antlib.vfile.selectors; -import org.apache.myrmidon.framework.conditions.Condition; -import org.apache.myrmidon.framework.conditions.AndCondition; +import org.apache.aut.vfs.FileObject; import org.apache.myrmidon.api.TaskContext; import org.apache.myrmidon.api.TaskException; -import org.apache.aut.vfs.FileObject; +import org.apache.myrmidon.framework.conditions.AndCondition; +import org.apache.myrmidon.framework.conditions.Condition; /** * A file selector that evaluates a set of nested {@link Condition} elements. diff --git a/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/FileSelector.java b/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/FileSelector.java index 8e41fbf28..f3ce41757 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/FileSelector.java +++ b/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/FileSelector.java @@ -10,7 +10,6 @@ package org.apache.antlib.vfile.selectors; import org.apache.aut.vfs.FileObject; import org.apache.myrmidon.api.TaskContext; import org.apache.myrmidon.api.TaskException; -import org.apache.myrmidon.framework.DataType; /** * Accepts files as part of a set. diff --git a/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/FileTestCondition.java b/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/FileTestCondition.java index 55f17170c..358de4abf 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/FileTestCondition.java +++ b/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/FileTestCondition.java @@ -7,12 +7,12 @@ */ package org.apache.antlib.vfile.selectors; -import org.apache.myrmidon.framework.conditions.Condition; -import org.apache.myrmidon.api.TaskContext; -import org.apache.myrmidon.api.TaskException; import org.apache.aut.vfs.FileObject; import org.apache.avalon.excalibur.i18n.ResourceManager; import org.apache.avalon.excalibur.i18n.Resources; +import org.apache.myrmidon.api.TaskContext; +import org.apache.myrmidon.api.TaskException; +import org.apache.myrmidon.framework.conditions.Condition; /** * A condition that applies a set of file selectors to a file. diff --git a/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/NameFileSelector.java b/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/NameFileSelector.java index d6958c354..3d3d35154 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/NameFileSelector.java +++ b/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/NameFileSelector.java @@ -8,9 +8,9 @@ package org.apache.antlib.vfile.selectors; import org.apache.aut.vfs.FileObject; -import org.apache.myrmidon.api.TaskException; import org.apache.avalon.excalibur.i18n.ResourceManager; import org.apache.avalon.excalibur.i18n.Resources; +import org.apache.myrmidon.api.TaskException; /** * A file selector that selects files based on their name. diff --git a/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/NotFileSelector.java b/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/NotFileSelector.java index 0a64afcd5..bd8e11e2f 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/NotFileSelector.java +++ b/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/NotFileSelector.java @@ -8,10 +8,10 @@ package org.apache.antlib.vfile.selectors; import org.apache.aut.vfs.FileObject; -import org.apache.myrmidon.api.TaskContext; -import org.apache.myrmidon.api.TaskException; import org.apache.avalon.excalibur.i18n.ResourceManager; import org.apache.avalon.excalibur.i18n.Resources; +import org.apache.myrmidon.api.TaskContext; +import org.apache.myrmidon.api.TaskException; /** * A file selector that negates a nested file selector. diff --git a/proposal/myrmidon/src/java/org/apache/antlib/xml/LocalResolver.java b/proposal/myrmidon/src/java/org/apache/antlib/xml/LocalResolver.java index 6659217dd..81f90bfc5 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/xml/LocalResolver.java +++ b/proposal/myrmidon/src/java/org/apache/antlib/xml/LocalResolver.java @@ -15,10 +15,10 @@ import java.io.InputStream; import java.net.MalformedURLException; import java.net.URL; import java.util.Hashtable; +import org.apache.myrmidon.api.TaskContext; import org.xml.sax.EntityResolver; import org.xml.sax.InputSource; import org.xml.sax.SAXException; -import org.apache.myrmidon.api.TaskContext; class LocalResolver implements EntityResolver diff --git a/proposal/myrmidon/src/java/org/apache/antlib/xml/ValidatorErrorHandler.java b/proposal/myrmidon/src/java/org/apache/antlib/xml/ValidatorErrorHandler.java index 95fc589d2..08e07e891 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/xml/ValidatorErrorHandler.java +++ b/proposal/myrmidon/src/java/org/apache/antlib/xml/ValidatorErrorHandler.java @@ -9,9 +9,9 @@ package org.apache.antlib.xml; import java.net.MalformedURLException; import java.net.URL; +import org.apache.myrmidon.api.TaskContext; import org.xml.sax.ErrorHandler; import org.xml.sax.SAXParseException; -import org.apache.myrmidon.api.TaskContext; /* * ValidatorErrorHandler role : diff --git a/proposal/myrmidon/src/java/org/apache/antlib/xml/XSLTProcess.java b/proposal/myrmidon/src/java/org/apache/antlib/xml/XSLTProcess.java index eada08a7c..09c12a1ef 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/xml/XSLTProcess.java +++ b/proposal/myrmidon/src/java/org/apache/antlib/xml/XSLTProcess.java @@ -21,8 +21,6 @@ import javax.xml.transform.stream.StreamSource; import org.apache.avalon.excalibur.io.FileUtil; import org.apache.avalon.excalibur.io.IOUtil; import org.apache.myrmidon.api.TaskException; -import org.apache.myrmidon.api.AbstractTask; -import org.apache.myrmidon.api.TaskContext; import org.apache.myrmidon.framework.AbstractMatchingTask; import org.apache.myrmidon.framework.FileSet; import org.apache.tools.todo.types.DirectoryScanner; diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/components/property/ClassicPropertyResolver.java b/proposal/myrmidon/src/java/org/apache/myrmidon/components/property/ClassicPropertyResolver.java index 2e98e245b..8b856efbd 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/components/property/ClassicPropertyResolver.java +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/components/property/ClassicPropertyResolver.java @@ -7,9 +7,9 @@ */ package org.apache.myrmidon.components.property; -import org.apache.myrmidon.interfaces.property.PropertyResolver; import org.apache.avalon.framework.context.Context; import org.apache.avalon.framework.context.ContextException; +import org.apache.myrmidon.interfaces.property.PropertyResolver; /** * A {@link PropertyResolver} implementation which resolves properties diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/AbstractContainerTask.java b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/AbstractContainerTask.java index de1af45a3..1edeb0b0d 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/AbstractContainerTask.java +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/AbstractContainerTask.java @@ -19,11 +19,11 @@ import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.interfaces.configurer.Configurer; import org.apache.myrmidon.interfaces.executor.ExecutionFrame; import org.apache.myrmidon.interfaces.executor.Executor; +import org.apache.myrmidon.interfaces.role.RoleInfo; +import org.apache.myrmidon.interfaces.role.RoleManager; import org.apache.myrmidon.interfaces.type.TypeException; import org.apache.myrmidon.interfaces.type.TypeFactory; import org.apache.myrmidon.interfaces.type.TypeManager; -import org.apache.myrmidon.interfaces.role.RoleInfo; -import org.apache.myrmidon.interfaces.role.RoleManager; /** * This is the class that Task writers should extend to provide custom tasks. diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/Execute.java b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/Execute.java index 830c8d1ac..2d87b99f9 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/Execute.java +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/Execute.java @@ -13,12 +13,12 @@ import org.apache.aut.nativelib.ExecException; import org.apache.aut.nativelib.ExecManager; import org.apache.aut.nativelib.ExecMetaData; import org.apache.aut.nativelib.ExecOutputHandler; +import org.apache.avalon.excalibur.i18n.ResourceManager; +import org.apache.avalon.excalibur.i18n.Resources; import org.apache.myrmidon.api.TaskContext; import org.apache.myrmidon.api.TaskException; import org.apache.tools.todo.types.Commandline; import org.apache.tools.todo.util.FileUtils; -import org.apache.avalon.excalibur.i18n.ResourceManager; -import org.apache.avalon.excalibur.i18n.Resources; /** * This is a utility class designed to make executing native diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/Pattern.java b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/Pattern.java index ea6d813b2..8a56e0bb7 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/Pattern.java +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/Pattern.java @@ -11,9 +11,9 @@ import org.apache.avalon.excalibur.i18n.ResourceManager; import org.apache.avalon.excalibur.i18n.Resources; import org.apache.myrmidon.api.TaskContext; import org.apache.myrmidon.api.TaskException; +import org.apache.myrmidon.framework.conditions.Condition; import org.apache.myrmidon.framework.conditions.IsSetCondition; import org.apache.myrmidon.framework.conditions.NotCondition; -import org.apache.myrmidon.framework.conditions.Condition; /** * Basic data type for holding patterns. diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/conditions/AndCondition.java b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/conditions/AndCondition.java index 1261145c8..794bd3773 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/conditions/AndCondition.java +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/conditions/AndCondition.java @@ -7,10 +7,9 @@ */ package org.apache.myrmidon.framework.conditions; -import java.util.Enumeration; import java.util.ArrayList; -import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.api.TaskContext; +import org.apache.myrmidon.api.TaskException; /** * <and> condition container.

diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/conditions/IsSetCondition.java b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/conditions/IsSetCondition.java index fb0bff5d2..6c5d39348 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/conditions/IsSetCondition.java +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/conditions/IsSetCondition.java @@ -7,10 +7,10 @@ */ package org.apache.myrmidon.framework.conditions; -import org.apache.myrmidon.api.TaskContext; -import org.apache.myrmidon.api.TaskException; import org.apache.avalon.excalibur.i18n.ResourceManager; import org.apache.avalon.excalibur.i18n.Resources; +import org.apache.myrmidon.api.TaskContext; +import org.apache.myrmidon.api.TaskException; /** * A {@link Condition} that is true when a property is set, but not set to diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/conditions/NotCondition.java b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/conditions/NotCondition.java index cf2e5ee79..732e99ad4 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/conditions/NotCondition.java +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/conditions/NotCondition.java @@ -7,8 +7,8 @@ */ package org.apache.myrmidon.framework.conditions; -import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.api.TaskContext; +import org.apache.myrmidon.api.TaskException; /** * <not> condition. Evaluates to true if the single condition nested into diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/conditions/OrCondition.java b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/conditions/OrCondition.java index 030769537..494ff2e6f 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/conditions/OrCondition.java +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/conditions/OrCondition.java @@ -7,10 +7,9 @@ */ package org.apache.myrmidon.framework.conditions; -import java.util.Enumeration; import java.util.ArrayList; -import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.api.TaskContext; +import org.apache.myrmidon.api.TaskException; /** * <or> condition container.

diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/property/PropertyResolver.java b/proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/property/PropertyResolver.java index 2f41ecc0d..576121957 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/property/PropertyResolver.java +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/property/PropertyResolver.java @@ -7,8 +7,8 @@ */ package org.apache.myrmidon.interfaces.property; -import org.apache.myrmidon.api.TaskException; import org.apache.avalon.framework.context.Context; +import org.apache.myrmidon.api.TaskException; /** *