git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@276241 13f79535-47bb-0310-9956-ffa450edef68master
| @@ -16,9 +16,6 @@ | |||||
| */ | */ | ||||
| package org.apache.tools.ant.launch; | package org.apache.tools.ant.launch; | ||||
| import java.io.PrintStream; | |||||
| import java.io.PrintWriter; | |||||
| /** | /** | ||||
| * Signals an error condition during launching | * Signals an error condition during launching | ||||
| * | * | ||||
| @@ -130,12 +130,12 @@ public class Launcher { | |||||
| libPathURLs.add(dirURLs[j]); | libPathURLs.add(dirURLs[j]); | ||||
| } | } | ||||
| } | } | ||||
| libPathURLs.add(element.toURL()); | libPathURLs.add(element.toURL()); | ||||
| } | } | ||||
| } | } | ||||
| URL[] libJars = (URL[])libPathURLs.toArray(new URL[0]); | |||||
| URL[] libJars = (URL[]) libPathURLs.toArray(new URL[0]); | |||||
| // Now try and find JAVA_HOME | // Now try and find JAVA_HOME | ||||
| File toolsJar = Locator.getToolsJar(); | File toolsJar = Locator.getToolsJar(); | ||||
| @@ -147,7 +147,7 @@ public class Launcher { | |||||
| if (antLibDirProperty != null) { | if (antLibDirProperty != null) { | ||||
| antLibDir = new File(antLibDirProperty); | antLibDir = new File(antLibDirProperty); | ||||
| } | } | ||||
| if ((antLibDir == null) || ! antLibDir.exists()) { | |||||
| if ((antLibDir == null) || !antLibDir.exists()) { | |||||
| antLibDir = jarDir; | antLibDir = jarDir; | ||||
| System.setProperty(ANTLIBDIR_PROPERTY, antLibDir.getAbsolutePath()); | System.setProperty(ANTLIBDIR_PROPERTY, antLibDir.getAbsolutePath()); | ||||
| } | } | ||||
| @@ -29,7 +29,6 @@ import java.util.Properties; | |||||
| import org.apache.tools.ant.AntTypeDefinition; | import org.apache.tools.ant.AntTypeDefinition; | ||||
| import org.apache.tools.ant.ComponentHelper; | import org.apache.tools.ant.ComponentHelper; | ||||
| import org.apache.tools.ant.BuildException; | import org.apache.tools.ant.BuildException; | ||||
| import org.apache.tools.ant.Location; | |||||
| import org.apache.tools.ant.Project; | import org.apache.tools.ant.Project; | ||||
| import org.apache.tools.ant.ProjectHelper; | import org.apache.tools.ant.ProjectHelper; | ||||
| import org.apache.tools.ant.types.EnumeratedAttribute; | import org.apache.tools.ant.types.EnumeratedAttribute; | ||||