Return-Path:
String
representing this loader.
+ * @return the path that this classloader has.
+ */
public String toString() {
return "AntClassLoader[" + getClasspath() + "]";
}
Modified: ant/core/trunk/src/main/org/apache/tools/ant/AntTypeDefinition.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/AntTypeDefinition.java?view=diff&rev=469717&r1=469716&r2=469717
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/AntTypeDefinition.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/AntTypeDefinition.java Tue Oct 31 16:13:43 2006
@@ -163,8 +163,9 @@
/**
* Try and load a class, with no attempt to catch any fault.
* @return the class that implements this component
- * @throws ClassNotFoundException
- * @throws NoClassDefFoundError
+ * @throws ClassNotFoundException if the class cannot be found.
+ * @throws NoClassDefFoundError if the there is an error
+ * finding the class.
*/
public Class innerGetTypeClass() throws ClassNotFoundException {
if (clazz != null) {
@@ -284,10 +285,10 @@
* @param newclass class to create
* @param project
* @return a newly constructed and bound instance.
- * @throws NoSuchMethodException
- * @throws InstantiationException
- * @throws IllegalAccessException
- * @throws InvocationTargetException
+ * @throws NoSuchMethodException no good construtor.
+ * @throws InstantiationException cannot initialize the object.
+ * @throws IllegalAccessException cannot access the object.
+ * @throws InvocationTargetException error in invocation.
*/
public Object innerCreateAndSet(Class newclass, Project project)
throws NoSuchMethodException,
Modified: ant/core/trunk/src/main/org/apache/tools/ant/ComponentHelper.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/ComponentHelper.java?view=diff&rev=469717&r1=469716&r2=469717
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/ComponentHelper.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/ComponentHelper.java Tue Oct 31 16:13:43 2006
@@ -124,8 +124,8 @@
* contrived work here to enable this early.
*/
private static final String ANT_PROPERTY_TASK = "property";
-
- // {tasks, types}
+
+ // {tasks, types}
private static Properties[] defaultDefinitions = new Properties[2];
@@ -502,14 +502,17 @@
if (c == null || !(Task.class.isAssignableFrom(c))) {
return null;
}
- Object _task = createComponent(taskType);
- if (_task == null) {
+ Object obj= createComponent(taskType);
+ if (obj == null) {
return null;
}
- if (!(_task instanceof Task)) {
- throw new BuildException("Expected a Task from '" + taskType + "' but got an instance of " + _task.getClass().getName() + " instead");
+ if (!(obj instanceof Task)) {
+ throw new BuildException(
+ "Expected a Task from '" + taskType
+ + "' but got an instance of " + obj.getClass().getName()
+ + " instead");
}
- Task task = (Task) _task;
+ Task task = (Task) obj;
task.setTaskType(taskType);
// set default value, can be changed by the user
@@ -741,7 +744,7 @@
}
return classLoader;
}
-
+
/**
* Load default task or type definitions - just the names,
* no class loading.
@@ -846,22 +849,22 @@
String home = System.getProperty(Launcher.USER_HOMEDIR);
File libDir = new File(home, Launcher.USER_LIBDIR);
String antHomeLib;
- boolean probablyIDE=false;
+ boolean probablyIDE = false;
String anthome = System.getProperty(MagicNames.ANT_HOME);
- if(anthome!=null) {
- File antHomeLibDir = new File(anthome,"lib");
- antHomeLib=antHomeLibDir.getAbsolutePath();
+ if (anthome != null) {
+ File antHomeLibDir = new File(anthome, "lib");
+ antHomeLib = antHomeLibDir.getAbsolutePath();
} else {
//running under an IDE that doesn't set ANT_HOME
- probablyIDE=true;
- antHomeLib = "ANT_HOME" +File.separatorChar +"lib";
+ probablyIDE = true;
+ antHomeLib = "ANT_HOME" + File.separatorChar + "lib";
}
StringBuffer dirListingText = new StringBuffer();
final String tab = " -";
dirListingText.append(tab);
dirListingText.append(antHomeLib);
dirListingText.append('\n');
- if(probablyIDE) {
+ if (probablyIDE) {
dirListingText.append(tab);
dirListingText.append("the IDE Ant configuration dialogs");
} else {
@@ -873,8 +876,8 @@
"a directory added on the command line with the -lib argument");
}
- String dirListing=dirListingText.toString();
-
+ String dirListing = dirListingText.toString();
+
//look up the name
AntTypeDefinition def = getDefinition(componentName);
if (def == null) {
@@ -883,7 +886,8 @@
out.println("Cause: The name is undefined.");
out.println("Action: Check the spelling.");
out.println("Action: Check that any custom tasks/types have been declared.");
- out.println("Action: Check that any
null
or empty.
- *
+ *
* @deprecated since 1.7
* Use FileUtils.translatePath instead.
*
@@ -2280,6 +2281,7 @@
/**
* Resolve the file relative to the project's basedir and return it as a
* FileResource.
+ * @param name the name of the file to resolve.
* @since Ant 1.7
*/
public Resource getResource(String name) {
Modified: ant/core/trunk/src/main/org/apache/tools/ant/ProjectComponent.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/ProjectComponent.java?view=diff&rev=469717&r1=469716&r2=469717
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/ProjectComponent.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/ProjectComponent.java Tue Oct 31 16:13:43 2006
@@ -27,8 +27,8 @@
/**
* Project object of this component.
- * @deprecated since 1.6.x.
- * You should not be directly accessing this variable directly.
+ * @deprecated since 1.6.x.
+ * You should not be directly accessing this variable directly.
* You should access project object via the getProject()
* or setProject() accessor/mutators.
*/
Modified: ant/core/trunk/src/main/org/apache/tools/ant/Task.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/Task.java?view=diff&rev=469717&r1=469716&r2=469717
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/Task.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/Task.java Tue Oct 31 16:13:43 2006
@@ -42,7 +42,7 @@
/**
* Description of this task, if any.
- * @deprecated since 1.6.x.
+ * @deprecated since 1.6.x.
* You should not be accessing this variable directly.
*/
protected String description;
@@ -54,7 +54,7 @@
* isn't terribly descriptive for a task used within
* another task - the outer task code can probably
* provide a better one.
- * @deprecated since 1.6.x.
+ * @deprecated since 1.6.x.
* You should not be accessing this variable directly.
* Please use the {@link #getTaskName()} method.
*/
@@ -63,7 +63,7 @@
/**
* Type of this task.
*
- * @deprecated since 1.6.x.
+ * @deprecated since 1.6.x.
* You should not be accessing this variable directly.
* Please use the {@link #getTaskType()} method.
*/
Modified: ant/core/trunk/src/main/org/apache/tools/ant/UnknownElement.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/UnknownElement.java?view=diff&rev=469717&r1=469716&r2=469717
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/UnknownElement.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/UnknownElement.java Tue Oct 31 16:13:43 2006
@@ -213,7 +213,6 @@
/**
* @see Task#handleInput(byte[], int, int)
- *
* @since Ant 1.6
*/
protected int handleInput(byte[] buffer, int offset, int length)
Modified: ant/core/trunk/src/main/org/apache/tools/ant/filters/FixCrLfFilter.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/filters/FixCrLfFilter.java?view=diff&rev=469717&r1=469716&r2=469717
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/filters/FixCrLfFilter.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/filters/FixCrLfFilter.java Tue Oct 31 16:13:43 2006
@@ -101,6 +101,7 @@
* @param in
* A Reader object providing the underlying stream. Must not be
* null
.
+ * @throws IOException on error.
*/
public FixCrLfFilter(final Reader in) throws IOException {
super(in);
@@ -372,6 +373,7 @@
* @param tabLength
* specify the length of tab in spaces. Valid values are between
* 2 and 80 inclusive. The default for this parameter is 8.
+ * @throws IOException on error.
*/
public void setTablength(int tabLength) throws IOException {
if (tabLength < 2 || tabLength > 80) {
@@ -850,7 +852,7 @@
private static final AddAsisRemove REMOVE = newInstance("remove");
public String[] getValues() {
- return new String[] { "add", "asis", "remove" };
+ return new String[] {"add", "asis", "remove"};
}
public boolean equals(Object other) {
Modified: ant/core/trunk/src/main/org/apache/tools/ant/filters/ReplaceTokens.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/filters/ReplaceTokens.java?view=diff&rev=469717&r1=469716&r2=469717
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/filters/ReplaceTokens.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/filters/ReplaceTokens.java Tue Oct 31 16:13:43 2006
@@ -239,7 +239,7 @@
} finally {
FileUtils.close(in);
}
-
+
return props;
}
Modified: ant/core/trunk/src/main/org/apache/tools/ant/helper/ProjectHelper2.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/helper/ProjectHelper2.java?view=diff&rev=469717&r1=469716&r2=469717
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/helper/ProjectHelper2.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/helper/ProjectHelper2.java Tue Oct 31 16:13:43 2006
@@ -259,7 +259,7 @@
* @param handler new main handler
*/
protected static void setMainHandler(AntHandler handler) {
- mainHandler=handler;
+ mainHandler = handler;
}
/**
@@ -275,7 +275,7 @@
* @param handler new project handler
*/
protected static void setProjectHandler(AntHandler handler) {
- projectHandler=handler;
+ projectHandler = handler;
}
/**
@@ -291,7 +291,7 @@
* @param handler new target handler
*/
protected static void setTargetHandler(AntHandler handler) {
- targetHandler=handler;
+ targetHandler = handler;
}
/**
@@ -307,7 +307,7 @@
* @param handler new element handler
*/
protected static void setElementHandler(AntHandler handler) {
- elementHandler=handler;
+ elementHandler = handler;
}
@@ -479,9 +479,9 @@
if (!file.isAbsolute()) {
file = FILE_UTILS.resolveFile(context.getBuildFileParent(), path);
context.getProject().log(
- "Warning: '" + systemId + "' in " + context.getBuildFile() +
- " should be expressed simply as '" + path.replace('\\', '/') +
- "' for compliance with other XML tools",
+ "Warning: '" + systemId + "' in " + context.getBuildFile()
+ + " should be expressed simply as '" + path.replace('\\', '/')
+ + "' for compliance with other XML tools",
Project.MSG_WARN);
}
context.getProject().log("file=" + file, Project.MSG_DEBUG);
Modified: ant/core/trunk/src/main/org/apache/tools/ant/helper/ProjectHelperImpl.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/helper/ProjectHelperImpl.java?view=diff&rev=469717&r1=469716&r2=469717
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/helper/ProjectHelperImpl.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/helper/ProjectHelperImpl.java Tue Oct 31 16:13:43 2006
@@ -298,9 +298,9 @@
if (!file.isAbsolute()) {
file = FILE_UTILS.resolveFile(helperImpl.buildFileParent, path);
helperImpl.project.log(
- "Warning: '" + systemId + "' in " + helperImpl.buildFile +
- " should be expressed simply as '" + path.replace('\\', '/') +
- "' for compliance with other XML tools",
+ "Warning: '" + systemId + "' in " + helperImpl.buildFile
+ + " should be expressed simply as '" + path.replace('\\', '/')
+ + "' for compliance with other XML tools",
Project.MSG_WARN);
}
try {
Modified: ant/core/trunk/src/main/org/apache/tools/ant/input/GreedyInputHandler.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/input/GreedyInputHandler.java?view=diff&rev=469717&r1=469716&r2=469717
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/input/GreedyInputHandler.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/input/GreedyInputHandler.java Tue Oct 31 16:13:43 2006
@@ -62,6 +62,7 @@
try {
t.join();
} catch (InterruptedException e2) {
+ // Ignore
}
}
request.setInput(new String(baos.toByteArray()));
Modified: ant/core/trunk/src/main/org/apache/tools/ant/input/InputRequest.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/input/InputRequest.java?view=diff&rev=469717&r1=469716&r2=469717
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/input/InputRequest.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/input/InputRequest.java Tue Oct 31 16:13:43 2006
@@ -74,6 +74,7 @@
/**
* Gets a configured default value.
+ * @return the default value.
* @since Ant 1.7.0
*/
public String getDefaultValue() {
@@ -82,6 +83,7 @@
/**
* Configures a default value.
+ * @param d the value to set.
* @since Ant 1.7.0
*/
public void setDefaultValue(String d) {
Modified: ant/core/trunk/src/main/org/apache/tools/ant/launch/Launcher.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/launch/Launcher.java?view=diff&rev=469717&r1=469716&r2=469717
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/launch/Launcher.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/launch/Launcher.java Tue Oct 31 16:13:43 2006
@@ -126,7 +126,7 @@
private void addPath(String path, boolean getJars, List libPathURLs)
throws MalformedURLException {
StringTokenizer tokenizer = new StringTokenizer(path, File.pathSeparator);
- while(tokenizer.hasMoreElements()) {
+ while (tokenizer.hasMoreElements()) {
String elementName = tokenizer.nextToken();
File element = new File(elementName);
if (elementName.indexOf("%") != -1 && !element.exists()) {
@@ -291,14 +291,14 @@
URLClassLoader loader = new URLClassLoader(jars);
Thread.currentThread().setContextClassLoader(loader);
Class mainClass = null;
- int exitCode=0;
+ int exitCode = 0;
try {
mainClass = loader.loadClass(mainClassname);
AntMain main = (AntMain) mainClass.newInstance();
main.startAnt(newArgs, null, null);
} catch (InstantiationException ex) {
System.err.println(
- "Incompatible version of "+mainClassname+" detected");
+ "Incompatible version of " + mainClassname + " detected");
File mainJar = Locator.getClassSource(mainClass);
System.err.println(
"Location of this class " + mainJar);
@@ -308,7 +308,5 @@
exitCode = EXIT_CODE_ERROR;
}
return exitCode;
-
}
-
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org
For additional commands, e-mail: dev-help@ant.apache.org