git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@277105 13f79535-47bb-0310-9956-ffa450edef68master
@@ -47,7 +47,7 @@ import org.apache.tools.ant.util.LoaderUtils; | |||||
*/ | */ | ||||
public class AntClassLoader extends ClassLoader implements SubBuildListener { | public class AntClassLoader extends ClassLoader implements SubBuildListener { | ||||
private static final FileUtils fileUtils = FileUtils.newFileUtils(); | |||||
private static final FileUtils FILE_UTILS = FileUtils.newFileUtils(); | |||||
/** | /** | ||||
* An enumeration of all resources of a given name found within the | * An enumeration of all resources of a given name found within the | ||||
@@ -909,7 +909,7 @@ public class AntClassLoader extends ClassLoader implements SubBuildListener { | |||||
if (resource.exists()) { | if (resource.exists()) { | ||||
try { | try { | ||||
return fileUtils.getFileURL(resource); | |||||
return FILE_UTILS.getFileURL(resource); | |||||
} catch (MalformedURLException ex) { | } catch (MalformedURLException ex) { | ||||
return null; | return null; | ||||
} | } | ||||
@@ -924,7 +924,7 @@ public class AntClassLoader extends ClassLoader implements SubBuildListener { | |||||
ZipEntry entry = zipFile.getEntry(resourceName); | ZipEntry entry = zipFile.getEntry(resourceName); | ||||
if (entry != null) { | if (entry != null) { | ||||
try { | try { | ||||
return new URL("jar:" + fileUtils.getFileURL(file) | |||||
return new URL("jar:" + FILE_UTILS.getFileURL(file) | |||||
+ "!/" + entry); | + "!/" + entry); | ||||
} catch (MalformedURLException ex) { | } catch (MalformedURLException ex) { | ||||
return null; | return null; | ||||
@@ -27,7 +27,7 @@ public interface Executor { | |||||
* Execute the specified Targets for the specified Project. | * Execute the specified Targets for the specified Project. | ||||
* @param project the Ant Project. | * @param project the Ant Project. | ||||
* @param targetNames String[] of Target names. | * @param targetNames String[] of Target names. | ||||
* @throws BuildException. | |||||
* @throws BuildException on error | |||||
*/ | */ | ||||
void executeTargets(Project project, String[] targetNames) | void executeTargets(Project project, String[] targetNames) | ||||
throws BuildException; | throws BuildException; | ||||
@@ -106,7 +106,7 @@ public class Exit extends Task { | |||||
* The error message is constructed from the text fields, from | * The error message is constructed from the text fields, from | ||||
* the nested condition (if specified), or finally from | * the nested condition (if specified), or finally from | ||||
* the if and unless parameters (if present). | * the if and unless parameters (if present). | ||||
* @throws BuildException | |||||
* @throws BuildException on error | |||||
*/ | */ | ||||
public void execute() throws BuildException { | public void execute() throws BuildException { | ||||
boolean fail = (nestedConditionPresent()) ? testNestedCondition() | boolean fail = (nestedConditionPresent()) ? testNestedCondition() | ||||
@@ -95,7 +95,7 @@ public class Input extends Task { | |||||
/** | /** | ||||
* Actual method executed by ant. | * Actual method executed by ant. | ||||
* @throws BuildException | |||||
* @throws BuildException on error | |||||
*/ | */ | ||||
public void execute () throws BuildException { | public void execute () throws BuildException { | ||||
if (addproperty != null | if (addproperty != null | ||||
@@ -121,6 +121,7 @@ public class Sleep extends Task { | |||||
try { | try { | ||||
Thread.sleep(millis); | Thread.sleep(millis); | ||||
} catch (InterruptedException ie) { | } catch (InterruptedException ie) { | ||||
// Ignore Exception | |||||
} | } | ||||
} | } | ||||