- removed unused imports - renamed _copy to copy and changed references to this.copy in Sync task
Kev
Index: Checksum.java
===================================================================
RCS file:
/home/cvspublic/ant/src/main/org/apache/tools/ant/taskdefs/Checksum.java,v
retrieving revision 1.41
diff -u -r1.41 Checksum.java
--- Checksum.java 22 Nov 2004 09:23:27 -0000 1.41
+++ Checksum.java 28 Dec 2004 11:42:50 -0000
@@ -26,7 +26,6 @@
import java.io.FileReader;
import java.io.BufferedReader;
import java.io.IOException;
-import java.io.InputStreamReader;
import java.util.HashMap;
import java.util.Map;
import java.util.Vector;
Index: Expand.java
===================================================================
RCS file:
/home/cvspublic/ant/src/main/org/apache/tools/ant/taskdefs/Expand.java,v
retrieving revision 1.57
diff -u -r1.57 Expand.java
--- Expand.java 11 Dec 2004 22:43:05 -0000 1.57
+++ Expand.java 28 Dec 2004 11:42:51 -0000
@@ -18,13 +18,14 @@
package org.apache.tools.ant.taskdefs;
import java.io.File;
-import java.io.FileOutputStream;
import java.io.FileNotFoundException;
-import java.io.InputStream;
+import java.io.FileOutputStream;
import java.io.IOException;
+import java.io.InputStream;
import java.util.Date;
import java.util.Enumeration;
import java.util.Vector;
+
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.DirectoryScanner;
import org.apache.tools.ant.Project;
@@ -35,7 +36,6 @@
import org.apache.tools.ant.types.selectors.SelectorUtils;
import org.apache.tools.ant.util.FileNameMapper;
import org.apache.tools.ant.util.FileUtils;
-import org.apache.tools.ant.util.FlatFileNameMapper;
import org.apache.tools.ant.util.IdentityMapper;
import org.apache.tools.zip.ZipEntry;
import org.apache.tools.zip.ZipFile;
@@ -98,7 +98,7 @@
}
}
if (filesets.size() > 0) {
- for (int j = 0; j < filesets.size(); j++) {
+ for (int j = 0, size = filesets.size(); j < size; j++) {
FileSet fs = (FileSet) filesets.elementAt(j);
DirectoryScanner ds = fs.getDirectoryScanner(getProject());
File fromDir = fs.getDir(getProject());
@@ -178,7 +178,7 @@
String name = entryName.replace('/', File.separatorChar)
.replace('\\', File.separatorChar);
boolean included = false;
- for (int v = 0; v < patternsets.size(); v++) {
+ for (int v = 0, size = patternsets.size(); v < size; v++) {
PatternSet p = (PatternSet) patternsets.elementAt(v);
String[] incls = p.getIncludePatterns(getProject());
if (incls == null || incls.length == 0) {
Index: ImportTask.java
===================================================================
RCS file:
/home/cvspublic/ant/src/main/org/apache/tools/ant/taskdefs/ImportTask.java,v
retrieving revision 1.29
diff -u -r1.29 ImportTask.java
--- ImportTask.java 2 Dec 2004 22:06:15 -0000 1.29
+++ ImportTask.java 28 Dec 2004 11:42:51 -0000
@@ -20,12 +20,10 @@
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.ProjectHelper;
import org.apache.tools.ant.Project;
-import org.apache.tools.ant.ProjectHelper;
import org.apache.tools.ant.Task;
import org.apache.tools.ant.util.FileUtils;
import java.io.File;
-import java.io.IOException;
import java.util.Vector;
/**
Index: Recorder.java
===================================================================
RCS file:
/home/cvspublic/ant/src/main/org/apache/tools/ant/taskdefs/Recorder.java,v
retrieving revision 1.23
diff -u -r1.23 Recorder.java
--- Recorder.java 2 Nov 2004 16:21:47 -0000 1.23
+++ Recorder.java 28 Dec 2004 11:42:51 -0000
@@ -16,9 +16,6 @@
*/
package org.apache.tools.ant.taskdefs;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.PrintStream;
import java.util.Hashtable;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Project;
Index: Redirector.java
===================================================================
RCS file:
/home/cvspublic/ant/src/main/org/apache/tools/ant/taskdefs/Redirector.java,v
retrieving revision 1.21
diff -u -r1.21 Redirector.java
--- Redirector.java 22 Nov 2004 09:23:28 -0000 1.21
+++ Redirector.java 28 Dec 2004 11:42:51 -0000
@@ -24,17 +24,13 @@
import java.io.OutputStream;
import java.io.StringReader;
import java.io.BufferedReader;
-import java.io.FileInputStream;
-import java.io.PipedInputStream;
import java.io.InputStreamReader;
import java.io.PipedOutputStream;
-import java.io.OutputStreamWriter;
-import java.io.BufferedInputStream;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
-import java.io.FileNotFoundException;
import java.util.Arrays;
import java.util.Vector;
+
import org.apache.tools.ant.Task;
import org.apache.tools.ant.Project;
import org.apache.tools.ant.BuildException;
Index: Sync.java
===================================================================
RCS file: /home/cvspublic/ant/src/main/org/apache/tools/ant/taskdefs/Sync.java,v
retrieving revision 1.16
diff -u -r1.16 Sync.java
--- Sync.java 22 Nov 2004 09:23:28 -0000 1.16
+++ Sync.java 28 Dec 2004 11:42:52 -0000
@@ -26,7 +26,6 @@
import java.io.File;
import java.util.HashSet;
-import java.util.Iterator;
import java.util.Set;
import org.apache.tools.ant.BuildException;
@@ -34,9 +33,6 @@
import org.apache.tools.ant.Project;
import org.apache.tools.ant.Task;
import org.apache.tools.ant.types.FileSet;
-import org.apache.tools.ant.types.PatternSet;
-import org.apache.tools.ant.util.FileNameMapper;
-import org.apache.tools.ant.util.IdentityMapper;
/**
* Synchronize a local target directory from the files defined
@@ -57,19 +53,19 @@
public class Sync extends Task {
// Same as regular <copy> task... see at end-of-file!
- private MyCopy _copy;
+ private MyCopy copy;
// Override Task#init
public void init()
throws BuildException {
// Instantiate it
- _copy = new MyCopy();
- configureTask(_copy);
+ this.copy = new MyCopy();
+ configureTask(this.copy);
// Default config of <mycopy> for our purposes.
- _copy.setFiltering(false);
- _copy.setIncludeEmptyDirs(false);
- _copy.setPreserveLastModified(true);
+ this.copy.setFiltering(false);
+ this.copy.setIncludeEmptyDirs(false);
+ this.copy.setPreserveLastModified(true);
}
private void configureTask(Task helper) {
@@ -83,10 +79,10 @@
public void execute()
throws BuildException {
// The destination of the files to copy
- File toDir = _copy.getToDir();
+ File toDir = this.copy.getToDir();
// The complete list of files to copy
- Set allFiles = _copy.nonOrphans;
+ Set allFiles = this.copy.nonOrphans;
// If the destination directory didn't already exist,
// or was empty, then no previous file removal is necessary!
@@ -94,7 +90,7 @@
// Copy all the necessary out-of-date files
log("PASS#1: Copying files to " + toDir, Project.MSG_DEBUG);
- _copy.execute();
+ this.copy.execute();
// Do we need to perform further processing?
if (noRemovalNecessary) {
@@ -109,7 +105,7 @@
logRemovedCount(removedFileCount[1], "dangling file", "", "s");
// Get rid of empty directories on the destination side
- if (!_copy.getIncludeEmptyDirs()) {
+ if (!this.copy.getIncludeEmptyDirs()) {
log("PASS#3: Removing empty directories from " + toDir,
Project.MSG_DEBUG);
int removedDirCount = removeEmptyDirectories(toDir, false);
@@ -119,7 +115,7 @@
private void logRemovedCount(int count, String prefix,
String singularSuffix, String pluralSuffix) {
- File toDir = _copy.getToDir();
+ File toDir = this.copy.getToDir();
String what = (prefix == null) ? "" : prefix;
what += (count < 2) ? singularSuffix : pluralSuffix;
@@ -230,28 +226,28 @@
* Sets the destination directory.
*/
public void setTodir(File destDir) {
- _copy.setTodir(destDir);
+ this.copy.setTodir(destDir);
}
/**
* Used to force listing of all names of copied files.
*/
public void setVerbose(boolean verbose) {
- _copy.setVerbose(verbose);
+ this.copy.setVerbose(verbose);
}
/**
* Overwrite any existing destination file(s).
*/
public void setOverwrite(boolean overwrite) {
- _copy.setOverwrite(overwrite);
+ this.copy.setOverwrite(overwrite);
}
/**
* Used to copy empty directories.
*/
public void setIncludeEmptyDirs(boolean includeEmpty) {
- _copy.setIncludeEmptyDirs(includeEmpty);
+ this.copy.setIncludeEmptyDirs(includeEmpty);
}
/**
@@ -259,14 +255,14 @@
* @param failonerror true or false
*/
public void setFailOnError(boolean failonerror) {
- _copy.setFailOnError(failonerror);
+ this.copy.setFailOnError(failonerror);
}
/**
* Adds a set of files to copy.
*/
public void addFileset(FileSet set) {
- _copy.addFileset(set);
+ this.copy.addFileset(set);
}
/**
@@ -278,7 +274,7 @@
* @since Ant 1.6.2
*/
public void setGranularity(long granularity) {
- _copy.setGranularity(granularity);
+ this.copy.setGranularity(granularity);
}
/**
Index: Touch.java
===================================================================
RCS file:
/home/cvspublic/ant/src/main/org/apache/tools/ant/taskdefs/Touch.java,v
retrieving revision 1.43
diff -u -r1.43 Touch.java
--- Touch.java 17 Dec 2004 12:03:58 -0000 1.43
+++ Touch.java 28 Dec 2004 11:42:52 -0000
@@ -22,7 +22,6 @@
import java.text.DateFormat;
import java.text.ParseException;
import java.text.SimpleDateFormat;
-import java.util.Date;
import java.util.Locale;
import java.util.Vector;
import org.apache.tools.ant.BuildException;
Index: Untar.java
===================================================================
RCS file:
/home/cvspublic/ant/src/main/org/apache/tools/ant/taskdefs/Untar.java,v
retrieving revision 1.43
diff -u -r1.43 Untar.java
--- Untar.java 12 Nov 2004 15:14:59 -0000 1.43
+++ Untar.java 28 Dec 2004 11:42:52 -0000
@@ -23,13 +23,12 @@
import java.io.IOException;
import java.io.InputStream;
import java.util.zip.GZIPInputStream;
+
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Project;
import org.apache.tools.ant.types.EnumeratedAttribute;
import org.apache.tools.ant.util.FileNameMapper;
import org.apache.tools.ant.util.FileUtils;
-import org.apache.tools.ant.util.FlatFileNameMapper;
-import org.apache.tools.ant.util.IdentityMapper;
import org.apache.tools.bzip2.CBZip2InputStream;
import org.apache.tools.tar.TarEntry;
import org.apache.tools.tar.TarInputStream;--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
