kev
Index: CVSPass.java
===================================================================
RCS file:
/home/cvspublic/ant/src/main/org/apache/tools/ant/taskdefs/CVSPass.java,v
retrieving revision 1.25
diff -u -r1.25 CVSPass.java
--- CVSPass.java 9 Mar 2005 00:20:40 -0000 1.25
+++ CVSPass.java 10 Mar 2005 10:44:33 -0000
@@ -132,10 +132,10 @@
}
}
- private final String mangle(String password) {
+ private final String mangle(String pass) {
StringBuffer buf = new StringBuffer();
- for (int i = 0; i < password.length(); i++) {
- buf.append(shifts[password.charAt(i)]);
+ for (int i = 0, size = pass.length(); i < size; i++) {
+ buf.append(shifts[pass.charAt(i)]);
}
return buf.toString();
}
@@ -167,4 +167,4 @@
this.password = password;
}
-}
+}
\ No newline at end of file
Index: CallTarget.java
===================================================================
RCS file:
/home/cvspublic/ant/src/main/org/apache/tools/ant/taskdefs/CallTarget.java,v
retrieving revision 1.43
diff -u -r1.43 CallTarget.java
--- CallTarget.java 18 Feb 2005 23:27:59 -0000 1.43
+++ CallTarget.java 10 Mar 2005 10:44:33 -0000
@@ -185,11 +185,10 @@
*/
public int handleInput(byte[] buffer, int offset, int length)
throws IOException {
- if (callee != null) {
- return callee.handleInput(buffer, offset, length);
- } else {
- return super.handleInput(buffer, offset, length);
- }
+ return (callee != null ?
+ callee.handleInput(buffer, offset, length) :
+ super.handleInput(buffer, offset, length)
+ );
}
/**
Index: Checksum.java
===================================================================
RCS file:
/home/cvspublic/ant/src/main/org/apache/tools/ant/taskdefs/Checksum.java,v
retrieving revision 1.43
diff -u -r1.43 Checksum.java
--- Checksum.java 6 Jan 2005 11:15:37 -0000 1.43
+++ Checksum.java 10 Mar 2005 10:44:35 -0000
@@ -401,30 +401,30 @@
* Add key-value pair to the hashtable upon which
* to later operate upon.
*/
- private void addToIncludeFileMap(File file) throws BuildException {
- if (file != null) {
- if (file.exists()) {
+ private void addToIncludeFileMap(File fileToAdd) throws BuildException {
+ if (fileToAdd != null) {
+ if (fileToAdd.exists()) {
if (property == null) {
- File checksumFile = getChecksumFile(file);
+ File checksumFile = getChecksumFile(fileToAdd);
if (forceOverwrite || isCondition
- || (file.lastModified() >
checksumFile.lastModified())) {
- includeFileMap.put(file, checksumFile);
+ || (fileToAdd.lastModified() >
checksumFile.lastModified())) {
+ includeFileMap.put(fileToAdd, checksumFile);
} else {
- log(file + " omitted as " + checksumFile + " is up to
date.",
+ log(fileToAdd + " omitted as " + checksumFile + " is
up to date.",
Project.MSG_VERBOSE);
if (totalproperty != null) {
// Read the checksum from disk.
String checksum = readChecksum(checksumFile);
byte[] digest = decodeHex(checksum.toCharArray());
- allDigests.put(file, digest);
+ allDigests.put(fileToAdd, digest);
}
}
} else {
- includeFileMap.put(file, property);
+ includeFileMap.put(fileToAdd, property);
}
} else {
String message = "Could not find file "
- + file.getAbsolutePath()
+ + fileToAdd.getAbsolutePath()
+ " to generate checksum for.";
log(message);
throw new BuildException(message, getLocation());
@@ -432,20 +432,20 @@
}
}
- private File getChecksumFile(File file) {
+ private File getChecksumFile(File fileToCheck) {
File directory;
if (todir != null) {
// A separate directory was explicitly declared
- String path = (String) relativeFilePaths.get(file);
+ String path = (String) relativeFilePaths.get(fileToCheck);
directory = new File(todir, path).getParentFile();
// Create the directory, as it might not exist.
directory.mkdirs();
} else {
// Just use the same directory as the file itself.
// This directory will exist
- directory = file.getParentFile();
+ directory = fileToCheck.getParentFile();
}
- File checksumFile = new File(directory, file.getName() + fileext);
+ File checksumFile = new File(directory, fileToCheck.getName() +
fileext);
return checksumFile;
}
Index: Concat.java
===================================================================
RCS file:
/home/cvspublic/ant/src/main/org/apache/tools/ant/taskdefs/Concat.java,v
retrieving revision 1.41
diff -u -r1.41 Concat.java
--- Concat.java 6 Jan 2005 12:05:05 -0000 1.41
+++ Concat.java 10 Mar 2005 10:44:37 -0000
@@ -34,6 +34,7 @@
import java.util.Enumeration;
import java.util.Iterator;
import java.util.Vector;
+
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.DirectoryScanner;
import org.apache.tools.ant.Project;
@@ -237,20 +238,20 @@
/**
* Add a header to the concatenated output
- * @param header the header
+ * @param headerToAdd the header
* @since Ant 1.6
*/
- public void addHeader(TextElement header) {
- this.header = header;
+ public void addHeader(TextElement headerToAdd) {
+ this.header = headerToAdd;
}
/**
* Add a footer to the concatenated output
- * @param footer the footer
+ * @param footerToAdd the footer
* @since Ant 1.6
*/
- public void addFooter(TextElement footer) {
- this.footer = footer;
+ public void addFooter(TextElement footerToAdd) {
+ this.footer = footerToAdd;
}
/**
@@ -742,10 +743,10 @@
/**
* set the text using inline
- * @param value the text to place inline
+ * @param val the text to place inline
*/
- public void addText(String value) {
- this.value += getProject().replaceProperties(value);
+ public void addText(String val) {
+ this.value += getProject().replaceProperties(val);
}
/**
Index: Definer.java
===================================================================
RCS file:
/home/cvspublic/ant/src/main/org/apache/tools/ant/taskdefs/Definer.java,v
retrieving revision 1.56
diff -u -r1.56 Definer.java
--- Definer.java 12 Nov 2004 15:14:59 -0000 1.56
+++ Definer.java 10 Mar 2005 10:44:37 -0000
@@ -469,19 +469,19 @@
* Add a definition using the attributes of Definer
*
* @param al the ClassLoader to use
- * @param name the name of the definition
- * @param classname the classname of the definition
+ * @param defName the name of the definition
+ * @param defClass the classname of the definition
* @exception BuildException if an error occurs
*/
- protected void addDefinition(ClassLoader al, String name, String classname)
+ protected void addDefinition(ClassLoader al, String defName, String
defClass)
throws BuildException {
Class cl = null;
try {
try {
- name = ProjectHelper.genComponentName(getURI(), name);
+ defName = ProjectHelper.genComponentName(getURI(), defName);
if (onError != OnError.IGNORE) {
- cl = Class.forName(classname, true, al);
+ cl = Class.forName(defClass, true, al);
}
if (adapter != null) {
@@ -493,8 +493,8 @@
}
AntTypeDefinition def = new AntTypeDefinition();
- def.setName(name);
- def.setClassName(classname);
+ def.setName(defName);
+ def.setClassName(defClass);
def.setClass(cl);
def.setAdapterClass(adapterClass);
def.setAdaptToClass(adaptToClass);
@@ -505,12 +505,12 @@
ComponentHelper.getComponentHelper(getProject())
.addDataTypeDefinition(def);
} catch (ClassNotFoundException cnfe) {
- String msg = getTaskName() + " class " + classname
+ String msg = getTaskName() + " class " + defClass
+ " cannot be found";
throw new BuildException(msg, cnfe, getLocation());
} catch (NoClassDefFoundError ncdfe) {
String msg = getTaskName() + " A class needed by class "
- + classname + " cannot be found: " + ncdfe.getMessage();
+ + defClass + " cannot be found: " + ncdfe.getMessage();
throw new BuildException(msg, ncdfe, getLocation());
}
} catch (BuildException ex) {
Index: Deltree.java
===================================================================
RCS file:
/home/cvspublic/ant/src/main/org/apache/tools/ant/taskdefs/Deltree.java,v
retrieving revision 1.22
diff -u -r1.22 Deltree.java
--- Deltree.java 9 Mar 2004 16:48:04 -0000 1.22
+++ Deltree.java 10 Mar 2005 10:44:37 -0000
@@ -19,6 +19,7 @@
import java.io.File;
import java.io.IOException;
+
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Task;
@@ -79,7 +80,7 @@
}
}
- private void removeDir(File dir) throws IOException {
+ private void removeDir(File dirToRemove) throws IOException {
// check to make sure that the given dir isn't a symlink
// the comparison of absolute path and canonical path
@@ -88,10 +89,10 @@
// if (dir.getCanonicalPath().equals(dir.getAbsolutePath())) {
// (costin) It will not work if /home/costin is symlink to
// /da0/home/costin ( taz for example )
- String[] list = dir.list();
+ String[] list = dirToRemove.list();
for (int i = 0; i < list.length; i++) {
String s = list[i];
- File f = new File(dir, s);
+ File f = new File(dirToRemove, s);
if (f.isDirectory()) {
removeDir(f);
} else {
@@ -101,10 +102,9 @@
}
}
}
- if (!dir.delete()) {
+ if (!dirToRemove.delete()) {
throw new BuildException("Unable to delete directory "
- + dir.getAbsolutePath());
+ + dirToRemove.getAbsolutePath());
}
}
-}
-
+}
\ No newline at end of file
Index: DependSet.java
===================================================================
RCS file:
/home/cvspublic/ant/src/main/org/apache/tools/ant/taskdefs/DependSet.java,v
retrieving revision 1.31
diff -u -r1.31 DependSet.java
--- DependSet.java 9 Mar 2005 00:20:41 -0000 1.31
+++ DependSet.java 10 Mar 2005 10:44:38 -0000
@@ -87,7 +87,8 @@
* Creates a new DependSet Task.
**/
public DependSet() {
- } //-- DependSet
+ //-- DependSet
+ }
/**
* Add a set of source files.
Index: Exec.java
===================================================================
RCS file: /home/cvspublic/ant/src/main/org/apache/tools/ant/taskdefs/Exec.java,v
retrieving revision 1.40
diff -u -r1.40 Exec.java
--- Exec.java 9 Mar 2004 16:48:04 -0000 1.40
+++ Exec.java 10 Mar 2005 10:44:38 -0000
@@ -59,7 +59,7 @@
run(command);
}
- protected int run(String command) throws BuildException {
+ protected int run(String commandToRun) throws BuildException {
int err = -1; // assume the worst
@@ -80,7 +80,7 @@
if (myos.toLowerCase().indexOf("windows") >= 0) {
if (!dir.equals(getProject().resolveFile("."))) {
if (myos.toLowerCase().indexOf("nt") >= 0) {
- command = "cmd /c cd " + dir + " && " + command;
+ commandToRun = "cmd /c cd " + dir + " && " + commandToRun;
} else {
String ant = getProject().getProperty("ant.home");
if (ant == null) {
@@ -89,7 +89,7 @@
}
String antRun = getProject().resolveFile(ant +
"/bin/antRun.bat").toString();
- command = antRun + " " + dir + " " + command;
+ commandToRun = antRun + " " + dir + " " + commandToRun;
}
}
} else {
@@ -100,15 +100,15 @@
}
String antRun = getProject().resolveFile(ant +
"/bin/antRun").toString();
- command = antRun + " " + dir + " " + command;
+ commandToRun = antRun + " " + dir + " " + commandToRun;
}
try {
// show the command
- log(command, Project.MSG_VERBOSE);
+ log(commandToRun, Project.MSG_VERBOSE);
// exec command on system runtime
- Process proc = Runtime.getRuntime().exec(command);
+ Process proc = Runtime.getRuntime().exec(commandToRun);
if (out != null) {
fos = new PrintWriter(new FileWriter(out));
@@ -144,7 +144,7 @@
}
}
} catch (IOException ioe) {
- throw new BuildException("Error exec: " + command, ioe,
getLocation());
+ throw new BuildException("Error exec: " + commandToRun, ioe,
getLocation());
} catch (InterruptedException ex) {
//ignore
}
Index: ExecTask.java
===================================================================
RCS file:
/home/cvspublic/ant/src/main/org/apache/tools/ant/taskdefs/ExecTask.java,v
retrieving revision 1.78
diff -u -r1.78 ExecTask.java
--- ExecTask.java 18 Feb 2005 22:09:44 -0000 1.78
+++ ExecTask.java 10 Mar 2005 10:44:39 -0000
@@ -21,10 +21,10 @@
import java.io.IOException;
import java.util.Enumeration;
import java.util.Vector;
+
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Project;
import org.apache.tools.ant.Task;
-import org.apache.tools.ant.ProjectComponent;
import org.apache.tools.ant.types.Commandline;
import org.apache.tools.ant.types.Environment;
import org.apache.tools.ant.types.Path;
@@ -79,6 +79,7 @@
* Needs to be configured by binding to a project.
*/
public ExecTask() {
+ //empty
}
/**
@@ -369,14 +370,14 @@
/**
* Add a <code>RedirectorElement</code> to this task.
*
- * @param redirectorElement <code>RedirectorElement</code>.
+ * @param redirElement <code>RedirectorElement</code>.
* @since Ant 1.6.2
*/
- public void addConfiguredRedirector(RedirectorElement redirectorElement) {
+ public void addConfiguredRedirector(RedirectorElement redirElement) {
if (this.redirectorElement != null) {
throw new BuildException("cannot have > 1 nested <redirector>s");
}
- this.redirectorElement = redirectorElement;
+ this.redirectorElement = redirElement;
incompatibleWithSpawn = true;
}
@@ -674,6 +675,7 @@
* Flush the output stream - if there is one.
*/
protected void logFlush() {
+ /* do nothing */
}
private boolean isPath(String line) {
Index: ExecuteWatchdog.java
===================================================================
RCS file:
/home/cvspublic/ant/src/main/org/apache/tools/ant/taskdefs/ExecuteWatchdog.java,v
retrieving revision 1.22
diff -u -r1.22 ExecuteWatchdog.java
--- ExecuteWatchdog.java 9 Mar 2004 16:48:04 -0000 1.22
+++ ExecuteWatchdog.java 10 Mar 2005 10:44:40 -0000
@@ -78,11 +78,11 @@
/**
* Watches the given process and terminates it, if it runs for too long.
* All information from the previous run are reset.
- * @param process the process to monitor. It cannot be <tt>null</tt>
+ * @param proc the process to monitor. It cannot be <tt>null</tt>
* @throws IllegalStateException if a process is still being monitored.
*/
- public synchronized void start(Process process) {
- if (process == null) {
+ public synchronized void start(Process proc) {
+ if (proc == null) {
throw new NullPointerException("process is null.");
}
if (this.process != null) {
@@ -91,7 +91,7 @@
this.caught = null;
this.killedProcess = false;
this.watch = true;
- this.process = process;
+ this.process = proc;
watchdog.start();
}
Index: FixCRLF.java
===================================================================
RCS file:
/home/cvspublic/ant/src/main/org/apache/tools/ant/taskdefs/FixCRLF.java,v
retrieving revision 1.68
diff -u -r1.68 FixCRLF.java
--- FixCRLF.java 9 Mar 2005 00:20:41 -0000 1.68
+++ FixCRLF.java 10 Mar 2005 10:44:41 -0000
@@ -303,8 +303,8 @@
}
}
- private void processFile(String file) throws BuildException {
- File srcFile = new File(srcDir, file);
+ private void processFile(String fileToProcess) throws BuildException {
+ File srcFile = new File(srcDir, fileToProcess);
long lastModified = srcFile.lastModified();
File destD = destDir == null ? srcDir : destDir;
@@ -320,7 +320,7 @@
FILE_UTILS.copyFile(srcFile, tmpFile, null, fcv, false,
false, encoding, getProject());
- File destFile = new File(destD, file);
+ File destFile = new File(destD, fileToProcess);
boolean destIsWrong = true;
if (destFile.exists()) {
Index: Get.java
===================================================================
RCS file: /home/cvspublic/ant/src/main/org/apache/tools/ant/taskdefs/Get.java,v
retrieving revision 1.49
diff -u -r1.49 Get.java
--- Get.java 1 Mar 2005 23:09:58 -0000 1.49
+++ Get.java 10 Mar 2005 10:44:41 -0000
@@ -21,7 +21,6 @@
import org.apache.tools.ant.Project;
import org.apache.tools.ant.Task;
import org.apache.tools.ant.util.FileUtils;
-import org.apache.tools.ant.util.JavaEnvUtils;
import java.io.File;
import java.io.FileOutputStream;
Index: Input.java
===================================================================
RCS file:
/home/cvspublic/ant/src/main/org/apache/tools/ant/taskdefs/Input.java,v
retrieving revision 1.29
diff -u -r1.29 Input.java
--- Input.java 1 Dec 2004 17:52:25 -0000 1.29
+++ Input.java 10 Mar 2005 10:44:42 -0000
@@ -91,6 +91,7 @@
* No arg constructor.
*/
public Input () {
+ /* empty */
}
/**
Index: Jar.java
===================================================================
RCS file: /home/cvspublic/ant/src/main/org/apache/tools/ant/taskdefs/Jar.java,v
retrieving revision 1.88
diff -u -r1.88 Jar.java
--- Jar.java 22 Nov 2004 09:23:27 -0000 1.88
+++ Jar.java 10 Mar 2005 10:44:44 -0000
@@ -203,13 +203,13 @@
this.manifestFile = manifestFile;
}
- private Manifest getManifest(File manifestFile) {
+ private Manifest getManifest(File manFile) {
Manifest newManifest = null;
FileInputStream fis = null;
InputStreamReader isr = null;
try {
- fis = new FileInputStream(manifestFile);
+ fis = new FileInputStream(manFile);
if (manifestEncoding == null) {
isr = new InputStreamReader(fis);
} else {
@@ -221,7 +221,7 @@
+ e.getMessage(), e);
} catch (IOException e) {
throw new BuildException("Unable to read manifest file: "
- + manifestFile
+ + manFile
+ " (" + e.getMessage() + ")", e);
} finally {
if (isr != null) {
@@ -374,9 +374,9 @@
}
}
- private void writeManifest(ZipOutputStream zOut, Manifest manifest)
+ private void writeManifest(ZipOutputStream zOut, Manifest man)
throws IOException {
- for (Enumeration e = manifest.getWarnings();
+ for (Enumeration e = man.getWarnings();
e.hasMoreElements();) {
log("Manifest warning: " + (String) e.nextElement(),
Project.MSG_WARN);
@@ -387,7 +387,7 @@
ByteArrayOutputStream baos = new ByteArrayOutputStream();
OutputStreamWriter osw = new OutputStreamWriter(baos, "UTF-8");
PrintWriter writer = new PrintWriter(osw);
- manifest.write(writer);
+ man.write(writer);
writer.flush();
ByteArrayInputStream bais =
@@ -576,7 +576,7 @@
* out-of-date.</p>
*
* @param filesets The filesets to grab resources from
- * @param zipFile intended archive file (may or may not exist)
+ * @param zipF intended archive file (may or may not exist)
* @param needsUpdate whether we already know that the archive is
* out-of-date. Subclasses overriding this method are supposed to
* set this value correctly in their call to
@@ -587,17 +587,17 @@
* @exception BuildException if it likes
*/
protected ArchiveState getResourcesToAdd(FileSet[] filesets,
- File zipFile,
+ File zipF,
boolean needsUpdate)
throws BuildException {
// need to handle manifest as a special check
- if (zipFile.exists()) {
+ if (zipF.exists()) {
// if it doesn't exist, it will get created anyway, don't
// bother with any up-to-date checks.
try {
- originalManifest = getManifestFromJar(zipFile);
+ originalManifest = getManifestFromJar(zipF);
if (originalManifest == null) {
log("Updating jar since the current jar has no manifest",
Project.MSG_VERBOSE);
@@ -622,7 +622,7 @@
}
createEmpty = needsUpdate;
- return super.getResourcesToAdd(filesets, zipFile, needsUpdate);
+ return super.getResourcesToAdd(filesets, zipF, needsUpdate);
}
protected boolean createEmptyZip(File zipFile) throws BuildException {
Index: Java.java
===================================================================
RCS file: /home/cvspublic/ant/src/main/org/apache/tools/ant/taskdefs/Java.java,v
retrieving revision 1.101
diff -u -r1.101 Java.java
--- Java.java 18 Feb 2005 22:09:44 -0000 1.101
+++ Java.java 10 Mar 2005 10:44:45 -0000
@@ -22,6 +22,7 @@
import java.io.PrintWriter;
import java.io.StringWriter;
import java.util.Vector;
+
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.ExitException;
import org.apache.tools.ant.Project;
@@ -36,7 +37,6 @@
import org.apache.tools.ant.types.Permissions;
import org.apache.tools.ant.types.RedirectorElement;
import org.apache.tools.ant.taskdefs.condition.Os;
-import org.apache.tools.ant.util.JavaEnvUtils;
import org.apache.tools.ant.util.KeepAliveInputStream;
/**
@@ -77,6 +77,7 @@
* Normal constructor
*/
public Java() {
+ /* empty */
}
/**
@@ -608,28 +609,28 @@
/**
* Add a <code>RedirectorElement</code> to this task.
- * @param redirectorElement <code>RedirectorElement</code>.
+ * @param redirElement <code>RedirectorElement</code>.
*/
- public void addConfiguredRedirector(RedirectorElement redirectorElement) {
+ public void addConfiguredRedirector(RedirectorElement redirElement) {
if (this.redirectorElement != null) {
throw new BuildException("cannot have > 1 nested redirectors");
}
- this.redirectorElement = redirectorElement;
+ this.redirectorElement = redirElement;
incompatibleWithSpawn = true;
}
/**
* Pass output sent to System.out to specified output file.
*
- * @param output a string of output on its way to the handlers.
+ * @param outString a string of output on its way to the handlers.
*
* @since Ant 1.5
*/
- protected void handleOutput(String output) {
+ protected void handleOutput(String outString) {
if (redirector.getOutputStream() != null) {
- redirector.handleOutput(output);
+ redirector.handleOutput(outString);
} else {
- super.handleOutput(output);
+ super.handleOutput(outString);
}
}
@@ -654,45 +655,45 @@
/**
* Pass output sent to System.out to specified output file.
*
- * @param output string of output on its way to its handlers.
+ * @param outString string of output on its way to its handlers.
*
* @since Ant 1.5.2
*/
- protected void handleFlush(String output) {
+ protected void handleFlush(String outString) {
if (redirector.getOutputStream() != null) {
- redirector.handleFlush(output);
+ redirector.handleFlush(outString);
} else {
- super.handleFlush(output);
+ super.handleFlush(outString);
}
}
/**
* Handle output sent to System.err.
*
- * @param output string of stderr.
+ * @param outString string of stderr.
*
* @since Ant 1.5
*/
- protected void handleErrorOutput(String output) {
+ protected void handleErrorOutput(String outString) {
if (redirector.getErrorStream() != null) {
- redirector.handleErrorOutput(output);
+ redirector.handleErrorOutput(outString);
} else {
- super.handleErrorOutput(output);
+ super.handleErrorOutput(outString);
}
}
/**
* Handle output sent to System.err and flush the stream.
*
- * @param output string of stderr.
+ * @param outString string of stderr.
*
* @since Ant 1.5.2
*/
- protected void handleErrorFlush(String output) {
+ protected void handleErrorFlush(String outString) {
if (redirector.getErrorStream() != null) {
- redirector.handleErrorFlush(output);
+ redirector.handleErrorFlush(outString);
} else {
- super.handleErrorOutput(output);
+ super.handleErrorOutput(outString);
}
}
Index: Javac.java
===================================================================
RCS file:
/home/cvspublic/ant/src/main/org/apache/tools/ant/taskdefs/Javac.java,v
retrieving revision 1.125
diff -u -r1.125 Javac.java
--- Javac.java 9 Mar 2005 00:20:40 -0000 1.125
+++ Javac.java 10 Mar 2005 10:44:46 -0000
@@ -769,15 +769,15 @@
* The results are returned in the class variable compileList
*
* @param srcDir The source directory
- * @param destDir The destination directory
+ * @param destDirectory The destination directory
* @param files An array of filenames
*/
- protected void scanDir(File srcDir, File destDir, String[] files) {
+ protected void scanDir(File srcDir, File destDirectory, String[] files) {
GlobPatternMapper m = new GlobPatternMapper();
m.setFrom("*.java");
m.setTo("*.class");
SourceFileScanner sfs = new SourceFileScanner(this);
- File[] newFiles = sfs.restrictAsFiles(files, srcDir, destDir, m);
+ File[] newFiles = sfs.restrictAsFiles(files, srcDir, destDirectory, m);
if (newFiles.length > 0) {
File[] newCompileList
Index: LogOutputStream.java
===================================================================
RCS file:
/home/cvspublic/ant/src/main/org/apache/tools/ant/taskdefs/LogOutputStream.java,v
retrieving revision 1.23
diff -u -r1.23 LogOutputStream.java
--- LogOutputStream.java 15 Feb 2005 15:58:06 -0000 1.23
+++ LogOutputStream.java 10 Mar 2005 10:44:46 -0000
@@ -84,8 +84,8 @@
*
* @param line the line to log.
*/
- protected void processLine(String line, int level) {
- pc.log(line, level);
+ protected void processLine(String line, int lev) {
+ pc.log(line, lev);
}
public int getMessageLevel() {
Index: MacroDef.java
===================================================================
RCS file:
/home/cvspublic/ant/src/main/org/apache/tools/ant/taskdefs/MacroDef.java,v
retrieving revision 1.30
diff -u -r1.30 MacroDef.java
--- MacroDef.java 14 Jan 2005 16:49:34 -0000 1.30
+++ MacroDef.java 10 Mar 2005 10:44:48 -0000
@@ -814,10 +814,6 @@
}
private static int objectHashCode(Object o) {
- if (o == null) {
- return 0;
- } else {
- return o.hashCode();
- }
+ return (o == null ? 0 : o.hashCode());
}
}
Index: MacroInstance.java
===================================================================
RCS file:
/home/cvspublic/ant/src/main/org/apache/tools/ant/taskdefs/MacroInstance.java,v
retrieving revision 1.33
diff -u -r1.33 MacroInstance.java
--- MacroInstance.java 14 Jan 2005 16:49:34 -0000 1.33
+++ MacroInstance.java 10 Mar 2005 10:44:49 -0000
@@ -232,11 +232,11 @@
/**
* Set the text contents for the macro.
- * @param text the text to be added to the macro.
+ * @param textToAdd the text to be added to the macro.
*/
- public void addText(String text) {
- this.text = text;
+ public void addText(String textToAdd) {
+ this.text = textToAdd;
}
private UnknownElement copy(UnknownElement ue) {
Index: Move.java
===================================================================
RCS file: /home/cvspublic/ant/src/main/org/apache/tools/ant/taskdefs/Move.java,v
retrieving revision 1.50
diff -u -r1.50 Move.java
--- Move.java 9 Mar 2005 00:20:41 -0000 1.50
+++ Move.java 10 Mar 2005 10:44:49 -0000
@@ -209,12 +209,12 @@
* is enabled, copy the file then delete the sourceFile.
*/
private void moveFile(File fromFile, File toFile,
- boolean filtering, boolean overwrite) {
+ boolean filterOn, boolean overwrite) {
boolean moved = false;
try {
log("Attempting to rename: " + fromFile
+ " to " + toFile, verbosity);
- moved = renameFile(fromFile, toFile, filtering, forceOverwrite);
+ moved = renameFile(fromFile, toFile, filterOn, forceOverwrite);
} catch (IOException ioe) {
String msg = "Failed to rename " + fromFile
+ " to " + toFile
@@ -223,7 +223,7 @@
}
if (!moved) {
- copyFile(fromFile, toFile, filtering, overwrite);
+ copyFile(fromFile, toFile, filterOn, overwrite);
if (!fromFile.delete()) {
throw new BuildException("Unable to delete "
+ "file "
@@ -236,18 +236,18 @@
* Copy fromFile to toFile.
* @param fromFile
* @param toFile
- * @param filtering
+ * @param filterOn
* @param overwrite
*/
private void copyFile(File fromFile, File toFile,
- boolean filtering, boolean overwrite) {
+ boolean filterOn, boolean overwrite) {
try {
log("Copying " + fromFile + " to " + toFile,
verbosity);
FilterSetCollection executionFilters =
new FilterSetCollection();
- if (filtering) {
+ if (filterOn) {
executionFilters
.addFilterSet(getProject().getGlobalFilterSet());
}
@@ -353,7 +353,7 @@
*
* @param sourceFile the file to rename
* @param destFile the destination file
- * @param filtering if true, filtering is in operation, file will
+ * @param filterOn if true, filtering is in operation, file will
* be copied/deleted instead of renamed
* @param overwrite if true force overwrite even if destination file
* is newer than source file
@@ -362,12 +362,12 @@
* @exception BuildException if an error occurs
*/
protected boolean renameFile(File sourceFile, File destFile,
- boolean filtering, boolean overwrite)
+ boolean filterOn, boolean overwrite)
throws IOException, BuildException {
boolean renamed = false;
if ((getFilterSets().size() + getFilterChains().size() == 0)
- && !(filtering || destFile.isDirectory())) {
+ && !(filterOn || destFile.isDirectory())) {
// ensure that parent dir of dest file exists!
File parent = destFile.getParentFile();
if (parent != null && !parent.exists()) {
Index: Parallel.java
===================================================================
RCS file:
/home/cvspublic/ant/src/main/org/apache/tools/ant/taskdefs/Parallel.java,v
retrieving revision 1.31
diff -u -r1.31 Parallel.java
--- Parallel.java 9 Dec 2004 23:06:47 -0000 1.31
+++ Parallel.java 10 Mar 2005 10:44:50 -0000
@@ -108,13 +108,13 @@
/**
* Add a group of daemon threads
- * @param daemonTasks The tasks to be executed as daemon.
+ * @param dTasks The tasks to be executed as daemon.
*/
- public void addDaemons(TaskList daemonTasks) {
+ public void addDaemons(TaskList dTasks) {
if (this.daemonTasks != null) {
throw new BuildException("Only one daemon group is supported");
}
- this.daemonTasks = daemonTasks;
+ this.daemonTasks = dTasks;
}
/**
@@ -124,6 +124,7 @@
* @param pollInterval New value of property pollInterval.
*/
public void setPollInterval(int pollInterval) {
+ /* empty */
}
/**
Index: PathConvert.java
===================================================================
RCS file:
/home/cvspublic/ant/src/main/org/apache/tools/ant/taskdefs/PathConvert.java,v
retrieving revision 1.40
diff -u -r1.40 PathConvert.java
--- PathConvert.java 22 Feb 2005 18:26:56 -0000 1.40
+++ PathConvert.java 10 Mar 2005 10:44:51 -0000
@@ -402,14 +402,14 @@
/**
* Add a mapper to convert the file names.
*
- * @param mapper a <code>Mapper</code> value.
+ * @param map a <code>Mapper</code> value.
*/
- public void addMapper(Mapper mapper) {
+ public void addMapper(Mapper map) {
if (this.mapper != null) {
throw new BuildException(
"Cannot define more than one mapper");
}
- this.mapper = mapper;
+ this.mapper = map;
}
/**
Index: PreSetDef.java
===================================================================
RCS file:
/home/cvspublic/ant/src/main/org/apache/tools/ant/taskdefs/PreSetDef.java,v
retrieving revision 1.14
diff -u -r1.14 PreSetDef.java
--- PreSetDef.java 15 Dec 2004 21:47:19 -0000 1.14
+++ PreSetDef.java 10 Mar 2005 10:44:52 -0000
@@ -53,17 +53,17 @@
/**
* Add a nested task to predefine attributes and elements on.
- * @param nestedTask Nested task/type to extend.
+ * @param nestTask Nested task/type to extend.
*/
- public void addTask(Task nestedTask) {
+ public void addTask(Task nestTask) {
if (this.nestedTask != null) {
throw new BuildException("Only one nested element allowed");
}
- if (!(nestedTask instanceof UnknownElement)) {
+ if (!(nestTask instanceof UnknownElement)) {
throw new BuildException(
"addTask called with a task that is not an unknown element");
}
- this.nestedTask = (UnknownElement) nestedTask;
+ this.nestedTask = (UnknownElement) nestTask;
}
Index: Property.java
===================================================================
RCS file:
/home/cvspublic/ant/src/main/org/apache/tools/ant/taskdefs/Property.java,v
retrieving revision 1.73
diff -u -r1.73 Property.java
--- Property.java 12 Nov 2004 15:14:59 -0000 1.73
+++ Property.java 10 Mar 2005 10:44:52 -0000
@@ -372,13 +372,13 @@
/**
* load properties from a url
- * @param url url to load from
+ * @param u url to load from
*/
- protected void loadUrl(URL url) throws BuildException {
+ protected void loadUrl(URL u) throws BuildException {
Properties props = new Properties();
- log("Loading " + url, Project.MSG_VERBOSE);
+ log("Loading " + u, Project.MSG_VERBOSE);
try {
- InputStream is = url.openStream();
+ InputStream is = u.openStream();
try {
props.load(is);
} finally {
@@ -395,14 +395,14 @@
/**
* load properties from a file
- * @param file file to load
+ * @param fileToLoad file to load
*/
- protected void loadFile(File file) throws BuildException {
+ protected void loadFile(File fileToLoad) throws BuildException {
Properties props = new Properties();
- log("Loading " + file.getAbsolutePath(), Project.MSG_VERBOSE);
+ log("Loading " + fileToLoad.getAbsolutePath(), Project.MSG_VERBOSE);
try {
- if (file.exists()) {
- FileInputStream fis = new FileInputStream(file);
+ if (fileToLoad.exists()) {
+ FileInputStream fis = new FileInputStream(fileToLoad);
try {
props.load(fis);
} finally {
@@ -412,7 +412,7 @@
}
addProperties(props);
} else {
- log("Unable to find property file: " + file.getAbsolutePath(),
+ log("Unable to find property file: " +
fileToLoad.getAbsolutePath(),
Project.MSG_VERBOSE);
}
} catch (IOException ex) {
@@ -422,11 +422,11 @@
/**
* load properties from a resource in the current classpath
- * @param name name of resource to load
+ * @param resourceName name of resource to load
*/
- protected void loadResource(String name) {
+ protected void loadResource(String resourceName) {
Properties props = new Properties();
- log("Resource Loading " + name, Project.MSG_VERBOSE);
+ log("Resource Loading " + resourceName, Project.MSG_VERBOSE);
InputStream is = null;
try {
ClassLoader cL = null;
@@ -438,16 +438,16 @@
}
if (cL == null) {
- is = ClassLoader.getSystemResourceAsStream(name);
+ is = ClassLoader.getSystemResourceAsStream(resourceName);
} else {
- is = cL.getResourceAsStream(name);
+ is = cL.getResourceAsStream(resourceName);
}
if (is != null) {
props.load(is);
addProperties(props);
} else {
- log("Unable to find resource " + name, Project.MSG_WARN);
+ log("Unable to find resource " + resourceName,
Project.MSG_WARN);
}
} catch (IOException ex) {
throw new BuildException(ex, getLocation());
@@ -465,14 +465,14 @@
/**
* load the environment values
- * @param prefix prefix to place before them
+ * @param envPrefix prefix to place before them
*/
- protected void loadEnvironment(String prefix) {
+ protected void loadEnvironment(String envPrefix) {
Properties props = new Properties();
- if (!prefix.endsWith(".")) {
- prefix += ".";
+ if (!envPrefix.endsWith(".")) {
+ envPrefix += ".";
}
- log("Loading Environment " + prefix, Project.MSG_VERBOSE);
+ log("Loading Environment " + envPrefix, Project.MSG_VERBOSE);
Vector osEnv = Execute.getProcEnvironment();
for (Enumeration e = osEnv.elements(); e.hasMoreElements();) {
String entry = (String) e.nextElement();
@@ -480,7 +480,7 @@
if (pos == -1) {
log("Ignoring: " + entry, Project.MSG_WARN);
} else {
- props.put(prefix + entry.substring(0, pos),
+ props.put(envPrefix + entry.substring(0, pos),
entry.substring(pos + 1));
}
}
@@ -543,25 +543,25 @@
* circular definition is detected.
*
* @param props properties object to resolve
- * @param name of the property to resolve
+ * @param propName of the property to resolve
* @param referencesSeen stack of all property names that have
* been tried to expand before coming here.
*/
- private void resolve(Properties props, String name, Stack referencesSeen)
+ private void resolve(Properties props, String propName, Stack
referencesSeen)
throws BuildException {
- if (referencesSeen.contains(name)) {
- throw new BuildException("Property " + name + " was circularly "
+ if (referencesSeen.contains(propName)) {
+ throw new BuildException("Property " + propName + " was circularly
"
+ "defined.");
}
- String propertyValue = props.getProperty(name);
+ String propertyValue = props.getProperty(propName);
Vector fragments = new Vector();
Vector propertyRefs = new Vector();
ProjectHelper.parsePropertyString(propertyValue, fragments,
propertyRefs);
if (propertyRefs.size() != 0) {
- referencesSeen.push(name);
+ referencesSeen.push(propName);
StringBuffer sb = new StringBuffer();
Enumeration i = fragments.elements();
Enumeration j = propertyRefs.elements();
@@ -582,7 +582,7 @@
sb.append(fragment);
}
propertyValue = sb.toString();
- props.put(name, propertyValue);
+ props.put(propName, propertyValue);
referencesSeen.pop();
}
}
Index: RecorderEntry.java
===================================================================
RCS file:
/home/cvspublic/ant/src/main/org/apache/tools/ant/taskdefs/RecorderEntry.java,v
retrieving revision 1.21
diff -u -r1.21 RecorderEntry.java
--- RecorderEntry.java 22 Nov 2004 09:23:28 -0000 1.21
+++ RecorderEntry.java 10 Mar 2005 10:44:53 -0000
@@ -133,6 +133,7 @@
* @since Ant 1.6.2
*/
public void subBuildStarted(BuildEvent event) {
+ /* empty */
}
Index: Redirector.java
===================================================================
RCS file:
/home/cvspublic/ant/src/main/org/apache/tools/ant/taskdefs/Redirector.java,v
retrieving revision 1.26
diff -u -r1.26 Redirector.java
--- Redirector.java 10 Feb 2005 22:32:20 -0000 1.26
+++ Redirector.java 10 Mar 2005 10:44:54 -0000
@@ -260,7 +260,7 @@
/**
* Set the output encoding.
*
- * @param outputEncoding <CODE>String</CODE>.
+ * @param outputEncoding <code>String</code>.
*/
public synchronized void setOutputEncoding(String outputEncoding) {
if (outputEncoding == null) {
@@ -274,7 +274,7 @@
/**
* Set the error encoding.
*
- * @param errorEncoding <CODE>String</CODE>.
+ * @param errorEncoding <code>String</code>.
*/
public synchronized void setErrorEncoding(String errorEncoding) {
if (errorEncoding == null) {
@@ -288,7 +288,7 @@
/**
* Set the input encoding.
*
- * @param inputEncoding <CODE>String</CODE>.
+ * @param inputEncoding <code>String</code>.
*/
public synchronized void setInputEncoding(String inputEncoding) {
if (inputEncoding == null) {
@@ -312,9 +312,9 @@
}
/**
- * This <CODE>Redirector</CODE>'s subordinate
- * <CODE>PropertyOutputStream</CODE>s will not set their respective
- * properties <CODE>while (appendProperties && append)</CODE>.
+ * This <code>Redirector</code>'s subordinate
+ * <code>PropertyOutputStream</code>s will not set their respective
+ * properties <code>while (appendProperties && append)</code>.
*
* @param appendProperties whether to append properties.
*/
@@ -380,7 +380,7 @@
/**
* Whether output and error files should be created even when empty.
* Defaults to true.
- * @param createEmptyFiles <CODE>boolean</CODE>.
+ * @param createEmptyFiles <code>boolean</code>.
*/
public synchronized void setCreateEmptyFiles(boolean createEmptyFiles) {
this.createEmptyFiles = createEmptyFiles;
@@ -402,27 +402,27 @@
}
/**
- * Set the input <CODE>FilterChain</CODE>s.
+ * Set the input <code>FilterChain</code>s.
*
- * @param inputFilterChains <CODE>Vector</CODE> containing
<CODE>FilterChain</CODE>.
+ * @param inputFilterChains <code>Vector</code> containing
<code>FilterChain</code>.
*/
public synchronized void setInputFilterChains(Vector inputFilterChains) {
this.inputFilterChains = inputFilterChains;
}
/**
- * Set the output <CODE>FilterChain</CODE>s.
+ * Set the output <code>FilterChain</code>s.
*
- * @param outputFilterChains <CODE>Vector</CODE> containing
<CODE>FilterChain</CODE>.
+ * @param outputFilterChains <code>Vector</code> containing
<code>FilterChain</code>.
*/
public synchronized void setOutputFilterChains(Vector outputFilterChains) {
this.outputFilterChains = outputFilterChains;
}
/**
- * Set the error <CODE>FilterChain</CODE>s.
+ * Set the error <code>FilterChain</code>s.
*
- * @param errorFilterChains <CODE>Vector</CODE> containing
<CODE>FilterChain</CODE>.
+ * @param errorFilterChains <code>Vector</code> containing
<code>FilterChain</code>.
*/
public synchronized void setErrorFilterChains(Vector errorFilterChains) {
this.errorFilterChains = errorFilterChains;
@@ -783,7 +783,7 @@
}
/**
- * Notify the <CODE>Redirector</CODE> that it is now okay
+ * Notify the <code>Redirector</code> that it is now okay
* to set any output and/or error properties.
*/
public synchronized void setProperties() {
Index: Replace.java
===================================================================
RCS file:
/home/cvspublic/ant/src/main/org/apache/tools/ant/taskdefs/Replace.java,v
retrieving revision 1.61
diff -u -r1.61 Replace.java
--- Replace.java 14 Feb 2005 21:08:00 -0000 1.61
+++ Replace.java 10 Mar 2005 10:44:55 -0000
@@ -537,23 +537,23 @@
/**
* Load a properties file.
- * @param propertyFile the file to load the properties from.
+ * @param propsFile the file to load the properties from.
* @return loaded <code>Properties</code> object.
* @throws BuildException if the file could not be found or read.
*/
- public Properties getProperties(File propertyFile) throws BuildException {
+ public Properties getProperties(File propsFile) throws BuildException {
Properties props = new Properties();
FileInputStream in = null;
try {
- in = new FileInputStream(propertyFile);
+ in = new FileInputStream(propsFile);
props.load(in);
} catch (FileNotFoundException e) {
- String message = "Property file (" + propertyFile.getPath()
+ String message = "Property file (" + propsFile.getPath()
+ ") not found.";
throw new BuildException(message);
} catch (IOException e) {
- String message = "Property file (" + propertyFile.getPath()
+ String message = "Property file (" + propsFile.getPath()
+ ") cannot be loaded.";
throw new BuildException(message);
} finally {
@@ -575,11 +575,11 @@
* The replacement is performed on a temporary file which then
* replaces the original file.
*
- * @param src the source <code>File</code>.
+ * @param source the source <code>File</code>.
*/
- private void processFile(File src) throws BuildException {
- if (!src.exists()) {
- throw new BuildException("Replace: source file " + src.getPath()
+ private void processFile(File source) throws BuildException {
+ if (!source.exists()) {
+ throw new BuildException("Replace: source file " + source.getPath()
+ " doesn't exist", getLocation());
}
@@ -587,15 +587,15 @@
FileInput in = null;
FileOutput out = null;
try {
- in = new FileInput(src);
+ in = new FileInput(source);
temp = FILE_UTILS.createTempFile("rep", ".tmp",
- src.getParentFile());
+ source.getParentFile());
out = new FileOutput(temp);
int repCountStart = replaceCount;
- logFilterChain(src.getPath());
+ logFilterChain(source.getPath());
out.setInputBuffer(buildFilterChain(in.getOutputBuffer()));
@@ -615,11 +615,11 @@
boolean changes = (replaceCount != repCountStart);
if (changes) {
- FILE_UTILS.rename(temp, src);
+ FILE_UTILS.rename(temp, source);
temp = null;
}
} catch (IOException ioe) {
- throw new BuildException("IOException in " + src + " - "
+ throw new BuildException("IOException in " + source + " - "
+ ioe.getClass().getName() + ":"
+ ioe.getMessage(), ioe, getLocation());
} finally {
Index: Rmic.java
===================================================================
RCS file: /home/cvspublic/ant/src/main/org/apache/tools/ant/taskdefs/Rmic.java,v
retrieving revision 1.60
diff -u -r1.60 Rmic.java
--- Rmic.java 6 Jan 2005 12:05:05 -0000 1.60
+++ Rmic.java 10 Mar 2005 10:44:56 -0000
@@ -576,13 +576,13 @@
* @throws org.apache.tools.ant.BuildException When error
* copying/removing files.
*/
- private void moveGeneratedFile (File baseDir, File sourceBaseFile,
- String classname,
+ private void moveGeneratedFile (File base, File sourceBaseFile,
+ String name,
RmicAdapter adapter)
throws BuildException {
String classFileName =
- classname.replace('.', File.separatorChar) + ".class";
+ name.replace('.', File.separatorChar) + ".class";
String[] generatedFiles =
adapter.getMapper().mapFileName(classFileName);
@@ -598,7 +598,7 @@
String sourceFileName =
generatedFile.substring(0, pos) + ".java";
- File oldFile = new File(baseDir, sourceFileName);
+ File oldFile = new File(base, sourceFileName);
if (!oldFile.exists()) {
// no source file generated, nothing to move
continue;
@@ -625,11 +625,11 @@
/**
* Scans the directory looking for class files to be compiled.
* The result is returned in the class variable compileList.
- * @param baseDir the base direction
+ * @param base the base direction
* @param files the list of files to scan
* @param mapper the mapper of files to target files
*/
- protected void scanDir(File baseDir, String[] files,
+ protected void scanDir(File base, String[] files,
FileNameMapper mapper) {
String[] newFiles = files;
@@ -642,7 +642,7 @@
Project.MSG_VERBOSE);
} else {
SourceFileScanner sfs = new SourceFileScanner(this);
- newFiles = sfs.restrict(files, baseDir, baseDir, mapper);
+ newFiles = sfs.restrict(files, base, base, mapper);
}
for (int i = 0; i < newFiles.length; i++) {
@@ -654,25 +654,25 @@
/**
* Load named class and test whether it can be rmic'ed
- * @param classname the name of the class to be tested
+ * @param name the name of the class to be tested
* @return true if the class can be rmic'ed
*/
- public boolean isValidRmiRemote(String classname) {
+ public boolean isValidRmiRemote(String name) {
try {
- Class testClass = loader.loadClass(classname);
+ Class testClass = loader.loadClass(name);
// One cannot RMIC an interface for "classic" RMI (JRMP)
if (testClass.isInterface() && !iiop && !idl) {
return false;
}
return isValidRmiRemote(testClass);
} catch (ClassNotFoundException e) {
- log(ERROR_UNABLE_TO_VERIFY_CLASS + classname
+ log(ERROR_UNABLE_TO_VERIFY_CLASS + name
+ ERROR_NOT_FOUND, Project.MSG_WARN);
} catch (NoClassDefFoundError e) {
- log(ERROR_UNABLE_TO_VERIFY_CLASS + classname
+ log(ERROR_UNABLE_TO_VERIFY_CLASS + name
+ ERROR_NOT_DEFINED, Project.MSG_WARN);
} catch (Throwable t) {
- log(ERROR_UNABLE_TO_VERIFY_CLASS + classname
+ log(ERROR_UNABLE_TO_VERIFY_CLASS + name
+ ERROR_LOADING_CAUSED_EXCEPTION
+ t.getMessage(), Project.MSG_WARN);
}
@@ -738,5 +738,4 @@
}
}
-}
-
+}
\ No newline at end of file
Index: Sleep.java
===================================================================
RCS file:
/home/cvspublic/ant/src/main/org/apache/tools/ant/taskdefs/Sleep.java,v
retrieving revision 1.20
diff -u -r1.20 Sleep.java
--- Sleep.java 1 Dec 2004 17:52:25 -0000 1.20
+++ Sleep.java 10 Mar 2005 10:44:56 -0000
@@ -69,6 +69,7 @@
* Creates new instance
*/
public Sleep() {
+ /* empty */
}
Index: SubAnt.java
===================================================================
RCS file:
/home/cvspublic/ant/src/main/org/apache/tools/ant/taskdefs/SubAnt.java,v
retrieving revision 1.24
diff -u -r1.24 SubAnt.java
--- SubAnt.java 7 Mar 2005 09:41:16 -0000 1.24
+++ SubAnt.java 10 Mar 2005 10:44:57 -0000
@@ -78,14 +78,14 @@
/**
* Pass output sent to System.out to the new project.
*
- * @param output a line of output
+ * @param out a line of output
* @since Ant 1.6.2
*/
- public void handleOutput(String output) {
+ public void handleOutput(String out) {
if (ant != null) {
- ant.handleOutput(output);
+ ant.handleOutput(out);
} else {
- super.handleOutput(output);
+ super.handleOutput(out);
}
}
@@ -116,45 +116,45 @@
/**
* Pass output sent to System.out to the new project.
*
- * @param output The output to log. Should not be <code>null</code>.
+ * @param out The output to log. Should not be <code>null</code>.
*
* @since Ant 1.6.2
*/
- public void handleFlush(String output) {
+ public void handleFlush(String out) {
if (ant != null) {
- ant.handleFlush(output);
+ ant.handleFlush(out);
} else {
- super.handleFlush(output);
+ super.handleFlush(out);
}
}
/**
* Pass output sent to System.err to the new project.
*
- * @param output The error output to log. Should not be <code>null</code>.
+ * @param out The error output to log. Should not be <code>null</code>.
*
* @since Ant 1.6.2
*/
- public void handleErrorOutput(String output) {
+ public void handleErrorOutput(String out) {
if (ant != null) {
- ant.handleErrorOutput(output);
+ ant.handleErrorOutput(out);
} else {
- super.handleErrorOutput(output);
+ super.handleErrorOutput(out);
}
}
/**
* Pass output sent to System.err to the new project.
*
- * @param output The error output to log. Should not be <code>null</code>.
+ * @param out The error output to log. Should not be <code>null</code>.
*
* @since Ant 1.6.2
*/
- public void handleErrorFlush(String output) {
+ public void handleErrorFlush(String out) {
if (ant != null) {
- ant.handleErrorFlush(output);
+ ant.handleErrorFlush(out);
} else {
- super.handleErrorFlush(output);
+ super.handleErrorFlush(out);
}
}
Index: Touch.java
===================================================================
RCS file:
/home/cvspublic/ant/src/main/org/apache/tools/ant/taskdefs/Touch.java,v
retrieving revision 1.45
diff -u -r1.45 Touch.java
--- Touch.java 6 Jan 2005 12:05:05 -0000 1.45
+++ Touch.java 10 Mar 2005 10:44:58 -0000
@@ -89,6 +89,7 @@
* Construct a new <code>Touch</code> task.
*/
public Touch() {
+ /* empty */
}
/**
@@ -171,16 +172,16 @@
/**
* Add a <code>FileNameMapper</code>.
- * @param fileNameMapper the <code>FileNameMapper</code> to add.
+ * @param mapper the <code>FileNameMapper</code> to add.
* @since Ant 1.6.3
* @throws BuildException if multiple mappers are added.
*/
- public void add(FileNameMapper fileNameMapper) throws BuildException {
+ public void add(FileNameMapper mapper) throws BuildException {
if (this.fileNameMapper != null) {
throw new BuildException("Only one mapper may be added to the "
+ getTaskName() + " task.");
}
- this.fileNameMapper = fileNameMapper;
+ this.fileNameMapper = mapper;
}
/**
@@ -301,12 +302,12 @@
* Touch a single file with the current timestamp (this.millis). This
method
* does not interact with any nested mappers and remains for reasons of
* backwards-compatibility only.
- * @param file file to touch
+ * @param f file to touch
* @throws BuildException
* @deprecated
*/
- protected void touch(File file) {
- touch(file, getTimestamp());
+ protected void touch(File f) {
+ touch(f, getTimestamp());
}
private long getTimestamp() {
@@ -328,22 +329,22 @@
}
}
- private void touch(File file, long modTime) {
- if (!file.exists()) {
- log("Creating " + file,
+ private void touch(File f, long modTime) {
+ if (!f.exists()) {
+ log("Creating " + f,
((verbose) ? Project.MSG_INFO : Project.MSG_VERBOSE));
try {
- FILE_UTILS.createNewFile(file, mkdirs);
+ FILE_UTILS.createNewFile(f, mkdirs);
} catch (IOException ioe) {
- throw new BuildException("Could not create " + file, ioe,
+ throw new BuildException("Could not create " + f, ioe,
getLocation());
}
}
- if (!file.canWrite()) {
+ if (!f.canWrite()) {
throw new BuildException("Can not change modification date of "
- + "read-only file " + file);
+ + "read-only file " + f);
}
- FILE_UTILS.setFileLastModified(file, modTime);
+ FILE_UTILS.setFileLastModified(f, modTime);
}
}
Index: Untar.java
===================================================================
RCS file:
/home/cvspublic/ant/src/main/org/apache/tools/ant/taskdefs/Untar.java,v
retrieving revision 1.45
diff -u -r1.45 Untar.java
--- Untar.java 6 Jan 2005 17:50:29 -0000 1.45
+++ Untar.java 10 Mar 2005 10:44:58 -0000
@@ -40,7 +40,7 @@
* <p>For JDK 1.1 "last modified time" field is set to current time
instead of being
* carried from the archive file.</p>
* <p>PatternSets are used to select files to extract
- * <I>from</I> the archive. If no patternset is used, all files are extracted.
+ * <i>from</i> the archive. If no patternset is used, all files are extracted.
* </p>
* <p>FileSet>s may be used to select archived files
* to perform unarchival upon.
Index: XSLTProcess.java
===================================================================
RCS file:
/home/cvspublic/ant/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java,v
retrieving revision 1.91
diff -u -r1.91 XSLTProcess.java
--- XSLTProcess.java 9 Mar 2005 00:20:41 -0000 1.91
+++ XSLTProcess.java 10 Mar 2005 10:45:00 -0000
@@ -144,8 +144,8 @@
* Creates a new XSLTProcess Task.
*/
public XSLTProcess() {
-
- } //-- XSLTProcess
+ /* -- XSLTProcess */
+ }
/**
* Whether to style all files in the included directories as well;
@@ -373,10 +373,10 @@
/**
* Add the catalog to our internal catalog
*
- * @param xmlCatalog the XMLCatalog instance to use to look up DTDs
+ * @param catalog the XMLCatalog instance to use to look up DTDs
*/
- public void addConfiguredXMLCatalog(XMLCatalog xmlCatalog) {
- this.xmlCatalog.addConfiguredXMLCatalog(xmlCatalog);
+ public void addConfiguredXMLCatalog(XMLCatalog catalog) {
+ this.xmlCatalog.addConfiguredXMLCatalog(catalog);
}
/**
@@ -417,12 +417,11 @@
private Class loadClass(String classname) throws Exception {
if (classpath == null) {
return Class.forName(classname);
- } else {
- loader = getProject().createClassLoader(classpath);
- loader.setThreadContextLoader();
- Class c = Class.forName(classname, true, loader);
- return c;
- }
+ }
+ loader = getProject().createClassLoader(classpath);
+ loader.setThreadContextLoader();
+ Class c = Class.forName(classname, true, loader);
+ return c;
}
/**
@@ -449,13 +448,13 @@
* Processes the given input XML file and stores the result
* in the given resultFile.
*
- * @param baseDir the base directory for resolving files.
+ * @param base the base directory for resolving files.
* @param xmlFile the input file
- * @param destDir the destination directory
+ * @param dest the destination directory
* @param stylesheet the stylesheet to use.
* @exception BuildException if the processing fails.
*/
- private void process(File baseDir, String xmlFile, File destDir,
+ private void process(File base, String xmlFile, File dest,
File stylesheet)
throws BuildException {
@@ -464,7 +463,7 @@
try {
long styleSheetLastModified = stylesheet.lastModified();
- inF = new File(baseDir, xmlFile);
+ inF = new File(base, xmlFile);
if (inF.isDirectory()) {
log("Skipping " + inF + " it is a directory.",
@@ -490,7 +489,7 @@
return;
}
- outF = new File(destDir, outFileName[0]);
+ outF = new File(dest, outFileName[0]);
if (force
|| inF.lastModified() > outF.lastModified()
@@ -517,37 +516,37 @@
/**
* Process the input file to the output file with the given stylesheet.
*
- * @param inFile the input file to process.
- * @param outFile the destination file.
+ * @param inputFile the input file to process.
+ * @param outputFile the destination file.
* @param stylesheet the stylesheet to use.
* @exception BuildException if the processing fails.
*/
- private void process(File inFile, File outFile, File stylesheet)
+ private void process(File inputFile, File outputFile, File stylesheet)
throws BuildException {
try {
long styleSheetLastModified = stylesheet.lastModified();
- log("In file " + inFile + " time: " + inFile.lastModified(),
+ log("In file " + inputFile + " time: " + inputFile.lastModified(),
Project.MSG_DEBUG);
- log("Out file " + outFile + " time: " + outFile.lastModified(),
+ log("Out file " + outputFile + " time: " +
outputFile.lastModified(),
Project.MSG_DEBUG);
log("Style file " + xslFile + " time: " + styleSheetLastModified,
Project.MSG_DEBUG);
- if (force || inFile.lastModified() >= outFile.lastModified()
- || styleSheetLastModified >= outFile.lastModified()) {
- ensureDirectoryFor(outFile);
- log("Processing " + inFile + " to " + outFile,
+ if (force || inputFile.lastModified() >= outputFile.lastModified()
+ || styleSheetLastModified >= outputFile.lastModified()) {
+ ensureDirectoryFor(outputFile);
+ log("Processing " + inputFile + " to " + outputFile,
Project.MSG_INFO);
configureLiaison(stylesheet);
- liaison.transform(inFile, outFile);
+ liaison.transform(inputFile, outputFile);
} else {
- log("Skipping input file " + inFile
- + " because it is older than output file " + outFile
+ log("Skipping input file " + inputFile
+ + " because it is older than output file " + outputFile
+ " and so is the stylesheet " + stylesheet,
Project.MSG_DEBUG);
}
} catch (Exception ex) {
- log("Failed to process " + inFile, Project.MSG_INFO);
- if (outFile != null) {
- outFile.delete();
+ log("Failed to process " + inputFile, Project.MSG_INFO);
+ if (outputFile != null) {
+ outputFile.delete();
}
throw new BuildException(ex);
}
Index: XmlProperty.java
===================================================================
RCS file:
/home/cvspublic/ant/src/main/org/apache/tools/ant/taskdefs/XmlProperty.java,v
retrieving revision 1.25
diff -u -r1.25 XmlProperty.java
--- XmlProperty.java 6 Jan 2005 12:05:05 -0000 1.25
+++ XmlProperty.java 10 Mar 2005 10:45:01 -0000
@@ -283,13 +283,13 @@
}
/** Iterate through all nodes in the tree. */
- private void addNodeRecursively(Node node, String prefix,
+ private void addNodeRecursively(Node node, String pref,
Object container) {
// Set the prefix for this node to include its tag name.
- String nodePrefix = prefix;
+ String nodePrefix = pref;
if (node.getNodeType() != Node.TEXT_NODE) {
- if (prefix.trim().length() > 0) {
+ if (pref.trim().length() > 0) {
nodePrefix += ".";
}
nodePrefix += node.getNodeName();
@@ -314,8 +314,8 @@
}
}
- void addNodeRecursively(org.w3c.dom.Node node, String prefix) {
- addNodeRecursively(node, prefix, null);
+ void addNodeRecursively(org.w3c.dom.Node node, String pref) {
+ addNodeRecursively(node, pref, null);
}
/**
@@ -324,7 +324,7 @@
* children.
*
* @param node the XML Node to parse
- * @param prefix A string to prepend to any properties that get
+ * @param pref A string to prepend to any properties that get
* added by this node.
* @param container Optionally, an object that a parent node
* generated that this node might belong to. For example, this
@@ -333,7 +333,7 @@
* either a String if this node resulted in setting an attribute,
* or a Path.
*/
- public Object processNode (Node node, String prefix, Object container) {
+ public Object processNode (Node node, String pref, Object container) {
// Parse the attribute(s) and text of this node, adding
// properties for each.
@@ -361,7 +361,7 @@
if (!semanticAttributes) {
String attributeName = getAttributeName(attributeNode);
String attributeValue = getAttributeValue(attributeNode);
- addProperty(prefix + attributeName, attributeValue, null);
+ addProperty(pref + attributeName, attributeValue, null);
} else {
String nodeName = attributeNode.getNodeName();
@@ -404,7 +404,7 @@
} else {
// An arbitrary attribute.
String attributeName = getAttributeName(attributeNode);
- addProperty(prefix + attributeName, attributeValue,
id);
+ addProperty(pref + attributeName, attributeValue, id);
}
}
}
@@ -429,7 +429,7 @@
}
if (nodeText.trim().length() != 0) {
- addProperty(prefix, nodeText, id);
+ addProperty(pref, nodeText, id);
}
}
Index: Zip.java
===================================================================
RCS file: /home/cvspublic/ant/src/main/org/apache/tools/ant/taskdefs/Zip.java,v
retrieving revision 1.138
diff -u -r1.138 Zip.java
--- Zip.java 1 Mar 2005 09:48:36 -0000 1.138
+++ Zip.java 10 Mar 2005 10:45:03 -0000
@@ -625,7 +625,7 @@
/**
* Add the given resources.
*
- * @param fileset may give additional information like fullpath or
+ * @param files may give additional information like fullpath or
* permissions.
* @param resources the resources to add
* @param zOut the stream to write to
@@ -633,7 +633,7 @@
*
* @since Ant 1.5.2
*/
- protected final void addResources(FileSet fileset, Resource[] resources,
+ protected final void addResources(FileSet files, Resource[] resources,
ZipOutputStream zOut)
throws IOException {
@@ -643,8 +643,8 @@
int fileMode = ZipFileSet.DEFAULT_FILE_MODE;
ZipFileSet zfs = null;
- if (fileset instanceof ZipFileSet) {
- zfs = (ZipFileSet) fileset;
+ if (files instanceof ZipFileSet) {
+ zfs = (ZipFileSet) files;
prefix = zfs.getPrefix(getProject());
fullpath = zfs.getFullpath(getProject());
dirMode = zfs.getDirMode(getProject());
@@ -676,7 +676,7 @@
if (zfs == null || zfs.getSrc(getProject()) == null) {
dealingWithFiles = true;
- base = fileset.getDir(getProject());
+ base = files.getDir(getProject());
} else {
zf = new ZipFile(zfs.getSrc(getProject()), encoding);
}
@@ -766,19 +766,19 @@
/**
* Create an empty zip file
- * @param zipFile the zip file
+ * @param zip the zip file
* @return true for historic reasons
* @throws BuildException on error
*/
- protected boolean createEmptyZip(File zipFile) throws BuildException {
+ protected boolean createEmptyZip(File zip) throws BuildException {
// In this case using java.util.zip will not work
// because it does not permit a zero-entry archive.
// Must create it manually.
- log("Note: creating empty " + archiveType + " archive " + zipFile,
+ log("Note: creating empty " + archiveType + " archive " + zip,
Project.MSG_INFO);
OutputStream os = null;
try {
- os = new FileOutputStream(zipFile);
+ os = new FileOutputStream(zip);
// Cf. PKZIP specification.
byte[] empty = new byte[22];
empty[0] = 80; // P
@@ -826,8 +826,8 @@
* third arg if they already know that the archive is
* out-of-date.</p>
*
- * @param filesets The filesets to grab resources from
- * @param zipFile intended archive file (may or may not exist)
+ * @param files The filesets to grab resources from
+ * @param zip intended archive file (may or may not exist)
* @param needsUpdate whether we already know that the archive is
* out-of-date. Subclasses overriding this method are supposed to
* set this value correctly in their call to
@@ -837,12 +837,12 @@
*
* @exception BuildException if it likes
*/
- protected ArchiveState getResourcesToAdd(FileSet[] filesets,
- File zipFile,
+ protected ArchiveState getResourcesToAdd(FileSet[] files,
+ File zip,
boolean needsUpdate)
throws BuildException {
- Resource[][] initialResources = grabResources(filesets);
+ Resource[][] initialResources = grabResources(files);
if (isEmpty(initialResources)) {
if (needsUpdate && doUpdate) {
/*
@@ -866,22 +866,22 @@
if (emptyBehavior.equals("skip")) {
if (doUpdate) {
- log(archiveType + " archive " + zipFile
+ log(archiveType + " archive " + zip
+ " not updated because no new files were included.",
Project.MSG_VERBOSE);
} else {
log("Warning: skipping " + archiveType + " archive "
- + zipFile + " because no files were included.",
+ + zip + " because no files were included.",
Project.MSG_WARN);
}
} else if (emptyBehavior.equals("fail")) {
throw new BuildException("Cannot create " + archiveType
- + " archive " + zipFile
+ + " archive " + zip
+ ": no files were included.",
getLocation());
} else {
// Create.
- if (!zipFile.exists()) {
+ if (!zip.exists()) {
needsUpdate = true;
}
}
@@ -890,7 +890,7 @@
// initialResources is not empty
- if (!zipFile.exists()) {
+ if (!zip.exists()) {
return new ArchiveState(true, initialResources);
}
@@ -899,18 +899,18 @@
return new ArchiveState(true, initialResources);
}
- Resource[][] newerResources = new Resource[filesets.length][];
+ Resource[][] newerResources = new Resource[files.length][];
- for (int i = 0; i < filesets.length; i++) {
+ for (int i = 0; i < files.length; i++) {
if (!(fileset instanceof ZipFileSet)
|| ((ZipFileSet) fileset).getSrc(getProject()) == null) {
- File base = filesets[i].getDir(getProject());
+ File base = files[i].getDir(getProject());
for (int j = 0; j < initialResources[i].length; j++) {
File resourceAsFile =
FILE_UTILS.resolveFile(base,
initialResources[i][j].getName());
- if (resourceAsFile.equals(zipFile)) {
+ if (resourceAsFile.equals(zip)) {
throw new BuildException("A zip file cannot include "
+ "itself", getLocation());
}
@@ -918,15 +918,15 @@
}
}
- for (int i = 0; i < filesets.length; i++) {
+ for (int i = 0; i < files.length; i++) {
if (initialResources[i].length == 0) {
newerResources[i] = new Resource[] {};
continue;
}
FileNameMapper myMapper = new IdentityMapper();
- if (filesets[i] instanceof ZipFileSet) {
- ZipFileSet zfs = (ZipFileSet) filesets[i];
+ if (files[i] instanceof ZipFileSet) {
+ ZipFileSet zfs = (ZipFileSet) files[i];
if (zfs.getFullpath(getProject()) != null
&& !zfs.getFullpath(getProject()).equals("")) {
// in this case all files from origin map to
@@ -980,21 +980,21 @@
* Fetch all included and not excluded resources from the sets.
*
* <p>Included directories will precede included files.</p>
- * @param filesets an array of filesets
+ * @param fsets an array of filesets
* @return the resources included
* @since Ant 1.5.2
*/
- protected Resource[][] grabResources(FileSet[] filesets) {
- Resource[][] result = new Resource[filesets.length][];
- for (int i = 0; i < filesets.length; i++) {
+ protected Resource[][] grabResources(FileSet[] fsets) {
+ Resource[][] result = new Resource[fsets.length][];
+ for (int i = 0; i < fsets.length; i++) {
boolean skipEmptyNames = true;
- if (filesets[i] instanceof ZipFileSet) {
- ZipFileSet zfs = (ZipFileSet) filesets[i];
+ if (fsets[i] instanceof ZipFileSet) {
+ ZipFileSet zfs = (ZipFileSet) fsets[i];
skipEmptyNames = zfs.getPrefix(getProject()).equals("")
&& zfs.getFullpath(getProject()).equals("");
}
DirectoryScanner rs =
- filesets[i].getDirectoryScanner(getProject());
+ fsets[i].getDirectoryScanner(getProject());
if (rs instanceof ZipScanner) {
((ZipScanner) rs).setEncoding(encoding);
}
@@ -1188,7 +1188,7 @@
/**
* Ensure all parent dirs of a given entry have been added.
- * @param baseDir the base directory to use (may be null)
+ * @param base the base directory to use (may be null)
* @param entry the entry name to create directories from
* @param zOut the stream to write to
* @param prefix a prefix to place on the created entries
@@ -1196,7 +1196,7 @@
* @throws IOException on error
* @since Ant 1.5.2
*/
- protected final void addParentDirs(File baseDir, String entry,
+ protected final void addParentDirs(File base, String entry,
ZipOutputStream zOut, String prefix,
int dirMode)
throws IOException {
@@ -1215,8 +1215,8 @@
while (!directories.isEmpty()) {
String dir = (String) directories.pop();
File f = null;
- if (baseDir != null) {
- f = new File(baseDir, dir);
+ if (base != null) {
+ f = new File(base, dir);
} else {
f = new File(dir);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
