You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@ant.apache.org by pe...@apache.org on 2003/09/16 11:08:57 UTC
cvs commit: ant/src/main/org/apache/tools/ant/taskdefs/condition ConditionBase.java Equals.java
peterreilly 2003/09/16 02:08:57
Modified: src/main/org/apache/tools/ant/taskdefs Copy.java Filter.java
FixCRLF.java Get.java Input.java Jar.java Java.java
Javac.java Javadoc.java Jikes.java
JikesOutputParser.java KeySubst.java
LogOutputStream.java Sync.java Tar.java
TaskOutputStream.java Taskdef.java Tstamp.java
Untar.java WaitFor.java War.java XSLTProcess.java
Zip.java
src/main/org/apache/tools/ant/taskdefs/compilers
CompilerAdapter.java CompilerAdapterFactory.java
DefaultCompilerAdapter.java Jikes.java Kjc.java
src/main/org/apache/tools/ant/taskdefs/condition
ConditionBase.java Equals.java
Log:
Next round of typo fixes by Larry Shatzer
Revision Changes Path
1.66 +2 -2 ant/src/main/org/apache/tools/ant/taskdefs/Copy.java
Index: Copy.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Copy.java,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- Copy.java 13 Sep 2003 12:58:33 -0000 1.65
+++ Copy.java 16 Sep 2003 09:08:55 -0000 1.66
@@ -193,7 +193,7 @@
/**
* Give the copied files the same last modified time as the original files.
- * @param preserve if true preserve the modified time, default is false
+ * @param preserve if true perverse the modified time, default is false
*/
public void setPreserveLastModified(boolean preserve) {
preserveLastModified = preserve;
1.23 +2 -2 ant/src/main/org/apache/tools/ant/taskdefs/Filter.java
Index: Filter.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Filter.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- Filter.java 10 Feb 2003 14:13:34 -0000 1.22
+++ Filter.java 16 Sep 2003 09:08:55 -0000 1.23
@@ -1,7 +1,7 @@
/*
* 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.
*
* Redistribution and use in source and binary forms, with or without
@@ -61,7 +61,7 @@
/**
* Sets a token filter that is used by the file copy tasks
- * to do token substitution. Sets mutiple tokens by
+ * to do token substitution. Sets multiple tokens by
* reading these from a file.
*
* @author Stefano Mazzocchi
1.54 +2 -2 ant/src/main/org/apache/tools/ant/taskdefs/FixCRLF.java
Index: FixCRLF.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/FixCRLF.java,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- FixCRLF.java 22 Aug 2003 15:25:44 -0000 1.53
+++ FixCRLF.java 16 Sep 2003 09:08:55 -0000 1.54
@@ -672,7 +672,7 @@
/**
- * Process a BufferLine string which is not part of of a string constant.
+ * Process a BufferLine string which is not part of a string constant.
* The start position of the string is given by the 'next' field.
* Sets the 'next' and 'column' fields in the BufferLine.
*
1.38 +2 -2 ant/src/main/org/apache/tools/ant/taskdefs/Get.java
Index: Get.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Get.java,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- Get.java 24 Jul 2003 13:48:15 -0000 1.37
+++ Get.java 16 Sep 2003 09:08:55 -0000 1.38
@@ -171,7 +171,7 @@
//not modified so no file download. just return
//instead and trace out something so the user
//doesn't think that the download happened when it
- //didnt
+ //didn't
log("Not modified - so not downloaded");
return;
}
@@ -192,7 +192,7 @@
//REVISIT: at this point even non HTTP connections may
//support the if-modified-since behaviour -we just check
//the date of the content and skip the write if it is not
- //newer. Some protocols (FTP) dont include dates, of
+ //newer. Some protocols (FTP) don't include dates, of
//course.
InputStream is = null;
1.23 +1 -1 ant/src/main/org/apache/tools/ant/taskdefs/Input.java
Index: Input.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Input.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- Input.java 3 Sep 2003 16:47:17 -0000 1.22
+++ Input.java 16 Sep 2003 09:08:55 -0000 1.23
@@ -92,7 +92,7 @@
/**
* Defines the name of a property to be created from input. Behaviour is
* according to property task which means that existing properties
- * cannot be overriden.
+ * cannot be overridden.
*
* @param addproperty Name for the property to be created from input
*/
1.81 +2 -2 ant/src/main/org/apache/tools/ant/taskdefs/Jar.java
Index: Jar.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Jar.java,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- Jar.java 13 Aug 2003 14:46:15 -0000 1.80
+++ Jar.java 16 Sep 2003 09:08:55 -0000 1.81
@@ -93,7 +93,7 @@
/** The index file name. */
private static final String INDEX_NAME = "META-INF/INDEX.LIST";
- /** The mainfest file name. */
+ /** The manifest file name. */
private static final String MANIFEST_NAME = "META-INF/MANIFEST.MF";
/** merged manifests added through addConfiguredManifest */
@@ -483,7 +483,7 @@
}
/**
- * Overriden from Zip class to deal with manifests and index lists.
+ * Overridden from Zip class to deal with manifests and index lists.
*/
protected void zipFile(InputStream is, ZipOutputStream zOut, String vPath,
long lastModified, File fromArchive, int mode)
1.75 +1 -1 ant/src/main/org/apache/tools/ant/taskdefs/Java.java
Index: Java.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Java.java,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- Java.java 11 Sep 2003 14:04:16 -0000 1.74
+++ Java.java 16 Sep 2003 09:08:55 -0000 1.75
@@ -803,7 +803,7 @@
*
* @return new watchdog
*
- * @throws BuildException under unknown circumnstances
+ * @throws BuildException under unknown circumstances
*
* @since Ant 1.5
*/
1.115 +7 -7 ant/src/main/org/apache/tools/ant/taskdefs/Javac.java
Index: Javac.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Javac.java,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- Javac.java 11 Aug 2003 13:43:10 -0000 1.114
+++ Javac.java 16 Sep 2003 09:08:55 -0000 1.115
@@ -82,7 +82,7 @@
* <li>encoding
* <li>target
* <li>depend
- * <li>vebose
+ * <li>verbose
* <li>failonerror
* <li>includeantruntime
* <li>includejavaruntime
@@ -243,7 +243,7 @@
/**
* Gets the source dirs to find the source java files.
- * @return the source directorys as a path
+ * @return the source directories as a path
*/
public Path getSrcdir() {
return src;
@@ -660,7 +660,7 @@
}
/**
- * Sets the the name of the javac executable.
+ * Sets the name of the javac executable.
*
* <p>Ignored unless fork is true or extJavac has been specified
* as the compiler.</p>
@@ -765,7 +765,7 @@
* Where Ant should place temporary files.
*
* @since Ant 1.6
- * @return the temorary directory
+ * @return the temporary directory
*/
public File getTempdir() {
return tmpDir;
@@ -875,7 +875,7 @@
/**
* The implementation for this particular task.
*
- * <p>Defaults to the build.compiler property but can be overriden
+ * <p>Defaults to the build.compiler property but can be overridden
* via the compiler and fork attributes.</p>
*
* <p>If fork has been set to true, the result will be extJavac
@@ -906,7 +906,7 @@
/**
* The implementation for this particular task.
*
- * <p>Defaults to the build.compiler property but can be overriden
+ * <p>Defaults to the build.compiler property but can be overridden
* via the compiler attribute.</p>
*
* <p>This method does not take the fork attribute into
1.124 +1 -1 ant/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
Index: Javadoc.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Javadoc.java,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -r1.123 -r1.124
--- Javadoc.java 13 Aug 2003 14:46:15 -0000 1.123
+++ Javadoc.java 16 Sep 2003 09:08:55 -0000 1.124
@@ -1173,7 +1173,7 @@
/**
* Control warnings about serial tag.
*
- * @param b if true, generate warning aboutthe serial tag.
+ * @param b if true, generate warning about the serial tag.
*/
public void setSerialwarn(boolean b) {
add12ArgIf(b, "-serialwarn");
1.18 +3 -3 ant/src/main/org/apache/tools/ant/taskdefs/Jikes.java
Index: Jikes.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Jikes.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- Jikes.java 19 Jul 2003 11:20:12 -0000 1.17
+++ Jikes.java 16 Sep 2003 09:08:55 -0000 1.18
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000,2002 The Apache Software Foundation. All rights
+ * Copyright (c) 2000,2002-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -79,9 +79,9 @@
protected Project project;
/**
- * Constructs a new Jikes obect.
+ * Constructs a new Jikes object.
* @param jop - Parser to send jike's output to
- * @param command - name of jikes executeable
+ * @param command - name of jikes executable
*/
protected Jikes(JikesOutputParser jop, String command, Project project) {
super();
1.17 +4 -4 ant/src/main/org/apache/tools/ant/taskdefs/JikesOutputParser.java
Index: JikesOutputParser.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/JikesOutputParser.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- JikesOutputParser.java 19 Jul 2003 08:10:59 -0000 1.16
+++ JikesOutputParser.java 16 Sep 2003 09:08:55 -0000 1.17
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000,2002 The Apache Software Foundation. All rights
+ * Copyright (c) 2000,2002-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -117,7 +117,7 @@
/**
* Construct a new Parser object
- * @param task - task in whichs context we are called
+ * @param task - task in which context we are called
*/
protected JikesOutputParser(Task task, boolean emacsMode) {
super();
@@ -147,7 +147,7 @@
private void parseStandardOutput(BufferedReader reader) throws IOException {
String line;
String lower;
- // We assume, that every output, jike does, stands for an error/warning
+ // We assume, that every output, jikes does, stands for an error/warning
// XXX
// Is this correct?
@@ -201,7 +201,7 @@
/**
* Indicate if there were errors during the compile
- * @return if errors ocured
+ * @return if errors occurred
*/
protected boolean getErrorFlag() {
return errorFlag;
1.21 +2 -2 ant/src/main/org/apache/tools/ant/taskdefs/KeySubst.java
Index: KeySubst.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/KeySubst.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- KeySubst.java 24 Jul 2003 12:53:34 -0000 1.20
+++ KeySubst.java 16 Sep 2003 09:08:55 -0000 1.21
@@ -87,7 +87,7 @@
*/
public void execute() throws BuildException {
log("!! KeySubst is deprecated. Use Filter + Copy instead. !!");
- log("Performing Substitions");
+ log("Performing Substitutions");
if (source == null || dest == null) {
log("Source and destinations must not be null");
return;
@@ -148,7 +148,7 @@
}
/**
- Sets the seperator between name=value arguments
+ Sets the separator between name=value arguments
in setKeys(). By default it is "*".
*/
public void setSep(String sep) {
1.16 +1 -1 ant/src/main/org/apache/tools/ant/taskdefs/LogOutputStream.java
Index: LogOutputStream.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/LogOutputStream.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- LogOutputStream.java 18 Jul 2003 12:45:56 -0000 1.15
+++ LogOutputStream.java 16 Sep 2003 09:08:55 -0000 1.16
@@ -171,7 +171,7 @@
/**
* 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 len the length of block
*
1.7 +2 -2 ant/src/main/org/apache/tools/ant/taskdefs/Sync.java
Index: Sync.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Sync.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Sync.java 19 Jul 2003 11:20:13 -0000 1.6
+++ Sync.java 16 Sep 2003 09:08:55 -0000 1.7
@@ -168,7 +168,7 @@
}
/**
- * Removes all files and folders not found as keyes of a table
+ * Removes all files and folders not found as keys of a table
* (used as a set!).
*
* <p>If the provided file is a directory, it is recursively
1.46 +4 -4 ant/src/main/org/apache/tools/ant/taskdefs/Tar.java
Index: Tar.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Tar.java,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- Tar.java 19 Jul 2003 08:10:59 -0000 1.45
+++ Tar.java 16 Sep 2003 09:08:55 -0000 1.46
@@ -172,7 +172,7 @@
* Allowable values are
* <ul>
* <li> truncate - paths are truncated to the maximum length
- * <li> fail - paths greater than the maximim cause a build exception
+ * <li> fail - paths greater than the maximum cause a build exception
* <li> warn - paths greater than the maximum cause a warning and GNU is used
* <li> gnu - GNU extensions are used for any paths greater than the maximum.
* <li> omit - paths greater than the maximum are omitted from the archive
@@ -196,7 +196,7 @@
* Allowable values are
* <ul>
* <li> truncate - paths are truncated to the maximum length
- * <li> fail - paths greater than the maximim cause a build exception
+ * <li> fail - paths greater than the maximum cause a build exception
* <li> warn - paths greater than the maximum cause a warning and GNU is used
* <li> gnu - GNU extensions are used for any paths greater than the maximum.
* <li> omit - paths greater than the maximum are omitted from the archive
@@ -596,7 +596,7 @@
*/
public static class TarLongFileMode extends EnumeratedAttribute {
- // permissable values for longfile attribute
+ // permissible values for longfile attribute
public static final String WARN = "warn";
public static final String FAIL = "fail";
public static final String TRUNCATE = "truncate";
@@ -641,7 +641,7 @@
*/
public static final class TarCompressionMethod extends EnumeratedAttribute {
- // permissable values for compression attribute
+ // permissible values for compression attribute
/**
* No compression
*/
1.13 +2 -2 ant/src/main/org/apache/tools/ant/taskdefs/TaskOutputStream.java
Index: TaskOutputStream.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/TaskOutputStream.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- TaskOutputStream.java 19 Jul 2003 11:20:13 -0000 1.12
+++ TaskOutputStream.java 16 Sep 2003 09:08:55 -0000 1.13
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000,2002 The Apache Software Foundation. All rights
+ * Copyright (c) 2000,2002-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -117,7 +117,7 @@
}
/**
- * Processes a line of input and determines if an error occured.
+ * Processes a line of input and determines if an error occurred.
*/
private void processLine() {
1.31 +1 -1 ant/src/main/org/apache/tools/ant/taskdefs/Taskdef.java
Index: Taskdef.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Taskdef.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- Taskdef.java 7 Jul 2003 14:40:14 -0000 1.30
+++ Taskdef.java 16 Sep 2003 09:08:55 -0000 1.31
@@ -76,7 +76,7 @@
public class Taskdef extends Typedef {
/**
- * Default constuctor.
+ * Default constructor.
* Creates a new Taskdef instance.
* This sets the adapter and the adaptto classes to
* TaskAdapter and Task.
1.37 +3 -3 ant/src/main/org/apache/tools/ant/taskdefs/Tstamp.java
Index: Tstamp.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Tstamp.java,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- Tstamp.java 17 Jul 2003 15:44:38 -0000 1.36
+++ Tstamp.java 16 Sep 2003 09:08:55 -0000 1.37
@@ -1,7 +1,7 @@
/*
* 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.
*
* Redistribution and use in source and binary forms, with or without
@@ -101,7 +101,7 @@
/**
* create the timestamps. Custom ones are done before
- * the standard ones, to get their retalation in early.
+ * the standard ones, to get their retaliation in early.
* @throws BuildException
*/
public void execute() throws BuildException {
@@ -130,7 +130,7 @@
}
/**
- * create a custom format with the the current prefix.
+ * create a custom format with the current prefix.
* @return a ready to fill-in format
*/
public CustomFormat createFormat() {
1.37 +2 -2 ant/src/main/org/apache/tools/ant/taskdefs/Untar.java
Index: Untar.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Untar.java,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- Untar.java 19 Jul 2003 08:10:59 -0000 1.36
+++ Untar.java 16 Sep 2003 09:08:55 -0000 1.37
@@ -77,7 +77,7 @@
* <p>PatternSets are used to select files to extract
* <I>from</I> the archive. If no patternset is used, all files are extracted.
* </p>
- * <p>FileSet>s may be used used to select archived files
+ * <p>FileSet>s may be used to select archived files
* to perform unarchival upon.
* </p>
* <p>File permissions will not be restored on extracted files.</p>
@@ -160,7 +160,7 @@
public static final class UntarCompressionMethod
extends EnumeratedAttribute {
- // permissable values for compression attribute
+ // permissible values for compression attribute
/**
* No compression
*/
1.19 +3 -3 ant/src/main/org/apache/tools/ant/taskdefs/WaitFor.java
Index: WaitFor.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/WaitFor.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- WaitFor.java 18 Jul 2003 14:21:22 -0000 1.18
+++ WaitFor.java 16 Sep 2003 09:08:55 -0000 1.19
@@ -1,7 +1,7 @@
/*
* 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.
*
* Redistribution and use in source and binary forms, with or without
@@ -65,7 +65,7 @@
*
* Wait for an external process to start or to complete some
* task. This is useful with the <code>parallel</code> task to
- * syncronize the execution of tests with server startup.
+ * synchronize the execution of tests with server startup.
*
* The following attributes can be specified on a waitfor task:
* <ul>
@@ -77,7 +77,7 @@
* </ul>
*
* The maxwaitunit and checkeveryunit are allowed to have the following values:
- * millesond, second, minute, hour, day and week. The default is millisecond.
+ * millisecond, second, minute, hour, day and week. The default is millisecond.
*
* @author <a href="mailto:denis@network365.com">Denis Hennessy</a>
* @author Magesh Umasankar
1.35 +1 -1 ant/src/main/org/apache/tools/ant/taskdefs/War.java
Index: War.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/War.java,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- War.java 19 Jul 2003 11:20:13 -0000 1.34
+++ War.java 16 Sep 2003 09:08:55 -0000 1.35
@@ -174,7 +174,7 @@
}
/**
- * Overriden from Zip class to deal with web.xml
+ * Overridden from Zip class to deal with web.xml
*/
protected void zipFile(File file, ZipOutputStream zOut, String vPath,
int mode)
1.78 +3 -3 ant/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java
Index: XSLTProcess.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- XSLTProcess.java 15 Sep 2003 09:11:57 -0000 1.77
+++ XSLTProcess.java 16 Sep 2003 09:08:55 -0000 1.78
@@ -509,7 +509,7 @@
* Process the input file to the output file with the given stylesheet.
*
* @param inFile the input file to process.
- * @param outFile the detination file.
+ * @param outFile the destination file.
* @param stylesheet the stylesheet to use.
* @exception BuildException if the processing fails.
*/
@@ -709,7 +709,7 @@
/**
* Set whether this param should NOT be used. It
- * will not be used if the property has been set, orthwise it
+ * will not be used if the property has been set, otherwise it
* will be used.
* @param unlessProperty name of property
*/
1.116 +1 -1 ant/src/main/org/apache/tools/ant/taskdefs/Zip.java
Index: Zip.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Zip.java,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- Zip.java 13 Aug 2003 14:46:15 -0000 1.115
+++ Zip.java 16 Sep 2003 09:08:56 -0000 1.116
@@ -899,7 +899,7 @@
/**
* Fetch all included and not excluded resources from the sets.
*
- * <p>Included directories will preceede included files.</p>
+ * <p>Included directories will precede included files.</p>
*
* @since Ant 1.5.2
*/
1.8 +3 -3 ant/src/main/org/apache/tools/ant/taskdefs/compilers/CompilerAdapter.java
Index: CompilerAdapter.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/compilers/CompilerAdapter.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- CompilerAdapter.java 19 Jul 2003 08:11:01 -0000 1.7
+++ CompilerAdapter.java 16 Sep 2003 09:08:57 -0000 1.8
@@ -1,7 +1,7 @@
/*
* 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.
*
* Redistribution and use in source and binary forms, with or without
@@ -58,10 +58,10 @@
import org.apache.tools.ant.taskdefs.Javac;
/**
- * The interface that all compiler adapters must adher to.
+ * The interface that all compiler adapters must adhere to.
*
* <p>A compiler adapter is an adapter that interprets the javac's
- * parameters in preperation to be passed off to the compier this
+ * parameters in preparation to be passed off to the compiler this
* adapter represents. As all the necessary values are stored in the
* Javac task itself, the only thing all adapters need is the javac
* task, the execute command and a parameterless constructor (for
1.21 +3 -3 ant/src/main/org/apache/tools/ant/taskdefs/compilers/CompilerAdapterFactory.java
Index: CompilerAdapterFactory.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/compilers/CompilerAdapterFactory.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- CompilerAdapterFactory.java 19 Jul 2003 11:20:15 -0000 1.20
+++ CompilerAdapterFactory.java 16 Sep 2003 09:08:57 -0000 1.21
@@ -1,7 +1,7 @@
/*
* 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.
*
* Redistribution and use in source and binary forms, with or without
@@ -86,7 +86,7 @@
* <li>kjc = the kopi compiler</li>
* <li>gcj = the gcj compiler from gcc</li>
* <li>sj, symantec = the Symantec Java compiler</li>
- * <li><i>a fully quallified classname</i> = the name of a compiler
+ * <li><i>a fully qualified classname</i> = the name of a compiler
* adapter
* </ul>
*
@@ -167,7 +167,7 @@
/**
* query for the Modern compiler existing
- * @return true iff classic os on the classpath
+ * @return true if classic os on the classpath
*/
private static boolean doesModernCompilerExist() {
try {
1.41 +2 -2 ant/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java
Index: DefaultCompilerAdapter.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- DefaultCompilerAdapter.java 24 Jul 2003 13:55:57 -0000 1.40
+++ DefaultCompilerAdapter.java 16 Sep 2003 09:08:57 -0000 1.41
@@ -373,7 +373,7 @@
/**
* Logs the compilation parameters, adds the files to compile and logs the
- * &qout;niceSourceList"
+ * "niceSourceList"
*/
protected void logAndAddFilesToCompile(Commandline cmd) {
attributes.log("Compilation " + cmd.describeArguments(),
@@ -503,7 +503,7 @@
}
/**
- * Adds the command line arguments specifc to the current implementation.
+ * Adds the command line arguments specific to the current implementation.
*/
protected void addCurrentCompilerArgs(Commandline cmd) {
cmd.addArguments(getJavac().getCurrentCompilerArgs());
1.22 +1 -1 ant/src/main/org/apache/tools/ant/taskdefs/compilers/Jikes.java
Index: Jikes.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/compilers/Jikes.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- Jikes.java 19 Jul 2003 08:11:01 -0000 1.21
+++ Jikes.java 16 Sep 2003 09:08:57 -0000 1.22
@@ -172,7 +172,7 @@
* Jikes has the nice feature to print error
* messages in a form readable by emacs, so
* that emacs can directly set the cursor
- * to the place, where the error occured.
+ * to the place, where the error occurred.
*/
String emacsProperty = project.getProperty("build.compiler.emacs");
if (emacsProperty != null && Project.toBoolean(emacsProperty)) {
1.14 +2 -2 ant/src/main/org/apache/tools/ant/taskdefs/compilers/Kjc.java
Index: Kjc.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/compilers/Kjc.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- Kjc.java 19 Jul 2003 08:11:01 -0000 1.13
+++ Kjc.java 16 Sep 2003 09:08:57 -0000 1.14
@@ -1,7 +1,7 @@
/*
* 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.
*
* Redistribution and use in source and binary forms, with or without
@@ -111,7 +111,7 @@
protected Commandline setupKjcCommand() {
Commandline cmd = new Commandline();
- // generate classpath, because kjc does't support sourcepath.
+ // generate classpath, because kjc doesn't support sourcepath.
Path classpath = getCompileClasspath();
if (deprecation == true) {
1.22 +2 -2 ant/src/main/org/apache/tools/ant/taskdefs/condition/ConditionBase.java
Index: ConditionBase.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/condition/ConditionBase.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- ConditionBase.java 25 Jul 2003 08:28:21 -0000 1.21
+++ ConditionBase.java 16 Sep 2003 09:08:57 -0000 1.22
@@ -253,7 +253,7 @@
}
/**
- * Add an arbitary condition
+ * Add an arbitrary condition
* @param c a condition
* @since Ant 1.6
*/
1.10 +2 -2 ant/src/main/org/apache/tools/ant/taskdefs/condition/Equals.java
Index: Equals.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/condition/Equals.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Equals.java 25 Jul 2003 08:28:21 -0000 1.9
+++ Equals.java 16 Sep 2003 09:08:57 -0000 1.10
@@ -98,7 +98,7 @@
/**
* Should the comparison be case sensitive?
- * @param b if true use a case sensitive comparision (this is the
+ * @param b if true use a case sensitive comparison (this is the
* default)
* @since Ant 1.5
*/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org
For additional commands, e-mail: dev-help@ant.apache.org