Ran IDEA's optimise imports.

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@271889 13f79535-47bb-0310-9956-ffa450edef68

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.

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.

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;

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;

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

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;
 

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.

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;
 
 /**

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

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;

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;

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;

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;

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;

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.

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;

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

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;
 

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;

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.

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;
 
 /**

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.

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}.

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.

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.

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.

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.

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.

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.

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

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 :

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;

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

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.

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

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.

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;
 
 /**
  * &lt;and&gt; condition container. <p>

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

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

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;
 
 /**
  * &lt;or&gt; condition container. <p>

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;
 
 /**
  *