From 989d5b31d7baa9a9e09b8e65f81bc4b28c9f106c Mon Sep 17 00:00:00 2001 From: Peter Donald Date: Mon, 28 Jan 2002 09:26:05 +0000 Subject: [PATCH] Remove unused imports git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@270986 13f79535-47bb-0310-9956-ffa450edef68 --- .../components/configurer/DefaultConfigurer.java | 4 +--- .../components/workspace/DefaultWorkspace.java | 2 -- .../myrmidon/framework/AbstractContainerTask.java | 6 ++---- .../java/org/apache/myrmidon/frontends/CLIMain.java | 13 ++++++------- .../interfaces/executor/ExecutionFrame.java | 1 - 5 files changed, 9 insertions(+), 17 deletions(-) diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/components/configurer/DefaultConfigurer.java b/proposal/myrmidon/src/java/org/apache/myrmidon/components/configurer/DefaultConfigurer.java index b43fbe7d3..f69e1a377 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/components/configurer/DefaultConfigurer.java +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/components/configurer/DefaultConfigurer.java @@ -7,7 +7,6 @@ */ package org.apache.myrmidon.components.configurer; -import java.lang.reflect.InvocationTargetException; import java.util.HashMap; import java.util.Map; import org.apache.avalon.excalibur.i18n.ResourceManager; @@ -26,10 +25,9 @@ import org.apache.avalon.framework.logger.AbstractLogEnabled; import org.apache.avalon.framework.logger.LogEnabled; import org.apache.myrmidon.interfaces.configurer.Configurer; import org.apache.myrmidon.interfaces.converter.MasterConverter; +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.type.TypeException; -import org.apache.myrmidon.api.TaskException; /** * Class used to configure tasks. diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/components/workspace/DefaultWorkspace.java b/proposal/myrmidon/src/java/org/apache/myrmidon/components/workspace/DefaultWorkspace.java index 869dc256d..36e9b5a54 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/components/workspace/DefaultWorkspace.java +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/components/workspace/DefaultWorkspace.java @@ -30,7 +30,6 @@ import org.apache.myrmidon.api.TaskContext; import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.components.deployer.DefaultDeployer; import org.apache.myrmidon.components.executor.DefaultExecutionFrame; -import org.apache.myrmidon.components.role.DefaultRoleManager; import org.apache.myrmidon.framework.Condition; import org.apache.myrmidon.interfaces.deployer.Deployer; import org.apache.myrmidon.interfaces.deployer.DeploymentException; @@ -41,7 +40,6 @@ import org.apache.myrmidon.interfaces.model.Target; import org.apache.myrmidon.interfaces.model.TypeLib; import org.apache.myrmidon.interfaces.type.TypeManager; import org.apache.myrmidon.interfaces.workspace.Workspace; -import org.apache.myrmidon.interfaces.role.RoleManager; import org.apache.myrmidon.listeners.ProjectListener; /** 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 0a396bad1..3932af4c2 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/AbstractContainerTask.java +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/AbstractContainerTask.java @@ -11,19 +11,17 @@ import org.apache.avalon.excalibur.i18n.ResourceManager; import org.apache.avalon.excalibur.i18n.Resources; import org.apache.avalon.framework.configuration.Configuration; import org.apache.avalon.framework.configuration.ConfigurationException; -import org.apache.avalon.framework.context.Context; -import org.apache.avalon.framework.context.ContextException; import org.apache.myrmidon.api.AbstractTask; -import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.api.TaskContext; +import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.converter.Converter; import org.apache.myrmidon.converter.ConverterException; import org.apache.myrmidon.interfaces.configurer.Configurer; import org.apache.myrmidon.interfaces.converter.MasterConverter; import org.apache.myrmidon.interfaces.executor.Executor; +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.type.TypeException; /** * This is the class that Task writers should extend to provide custom tasks. diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/frontends/CLIMain.java b/proposal/myrmidon/src/java/org/apache/myrmidon/frontends/CLIMain.java index 0749df663..d9cb8499c 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/frontends/CLIMain.java +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/frontends/CLIMain.java @@ -11,9 +11,7 @@ import java.io.BufferedReader; import java.io.File; import java.io.InputStreamReader; import java.util.ArrayList; -import java.util.Iterator; import java.util.List; -import java.util.Map; import org.apache.avalon.excalibur.cli.CLArgsParser; import org.apache.avalon.excalibur.cli.CLOption; import org.apache.avalon.excalibur.cli.CLOptionDescriptor; @@ -31,7 +29,6 @@ import org.apache.log.Priority; import org.apache.log.format.PatternFormatter; import org.apache.log.output.io.StreamTarget; import org.apache.myrmidon.Constants; -import org.apache.myrmidon.api.TaskContext; import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.components.embeddor.DefaultEmbeddor; import org.apache.myrmidon.interfaces.embeddor.Embeddor; @@ -381,8 +378,9 @@ public class CLIMain doBuild( workspace, project, m_targets ); - if( !incremental ) { - break; + if( !incremental ) + { + break; } final String message = REZ.getString( "repeat.notice" ); @@ -395,8 +393,9 @@ public class CLIMain String line = reader.readLine(); - if( line.equalsIgnoreCase( "no" ) ) { - break; + if( line.equalsIgnoreCase( "no" ) ) + { + break; } } diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/executor/ExecutionFrame.java b/proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/executor/ExecutionFrame.java index 3bd17b704..fcd1df48f 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/executor/ExecutionFrame.java +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/executor/ExecutionFrame.java @@ -7,7 +7,6 @@ */ package org.apache.myrmidon.interfaces.executor; -import org.apache.avalon.framework.component.ComponentManager; import org.apache.avalon.framework.logger.Logger; import org.apache.myrmidon.api.TaskContext; import org.apache.myrmidon.interfaces.type.TypeManager;