git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@270492 13f79535-47bb-0310-9956-ffa450edef68master
| @@ -45,7 +45,7 @@ public final class LogLevel | |||||
| * | * | ||||
| * @returns The names of all the LogLevels | * @returns The names of all the LogLevels | ||||
| */ | */ | ||||
| public static String[] getNames( ) | |||||
| public static String[] getNames() | |||||
| { | { | ||||
| final Set keys = c_levels.keySet(); | final Set keys = c_levels.keySet(); | ||||
| return (String[])keys.toArray( new String[ keys.size() ] ); | return (String[])keys.toArray( new String[ keys.size() ] ); | ||||
| @@ -13,9 +13,9 @@ import java.io.FileReader; | |||||
| import java.io.FileWriter; | import java.io.FileWriter; | ||||
| import java.io.IOException; | import java.io.IOException; | ||||
| import java.io.PrintWriter; | import java.io.PrintWriter; | ||||
| import org.apache.avalon.excalibur.util.StringUtil; | |||||
| import org.apache.myrmidon.api.AbstractTask; | import org.apache.myrmidon.api.AbstractTask; | ||||
| import org.apache.myrmidon.api.TaskException; | import org.apache.myrmidon.api.TaskException; | ||||
| import org.apache.avalon.excalibur.util.StringUtil; | |||||
| /** | /** | ||||
| * CVSLogin Adds an new entry to a CVS password file | * CVSLogin Adds an new entry to a CVS password file | ||||
| @@ -11,7 +11,6 @@ import java.io.File; | |||||
| import java.io.IOException; | import java.io.IOException; | ||||
| import org.apache.myrmidon.api.AbstractTask; | import org.apache.myrmidon.api.AbstractTask; | ||||
| import org.apache.myrmidon.api.TaskException; | import org.apache.myrmidon.api.TaskException; | ||||
| import org.apache.tools.ant.Project; | |||||
| import org.apache.tools.ant.taskdefs.exec.Execute; | import org.apache.tools.ant.taskdefs.exec.Execute; | ||||
| import org.apache.tools.ant.taskdefs.exec.LogOutputStream; | import org.apache.tools.ant.taskdefs.exec.LogOutputStream; | ||||
| import org.apache.tools.ant.types.Commandline; | import org.apache.tools.ant.types.Commandline; | ||||
| @@ -9,8 +9,6 @@ package org.apache.myrmidon.components.executor; | |||||
| import org.apache.avalon.excalibur.i18n.ResourceManager; | import org.apache.avalon.excalibur.i18n.ResourceManager; | ||||
| import org.apache.avalon.excalibur.i18n.Resources; | import org.apache.avalon.excalibur.i18n.Resources; | ||||
| import org.apache.avalon.framework.activity.Disposable; | |||||
| import org.apache.avalon.framework.activity.Initializable; | |||||
| import org.apache.avalon.framework.component.ComponentException; | import org.apache.avalon.framework.component.ComponentException; | ||||
| import org.apache.avalon.framework.component.ComponentManager; | import org.apache.avalon.framework.component.ComponentManager; | ||||
| import org.apache.avalon.framework.component.Composable; | import org.apache.avalon.framework.component.Composable; | ||||
| @@ -64,7 +64,7 @@ public final class JavaVersion | |||||
| version = JAVA1_2; | version = JAVA1_2; | ||||
| Class.forName( "java.lang.StrictMath" ); | Class.forName( "java.lang.StrictMath" ); | ||||
| version = JAVA1_3; | version = JAVA1_3; | ||||
| Class.forName("java.lang.CharSequence"); | |||||
| Class.forName( "java.lang.CharSequence" ); | |||||
| version = JAVA1_4; | version = JAVA1_4; | ||||
| } | } | ||||
| catch( final ClassNotFoundException cnfe ) | catch( final ClassNotFoundException cnfe ) | ||||
| @@ -11,14 +11,13 @@ import java.io.BufferedReader; | |||||
| import java.io.ByteArrayOutputStream; | import java.io.ByteArrayOutputStream; | ||||
| import java.io.IOException; | import java.io.IOException; | ||||
| import java.io.StringReader; | import java.io.StringReader; | ||||
| import java.util.ArrayList; | |||||
| import java.util.Iterator; | import java.util.Iterator; | ||||
| import java.util.Locale; | import java.util.Locale; | ||||
| import java.util.Properties; | import java.util.Properties; | ||||
| import org.apache.avalon.excalibur.util.StringUtil; | |||||
| import org.apache.myrmidon.api.TaskException; | import org.apache.myrmidon.api.TaskException; | ||||
| import org.apache.myrmidon.framework.Os; | import org.apache.myrmidon.framework.Os; | ||||
| import org.apache.tools.ant.taskdefs.exec.Execute; | import org.apache.tools.ant.taskdefs.exec.Execute; | ||||
| import org.apache.avalon.excalibur.util.StringUtil; | |||||
| /** | /** | ||||
| * This is the class that can be used to retrieve the environment | * This is the class that can be used to retrieve the environment | ||||
| @@ -7,9 +7,9 @@ | |||||
| */ | */ | ||||
| package org.apache.tools.ant.taskdefs.optional.sitraka; | package org.apache.tools.ant.taskdefs.optional.sitraka; | ||||
| import org.apache.tools.ant.taskdefs.exec.LogStreamHandler; | |||||
| import java.io.OutputStream; | |||||
| import java.io.IOException; | import java.io.IOException; | ||||
| import java.io.OutputStream; | |||||
| import org.apache.tools.ant.taskdefs.exec.LogStreamHandler; | |||||
| /** | /** | ||||
| * specific pumper to avoid those nasty stdin issues | * specific pumper to avoid those nasty stdin issues | ||||
| @@ -7,9 +7,9 @@ | |||||
| */ | */ | ||||
| package org.apache.tools.ant.taskdefs.optional.sitraka; | package org.apache.tools.ant.taskdefs.optional.sitraka; | ||||
| import org.apache.tools.ant.taskdefs.exec.LogStreamHandler; | |||||
| import java.io.OutputStream; | |||||
| import java.io.IOException; | import java.io.IOException; | ||||
| import java.io.OutputStream; | |||||
| import org.apache.tools.ant.taskdefs.exec.LogStreamHandler; | |||||
| /** | /** | ||||
| * specific pumper to avoid those nasty stdin issues | * specific pumper to avoid those nasty stdin issues | ||||