git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@275240 13f79535-47bb-0310-9956-ffa450edef68master
@@ -126,7 +126,7 @@ public class MacroDef extends Task implements AntlibInterface, TaskContainer { | |||||
} | } | ||||
/** | /** | ||||
* <em>Expermential</em> | |||||
* <em>Experimental</em> | |||||
* I am uncertain at the moment how to encode attributes | * I am uncertain at the moment how to encode attributes | ||||
* using ant style ${attribute} or xpath style @attribute. | * using ant style ${attribute} or xpath style @attribute. | ||||
* The first may get mixed up with ant properties and | * The first may get mixed up with ant properties and | ||||
@@ -140,7 +140,7 @@ public class MacroDef extends Task implements AntlibInterface, TaskContainer { | |||||
} | } | ||||
/** | /** | ||||
* <em>Expermential</em> | |||||
* <em>Experimental</em> | |||||
* @return the attribute style | * @return the attribute style | ||||
*/ | */ | ||||
public int getAttributeStyle() { | public int getAttributeStyle() { | ||||
@@ -511,7 +511,7 @@ public class MacroDef extends Task implements AntlibInterface, TaskContainer { | |||||
} | } | ||||
/** | /** | ||||
* Similiar method for this definition | |||||
* Similar method for this definition | |||||
* | * | ||||
* @param other another definition | * @param other another definition | ||||
* @param project the current project | * @param project the current project | ||||
@@ -75,7 +75,7 @@ import org.apache.tools.ant.RuntimeConfigurable; | |||||
* The class to be placed in the ant type definition. | * The class to be placed in the ant type definition. | ||||
* It is given a pointer to the template definition, | * It is given a pointer to the template definition, | ||||
* and makes a copy of the unknown element, substituting | * and makes a copy of the unknown element, substituting | ||||
* the the parameter values in attributes and text. | |||||
* the parameter values in attributes and text. | |||||
* @author Peter Reilly | * @author Peter Reilly | ||||
* @since Ant 1.6 | * @since Ant 1.6 | ||||
*/ | */ | ||||
@@ -321,7 +321,7 @@ public class Manifest { | |||||
* | * | ||||
* @param writer the Writer to which the attribute is written | * @param writer the Writer to which the attribute is written | ||||
* | * | ||||
* @throws IOException if the attribte value cannot be written | |||||
* @throws IOException if the attribute value cannot be written | |||||
*/ | */ | ||||
public void write(PrintWriter writer) throws IOException { | public void write(PrintWriter writer) throws IOException { | ||||
for (Enumeration e = getValues(); e.hasMoreElements();) { | for (Enumeration e = getValues(); e.hasMoreElements();) { | ||||
@@ -335,7 +335,7 @@ public class Manifest { | |||||
* @param writer the Writer to which the attribute is written | * @param writer the Writer to which the attribute is written | ||||
* @param value the attribute value | * @param value the attribute value | ||||
* | * | ||||
* @throws IOException if the attribte value cannot be written | |||||
* @throws IOException if the attribute value cannot be written | |||||
*/ | */ | ||||
private void writeValue(PrintWriter writer, String value) | private void writeValue(PrintWriter writer, String value) | ||||
throws IOException { | throws IOException { | ||||
@@ -857,7 +857,7 @@ public class Manifest { | |||||
* @param other the Manifest to be merged with this one. | * @param other the Manifest to be merged with this one. | ||||
* | * | ||||
* @throws ManifestException if there is a problem merging the | * @throws ManifestException if there is a problem merging the | ||||
* manfest according to the Manifest spec. | |||||
* manifest according to the Manifest spec. | |||||
*/ | */ | ||||
public void merge(Manifest other) throws ManifestException { | public void merge(Manifest other) throws ManifestException { | ||||
merge(other, false); | merge(other, false); | ||||
@@ -871,7 +871,7 @@ public class Manifest { | |||||
* of the current manifest | * of the current manifest | ||||
* | * | ||||
* @throws ManifestException if there is a problem merging the | * @throws ManifestException if there is a problem merging the | ||||
* manfest according to the Manifest spec. | |||||
* manifest according to the Manifest spec. | |||||
*/ | */ | ||||
public void merge(Manifest other, boolean overwriteMain) | public void merge(Manifest other, boolean overwriteMain) | ||||
throws ManifestException { | throws ManifestException { | ||||
@@ -474,7 +474,7 @@ public abstract class MatchingTask extends Task implements SelectorContainer { | |||||
} | } | ||||
/** | /** | ||||
* Accessor for the implict fileset. | |||||
* Accessor for the implicit fileset. | |||||
* | * | ||||
* @since Ant 1.5.2 | * @since Ant 1.5.2 | ||||
*/ | */ | ||||
@@ -365,7 +365,7 @@ public class Move extends Copy { | |||||
} else { | } else { | ||||
if (!filtering) { | if (!filtering) { | ||||
// ensure that parent dir of dest file exists! | // ensure that parent dir of dest file exists! | ||||
// not using getParentFile method to stay 1.1 compat | |||||
// not using getParentFile method to stay 1.1 compatibility | |||||
String parentPath = destFile.getParent(); | String parentPath = destFile.getParent(); | ||||
if (parentPath != null) { | if (parentPath != null) { | ||||
File parent = new File(parentPath); | File parent = new File(parentPath); | ||||
@@ -207,7 +207,7 @@ public class Parallel extends Task | |||||
* is set and the JVM is at least a 1.4 VM then this value is | * is set and the JVM is at least a 1.4 VM then this value is | ||||
* ignored.; optional | * ignored.; optional | ||||
* | * | ||||
* @param numThreads total number of therads. | |||||
* @param numThreads total number of threads. | |||||
* | * | ||||
*/ | */ | ||||
public void setThreadCount(int numThreads) { | public void setThreadCount(int numThreads) { | ||||
@@ -351,7 +351,7 @@ public class Parallel extends Task | |||||
running[i] = runnables[threadNumber++]; | running[i] = runnables[threadNumber++]; | ||||
Thread thread = new Thread(group, running[i]); | Thread thread = new Thread(group, running[i]); | ||||
thread.start(); | thread.start(); | ||||
// countinue on outer while loop to get another | |||||
// continue on outer while loop to get another | |||||
// available slot | // available slot | ||||
continue outer; | continue outer; | ||||
} | } | ||||
@@ -362,7 +362,7 @@ public class Parallel extends Task | |||||
try { | try { | ||||
semaphore.wait(); | semaphore.wait(); | ||||
} catch (InterruptedException ie) { | } catch (InterruptedException ie) { | ||||
// dosen't java know interruptions are rude? | |||||
// doesn't java know interruptions are rude? | |||||
// just pretend it didn't happen and go about out business. | // just pretend it didn't happen and go about out business. | ||||
// sheesh! | // sheesh! | ||||
} | } | ||||
@@ -442,7 +442,7 @@ public class Parallel extends Task | |||||
/** | /** | ||||
* Construct a new TaskRunnable.<p> | * Construct a new TaskRunnable.<p> | ||||
* | * | ||||
* @param task the Task to be executed in a seperate thread | |||||
* @param task the Task to be executed in a separate thread | |||||
*/ | */ | ||||
TaskRunnable(Task task) { | TaskRunnable(Task task) { | ||||
this.task = task; | this.task = task; | ||||
@@ -150,7 +150,7 @@ public class Patch extends Task { | |||||
/** | /** | ||||
* Work silently unless an error occurs; optional, default=false | * Work silently unless an error occurs; optional, default=false | ||||
* @param q if true supress set the -s option on the patch command | |||||
* @param q if true suppress set the -s option on the patch command | |||||
*/ | */ | ||||
public void setQuiet(boolean q) { | public void setQuiet(boolean q) { | ||||
if (q) { | if (q) { | ||||
@@ -288,7 +288,7 @@ public class PreSetDef extends Task implements AntlibInterface, TaskContainer { | |||||
} | } | ||||
/** | /** | ||||
* Similiar method for this definition | |||||
* Similar method for this definition | |||||
* | * | ||||
* @param other another definition | * @param other another definition | ||||
* @param project the current project | * @param project the current project | ||||
@@ -74,7 +74,7 @@ import org.apache.tools.ant.types.Reference; | |||||
* Sets a property by name, or set of properties (from file or | * Sets a property by name, or set of properties (from file or | ||||
* resource) in the project. </p> | * resource) in the project. </p> | ||||
* Properties are immutable: whoever sets a property first freezes it for the | * Properties are immutable: whoever sets a property first freezes it for the | ||||
* rest of the build; they are most definately not variable. | |||||
* rest of the build; they are most definitely not variable. | |||||
* <p>There are five ways to set properties:</p> | * <p>There are five ways to set properties:</p> | ||||
* <ul> | * <ul> | ||||
* <li>By supplying both the <i>name</i> and <i>value</i> attribute.</li> | * <li>By supplying both the <i>name</i> and <i>value</i> attribute.</li> | ||||
@@ -80,7 +80,7 @@ import org.apache.tools.ant.util.TeeOutputStream; | |||||
*/ | */ | ||||
public class Redirector { | public class Redirector { | ||||
/** | /** | ||||
* The file receiveing standard output. Will also receive standard error | |||||
* The file receiving standard output. Will also receive standard error | |||||
* unless standard error is redirected or logError is true. | * unless standard error is redirected or logError is true. | ||||
*/ | */ | ||||
private File out; | private File out; | ||||
@@ -445,7 +445,7 @@ public class Redirector { | |||||
/** | /** | ||||
* Complete redirection. | * Complete redirection. | ||||
* | * | ||||
* This opertaion will close any streams and create any specified | |||||
* This operation will close any streams and create any specified | |||||
* property values. | * property values. | ||||
* | * | ||||
* @throws IOException if the output properties cannot be read from their | * @throws IOException if the output properties cannot be read from their | ||||
@@ -175,7 +175,7 @@ public class Rmic extends MatchingTask { | |||||
} | } | ||||
/** | /** | ||||
* Sets the the class to run <code>rmic</code> against; | |||||
* Sets the class to run <code>rmic</code> against; | |||||
* optional | * optional | ||||
*/ | */ | ||||
public void setClassname(String classname) { | public void setClassname(String classname) { | ||||
@@ -273,7 +273,7 @@ public class SQLExec extends JDBCTask { | |||||
* Set the delimiter type: "normal" or "row" (default "normal"). | * Set the delimiter type: "normal" or "row" (default "normal"). | ||||
* | * | ||||
* <p>The delimiter type takes two values - normal and row. Normal | * <p>The delimiter type takes two values - normal and row. Normal | ||||
* means that any occurence of the delimiter terminate the SQL | |||||
* means that any occurrence of the delimiter terminate the SQL | |||||
* command whereas with row, only a line containing just the | * command whereas with row, only a line containing just the | ||||
* delimiter is recognized as the end of the command.</p> | * delimiter is recognized as the end of the command.</p> | ||||
*/ | */ | ||||
@@ -411,7 +411,7 @@ public class SQLExec extends JDBCTask { | |||||
((Transaction) e.nextElement()).runTransaction(out); | ((Transaction) e.nextElement()).runTransaction(out); | ||||
if (!isAutocommit()) { | if (!isAutocommit()) { | ||||
log("Commiting transaction", Project.MSG_VERBOSE); | |||||
log("Committing transaction", Project.MSG_VERBOSE); | |||||
conn.commit(); | conn.commit(); | ||||
} | } | ||||
} | } | ||||
@@ -1,7 +1,7 @@ | |||||
/* | /* | ||||
* The Apache Software License, Version 1.1 | * The Apache Software License, Version 1.1 | ||||
* | * | ||||
* Copyright (c) 2001-2002 The Apache Software Foundation. All rights | |||||
* Copyright (c) 2001-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 | ||||
@@ -65,8 +65,8 @@ import org.apache.tools.ant.Task; | |||||
*<p> | *<p> | ||||
* A negative value can be supplied to any of attributes provided the total sleep time | * A negative value can be supplied to any of attributes provided the total sleep time | ||||
* is positive, pending fundamental changes in physics and JVM | * is positive, pending fundamental changes in physics and JVM | ||||
* execution tims</p> | |||||
* Note that sleep times are always hints to be interpred by the OS how it feels | |||||
* execution times</p> | |||||
* Note that sleep times are always hints to be interpreted by the OS how it feels | |||||
* small times may either be ignored or rounded up to a minimum timeslice. Note | * small times may either be ignored or rounded up to a minimum timeslice. Note | ||||
* also that the system clocks often have a fairly low granularity too, which complicates | * also that the system clocks often have a fairly low granularity too, which complicates | ||||
* measuring how long a sleep actually took.</p> | * measuring how long a sleep actually took.</p> | ||||
@@ -67,7 +67,7 @@ import java.io.OutputStream; | |||||
public class StreamPumper implements Runnable { | public class StreamPumper implements Runnable { | ||||
// TODO: make SIZE an instance variable. | // TODO: make SIZE an instance variable. | ||||
// TODO: add a status flag to note if an error occured in run. | |||||
// TODO: add a status flag to note if an error occurred in run. | |||||
private static final int SIZE = 128; | private static final int SIZE = 128; | ||||
private InputStream is; | private InputStream is; | ||||