Patch from Larry Shatzer git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@275207 13f79535-47bb-0310-9956-ffa450edef68master
@@ -73,7 +73,7 @@ import org.apache.tools.ant.util.JavaEnvUtils; | |||||
import org.apache.tools.ant.util.LoaderUtils; | import org.apache.tools.ant.util.LoaderUtils; | ||||
/** | /** | ||||
* Used to load classes within ant with a different claspath from | |||||
* Used to load classes within ant with a different classpath from | |||||
* that used to start ant. Note that it is possible to force a class | * that used to start ant. Note that it is possible to force a class | ||||
* into this loader even when that class is on the system classpath by | * into this loader even when that class is on the system classpath by | ||||
* using the forceLoadClass method. Any subsequent classes loaded by that | * using the forceLoadClass method. Any subsequent classes loaded by that | ||||
@@ -372,7 +372,7 @@ public class AntClassLoader extends ClassLoader implements BuildListener { | |||||
* Set the classpath to search for classes to load. This should not be | * Set the classpath to search for classes to load. This should not be | ||||
* changed once the classloader starts to server classes | * changed once the classloader starts to server classes | ||||
* | * | ||||
* @param classpath the serahc classpath consisting of directories and | |||||
* @param classpath the search classpath consisting of directories and | |||||
* jar/zip files. | * jar/zip files. | ||||
*/ | */ | ||||
public void setClassPath(Path classpath) { | public void setClassPath(Path classpath) { | ||||
@@ -637,7 +637,7 @@ public class AntClassLoader extends ClassLoader implements BuildListener { | |||||
* loader. | * loader. | ||||
* | * | ||||
* This ensures that instances of the returned class will be compatible | * This ensures that instances of the returned class will be compatible | ||||
* with instances which which have already been loaded on the parent | |||||
* with instances which have already been loaded on the parent | |||||
* loader. | * loader. | ||||
* | * | ||||
* @param classname The name of the class to be loaded. | * @param classname The name of the class to be loaded. | ||||
@@ -1200,7 +1200,7 @@ public class AntClassLoader extends ClassLoader implements BuildListener { | |||||
* Finds a system class (which should be loaded from the same classloader | * Finds a system class (which should be loaded from the same classloader | ||||
* as the Ant core). | * as the Ant core). | ||||
* | * | ||||
* For JDK 1.1 compatability, this uses the findSystemClass method if | |||||
* For JDK 1.1 compatibility, this uses the findSystemClass method if | |||||
* no parent classloader has been specified. | * no parent classloader has been specified. | ||||
* | * | ||||
* @param name The name of the class to be loaded. | * @param name The name of the class to be loaded. | ||||
@@ -83,7 +83,7 @@ public class AntTypeDefinition { | |||||
/** | /** | ||||
* return the definition's name | * return the definition's name | ||||
* @return the name of the defintion | |||||
* @return the name of the definition | |||||
*/ | */ | ||||
public String getName() { | public String getName() { | ||||
return name; | return name; | ||||
@@ -162,7 +162,7 @@ public class AntTypeDefinition { | |||||
/** | /** | ||||
* get the exposed class for this | * get the exposed class for this | ||||
* definition. This will be a proxy class | * definition. This will be a proxy class | ||||
* (adapted class) if there is an adpater | |||||
* (adapted class) if there is an adapter | |||||
* class and the definition class is not | * class and the definition class is not | ||||
* assignable from the assignable class. | * assignable from the assignable class. | ||||
* @param project the current project | * @param project the current project | ||||
@@ -289,7 +289,7 @@ public class AntTypeDefinition { | |||||
} | } | ||||
/** | /** | ||||
* get the constructor of the defintion | |||||
* get the constructor of the definition | |||||
* and invoke it. | * and invoke it. | ||||
*/ | */ | ||||
private Object createAndSet(Project project, Class c) { | private Object createAndSet(Project project, Class c) { | ||||
@@ -80,9 +80,9 @@ import org.apache.tools.ant.taskdefs.Typedef; | |||||
* for backward compatibly. | * for backward compatibly. | ||||
* Project will just delegate its calls to this class. | * Project will just delegate its calls to this class. | ||||
* | * | ||||
* A very simple hook mechnism is provided that allows users to plug | |||||
* A very simple hook mechanism is provided that allows users to plug | |||||
* in custom code. It is also possible to replace the default behavior | * in custom code. It is also possible to replace the default behavior | ||||
* ( for example in an app embeding ant ) | |||||
* ( for example in an app embedding ant ) | |||||
* | * | ||||
* @author Costin Manolache | * @author Costin Manolache | ||||
* @author Peter Reilly | * @author Peter Reilly | ||||
@@ -90,7 +90,7 @@ import org.apache.tools.ant.taskdefs.Typedef; | |||||
* @since Ant1.6 | * @since Ant1.6 | ||||
*/ | */ | ||||
public class ComponentHelper { | public class ComponentHelper { | ||||
/** Map from compoennt name to anttypedefinition */ | |||||
/** Map from component name to anttypedefinition */ | |||||
private AntTypeTable antTypeTable; | private AntTypeTable antTypeTable; | ||||
/** Map of tasks generated from antTypeTable */ | /** Map of tasks generated from antTypeTable */ | ||||
@@ -180,7 +180,7 @@ public class ComponentHelper { | |||||
/** | /** | ||||
* Used with creating child projects. Each child | * Used with creating child projects. Each child | ||||
* project inherites the component definitions | |||||
* project inherits the component definitions | |||||
* from its parent. | * from its parent. | ||||
* @param helper the component helper of the parent project | * @param helper the component helper of the parent project | ||||
*/ | */ | ||||
@@ -204,7 +204,7 @@ public class ComponentHelper { | |||||
* @param componentType The component type, | * @param componentType The component type, | ||||
* Also available as ue.getComponentName() | * Also available as ue.getComponentName() | ||||
* @return the created component | * @return the created component | ||||
* @throws BuildException if an error occuries | |||||
* @throws BuildException if an error occurs | |||||
*/ | */ | ||||
public Object createComponent(UnknownElement ue, | public Object createComponent(UnknownElement ue, | ||||
String ns, | String ns, | ||||
@@ -233,7 +233,7 @@ public class ComponentHelper { | |||||
* | * | ||||
* @param componentName the name of the component, if | * @param componentName the name of the component, if | ||||
* the component is in a namespace, the | * the component is in a namespace, the | ||||
* name is prefixed withe the namespace uri and ":" | |||||
* name is prefixed with the namespace uri and ":" | |||||
* @return the class if found or null if not. | * @return the class if found or null if not. | ||||
*/ | */ | ||||
public Object createComponent(String componentName) { | public Object createComponent(String componentName) { | ||||
@@ -249,7 +249,7 @@ public class ComponentHelper { | |||||
* | * | ||||
* @param componentName the name of the component, if | * @param componentName the name of the component, if | ||||
* the component is in a namespace, the | * the component is in a namespace, the | ||||
* name is prefixed withe the namespace uri and ":" | |||||
* name is prefixed with the namespace uri and ":" | |||||
* @return the class if found or null if not. | * @return the class if found or null if not. | ||||
*/ | */ | ||||
public Class getComponentClass(String componentName) { | public Class getComponentClass(String componentName) { | ||||
@@ -488,7 +488,7 @@ public class ComponentHelper { | |||||
Task task = createNewTask(taskType); | Task task = createNewTask(taskType); | ||||
if (task == null && taskType.equals("property")) { | if (task == null && taskType.equals("property")) { | ||||
// quick fix for Ant.java use of property before | // quick fix for Ant.java use of property before | ||||
// initializeing the project | |||||
// initializing the project | |||||
addTaskDefinition("property", | addTaskDefinition("property", | ||||
org.apache.tools.ant.taskdefs.Property.class); | org.apache.tools.ant.taskdefs.Property.class); | ||||
task = createNewTask(taskType); | task = createNewTask(taskType); | ||||
@@ -822,7 +822,7 @@ public class ComponentHelper { | |||||
return; // namespace that does not contain antlib | return; // namespace that does not contain antlib | ||||
} | } | ||||
if (checkedNamespaces.contains(uri)) { | if (checkedNamespaces.contains(uri)) { | ||||
return; // Alreay processed | |||||
return; // Already processed | |||||
} | } | ||||
checkedNamespaces.add(uri); | checkedNamespaces.add(uri); | ||||
Typedef definer = new Typedef(); | Typedef definer = new Typedef(); | ||||
@@ -1,7 +1,7 @@ | |||||
/* | /* | ||||
* The Apache Software License, Version 1.1 | * The Apache Software License, Version 1.1 | ||||
* | * | ||||
* Copyright (c) 2000-2002 The Apache Software Foundation. All rights | |||||
* Copyright (c) 2000-2003 The Apache Software Foundation. All rights | |||||
* reserved. | * reserved. | ||||
* | * | ||||
* Redistribution and use in source and binary forms, with or without | * Redistribution and use in source and binary forms, with or without | ||||
@@ -160,7 +160,7 @@ public class DefaultLogger implements BuildLogger { | |||||
/** | /** | ||||
* Prints whether the build succeeded or failed, | * Prints whether the build succeeded or failed, | ||||
* any errors the occured during the build, and | |||||
* any errors the occurred during the build, and | |||||
* how long the build took. | * how long the build took. | ||||
* | * | ||||
* @param event An event with any relevant extra information. | * @param event An event with any relevant extra information. | ||||
@@ -304,7 +304,7 @@ public class DefaultLogger implements BuildLogger { | |||||
/** | /** | ||||
* Convenience method to format a specified length of time. | * Convenience method to format a specified length of time. | ||||
* | * | ||||
* @param millis Length of time to format, in milliseonds. | |||||
* @param millis Length of time to format, in milliseconds. | |||||
* | * | ||||
* @return the time as a formatted string. | * @return the time as a formatted string. | ||||
* | * | ||||
@@ -59,7 +59,7 @@ import java.io.InputStream; | |||||
/** | /** | ||||
* | * | ||||
* Passes input requests tot he project objetc for demuxing into | |||||
* Passes input requests tot he project object for demuxing into | |||||
* individual tasks and threads. | * individual tasks and threads. | ||||
* | * | ||||
* @since Ant 1.6 | * @since Ant 1.6 | ||||
@@ -252,7 +252,7 @@ public class DemuxOutputStream extends OutputStream { | |||||
/** | /** | ||||
* Write a block of characters to the output stream | * Write a block of characters to the output stream | ||||
* | * | ||||
* @param b the array containg the data | |||||
* @param b the array containing the data | |||||
* @param off the offset into the array where data starts | * @param off the offset into the array where data starts | ||||
* @param len the length of block | * @param len the length of block | ||||
* | * | ||||