Author: bodewig
Date: Mon Nov 22 12:27:03 2010
New Revision: 1037691
URL: http://svn.apache.org/viewvc?rev=1037691&view=rev
Log:
fix a bunch of warnings you get when building on Harmony which uses Eclipse's
compiler. There are still lots (more than 100) of deprecation warnings and
warnings about missing serialversionids that I have ignored.
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/ComponentHelper.java
ant/core/trunk/src/main/org/apache/tools/ant/Diagnostics.java
ant/core/trunk/src/main/org/apache/tools/ant/DirectoryScanner.java
ant/core/trunk/src/main/org/apache/tools/ant/Task.java
ant/core/trunk/src/main/org/apache/tools/ant/helper/ProjectHelperImpl.java
ant/core/trunk/src/main/org/apache/tools/ant/input/GreedyInputHandler.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Checksum.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Delete.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Get.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/ManifestClassPath.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Parallel.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Property.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Replace.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/VerifyJar.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/email/Message.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ReplaceRegExp.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/net/FTPTask.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpFromMessage.java
ant/core/trunk/src/main/org/apache/tools/ant/types/ZipScanner.java
ant/core/trunk/src/main/org/apache/tools/ant/util/FileUtils.java
ant/core/trunk/src/main/org/apache/tools/ant/util/FirstMatchMapper.java
ant/core/trunk/src/main/org/apache/tools/ant/util/LayoutPreservingProperties.java
ant/core/trunk/src/main/org/apache/tools/ant/util/SymbolicLinkUtils.java
ant/core/trunk/src/main/org/apache/tools/ant/util/optional/JavaxScriptRunner.java
ant/core/trunk/src/main/org/apache/tools/bzip2/CBZip2InputStream.java
ant/core/trunk/src/main/org/apache/tools/zip/ZipEncodingHelper.java
ant/core/trunk/src/main/org/apache/tools/zip/ZipEntry.java
ant/core/trunk/src/main/org/apache/tools/zip/ZipLong.java
ant/core/trunk/src/tests/junit/org/apache/tools/ant/AntClassLoaderDelegationTest.java
ant/core/trunk/src/tests/junit/org/apache/tools/ant/DirectoryScannerTest.java
ant/core/trunk/src/tests/junit/org/apache/tools/ant/taskdefs/AntTest.java
ant/core/trunk/src/tests/junit/org/apache/tools/ant/taskdefs/BZip2Test.java
ant/core/trunk/src/tests/junit/org/apache/tools/ant/taskdefs/JavaTest.java
ant/core/trunk/src/tests/junit/org/apache/tools/ant/taskdefs/MakeUrlTest.java
ant/core/trunk/src/tests/junit/org/apache/tools/ant/taskdefs/StyleTest.java
ant/core/trunk/src/tests/junit/org/apache/tools/ant/taskdefs/condition/HttpTest.java
ant/core/trunk/src/tests/junit/org/apache/tools/ant/taskdefs/optional/EchoPropertiesTest.java
ant/core/trunk/src/tests/junit/org/apache/tools/ant/taskdefs/optional/splash/SplashScreenTest.java
ant/core/trunk/src/tests/junit/org/apache/tools/ant/taskdefs/optional/vss/MSVSSTest.java
ant/core/trunk/src/tests/junit/org/apache/tools/ant/types/selectors/DateSelectorTest.java
ant/core/trunk/src/tests/junit/org/apache/tools/ant/types/selectors/DependSelectorTest.java
ant/core/trunk/src/tests/junit/org/apache/tools/ant/types/selectors/DepthSelectorTest.java
ant/core/trunk/src/tests/junit/org/apache/tools/ant/types/selectors/FilenameSelectorTest.java
ant/core/trunk/src/tests/junit/org/apache/tools/ant/types/selectors/ModifiedSelectorTest.java
ant/core/trunk/src/tests/junit/org/apache/tools/ant/types/selectors/PresentSelectorTest.java
ant/core/trunk/src/tests/junit/org/apache/tools/ant/types/selectors/SizeSelectorTest.java
ant/core/trunk/src/tests/junit/org/apache/tools/ant/util/LineOrientedOutputStreamTest.java
ant/core/trunk/src/tests/junit/org/apache/tools/zip/ExtraFieldUtilsTest.java
ant/core/trunk/src/tests/junit/org/apache/tools/zip/UTF8ZipFilesTest.java
Modified: ant/core/trunk/src/main/org/apache/tools/ant/ComponentHelper.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/ComponentHelper.java?rev=1037691&r1=1037690&r2=1037691&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/ComponentHelper.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/ComponentHelper.java Mon Nov
22 12:27:03 2010
@@ -1096,11 +1096,6 @@ public class ComponentHelper {
return getTypeClass((String) key);
}
- Object create(String name) {
- AntTypeDefinition def = getDefinition(name);
- return (def == null) ? null : def.create(project);
- }
-
Class getTypeClass(String name) {
AntTypeDefinition def = getDefinition(name);
return (def == null) ? null : def.getTypeClass(project);
Modified: ant/core/trunk/src/main/org/apache/tools/ant/Diagnostics.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/Diagnostics.java?rev=1037691&r1=1037690&r2=1037691&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/Diagnostics.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/Diagnostics.java Mon Nov 22
12:27:03 2010
@@ -17,7 +17,6 @@
*/
package org.apache.tools.ant;
-import org.apache.tools.ant.util.LoaderUtils;
import org.apache.tools.ant.util.FileUtils;
import org.apache.tools.ant.util.JAXPUtils;
import org.apache.tools.ant.util.ProxySetup;
Modified: ant/core/trunk/src/main/org/apache/tools/ant/DirectoryScanner.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/DirectoryScanner.java?rev=1037691&r1=1037690&r2=1037691&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/DirectoryScanner.java
(original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/DirectoryScanner.java Mon Nov
22 12:27:03 2010
@@ -20,7 +20,6 @@ package org.apache.tools.ant;
import java.io.File;
import java.io.IOException;
-import java.lang.ref.SoftReference;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
Modified: ant/core/trunk/src/main/org/apache/tools/ant/Task.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/Task.java?rev=1037691&r1=1037690&r2=1037691&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/Task.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/Task.java Mon Nov 22 12:27:03
2010
@@ -408,7 +408,7 @@ public abstract class Task extends Proje
replacement.setProject(getProject());
replacement.setTaskType(taskType);
replacement.setTaskName(taskName);
- replacement.setLocation(location);
+ replacement.setLocation(getLocation());
replacement.setOwningTarget(target);
replacement.setRuntimeConfigurableWrapper(wrapper);
wrapper.setProxy(replacement);
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/helper/ProjectHelperImpl.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/helper/ProjectHelperImpl.java?rev=1037691&r1=1037690&r2=1037691&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/helper/ProjectHelperImpl.java
(original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/helper/ProjectHelperImpl.java
Mon Nov 22 12:27:03 2010
@@ -403,7 +403,7 @@ public class ProjectHelperImpl extends P
}
if (def != null && !def.equals("")) {
- helperImpl.project.setDefaultTarget(def);
+ helperImpl.project.setDefault(def);
} else {
throw new BuildException("The default attribute is required");
}
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/input/GreedyInputHandler.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/input/GreedyInputHandler.java?rev=1037691&r1=1037690&r2=1037691&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/input/GreedyInputHandler.java
(original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/input/GreedyInputHandler.java
Mon Nov 22 12:27:03 2010
@@ -31,8 +31,6 @@ import org.apache.tools.ant.util.FileUti
*/
public class GreedyInputHandler extends DefaultInputHandler {
- private static final int BUFFER_SIZE = 1024;
-
/**
* Empty no-arg constructor
*/
Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Checksum.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Checksum.java?rev=1037691&r1=1037690&r2=1037691&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Checksum.java
(original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Checksum.java Mon Nov
22 12:27:03 2010
@@ -532,11 +532,11 @@ public class Checksum extends MatchingTa
fos.write(format.format(new Object[] {
checksum,
src.getName(),
- FILE_UTILS
+ FileUtils
.getRelativePath(dest
.getParentFile(),
src),
- FILE_UTILS
+ FileUtils
.getRelativePath(getProject()
.getBaseDir(),
src),
Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Delete.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Delete.java?rev=1037691&r1=1037690&r2=1037691&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Delete.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Delete.java Mon Nov
22 12:27:03 2010
@@ -27,7 +27,6 @@ import java.util.Comparator;
import org.apache.tools.ant.Project;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.DirectoryScanner;
-import org.apache.tools.ant.taskdefs.condition.Os;
import org.apache.tools.ant.types.FileSet;
import org.apache.tools.ant.types.PatternSet;
import org.apache.tools.ant.types.Resource;
Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Get.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Get.java?rev=1037691&r1=1037690&r2=1037691&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Get.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Get.java Mon Nov 22
12:27:03 2010
@@ -29,9 +29,7 @@ import java.net.HttpURLConnection;
import java.net.URL;
import java.net.URLConnection;
import java.util.Date;
-import java.util.HashSet;
import java.util.Iterator;
-import java.util.Set;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Project;
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/ManifestClassPath.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/ManifestClassPath.java?rev=1037691&r1=1037690&r2=1037691&view=diff
==============================================================================
---
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/ManifestClassPath.java
(original)
+++
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/ManifestClassPath.java
Mon Nov 22 12:27:03 2010
@@ -78,7 +78,6 @@ public class ManifestClassPath extends T
String[] elements = path.list();
StringBuffer buffer = new StringBuffer();
- StringBuffer element = new StringBuffer();
for (int i = 0; i < elements.length; ++i) {
// Normalize the current file
File pathEntry = new File(elements[i]);
Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Parallel.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Parallel.java?rev=1037691&r1=1037690&r2=1037691&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Parallel.java
(original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Parallel.java Mon Nov
22 12:27:03 2010
@@ -17,7 +17,6 @@
*/
package org.apache.tools.ant.taskdefs;
-import java.lang.reflect.Method;
import java.util.Enumeration;
import java.util.Vector;
import java.util.List;
Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Property.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Property.java?rev=1037691&r1=1037690&r2=1037691&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Property.java
(original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Property.java Mon Nov
22 12:27:03 2010
@@ -482,7 +482,7 @@ public class Property extends Task {
try {
File from = untypedValue instanceof File ?
(File)untypedValue : new File(untypedValue.toString());
File to = basedir != null ? basedir :
getProject().getBaseDir();
- String relPath =
FileUtils.getFileUtils().getRelativePath(to, from);
+ String relPath = FileUtils.getRelativePath(to, from);
relPath = relPath.replace('/', File.separatorChar);
addProperty(name, relPath);
} catch (Exception e) {
Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Replace.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Replace.java?rev=1037691&r1=1037690&r2=1037691&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Replace.java
(original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Replace.java Mon Nov
22 12:27:03 2010
@@ -22,7 +22,6 @@ import java.io.BufferedReader;
import java.io.BufferedWriter;
import java.io.File;
import java.io.FileInputStream;
-import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.FileReader;
import java.io.FileWriter;
Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/VerifyJar.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/VerifyJar.java?rev=1037691&r1=1037690&r2=1037691&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/VerifyJar.java
(original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/VerifyJar.java Mon
Nov 22 12:27:03 2010
@@ -26,7 +26,6 @@ import org.apache.tools.ant.types.Filter
import org.apache.tools.ant.types.Path;
import org.apache.tools.ant.types.Resource;
import org.apache.tools.ant.types.resources.FileProvider;
-import org.apache.tools.ant.types.resources.FileResource;
import java.util.Iterator;
import java.io.File;
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/email/Message.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/email/Message.java?rev=1037691&r1=1037690&r2=1037691&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/email/Message.java
(original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/email/Message.java
Mon Nov 22 12:27:03 2010
@@ -26,7 +26,6 @@ import java.io.OutputStreamWriter;
import java.io.PrintStream;
import org.apache.tools.ant.ProjectComponent;
-import org.apache.tools.ant.util.FileUtils;
/**
* Class representing an email message.
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ReplaceRegExp.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ReplaceRegExp.java?rev=1037691&r1=1037690&r2=1037691&view=diff
==============================================================================
---
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ReplaceRegExp.java
(original)
+++
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ReplaceRegExp.java
Mon Nov 22 12:27:03 2010
@@ -31,7 +31,6 @@ import java.io.Reader;
import java.io.Writer;
import java.util.Iterator;
import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.DirectoryScanner;
import org.apache.tools.ant.Project;
import org.apache.tools.ant.Task;
import org.apache.tools.ant.types.FileSet;
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/net/FTPTask.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/net/FTPTask.java?rev=1037691&r1=1037690&r2=1037691&view=diff
==============================================================================
---
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/net/FTPTask.java
(original)
+++
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/net/FTPTask.java
Mon Nov 22 12:27:03 2010
@@ -19,8 +19,6 @@ package org.apache.tools.ant.taskdefs.op
import java.io.File;
import java.lang.reflect.Constructor;
-import java.util.Collection;
-import java.util.Iterator;
import java.util.Locale;
import java.util.Vector;
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpFromMessage.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpFromMessage.java?rev=1037691&r1=1037690&r2=1037691&view=diff
==============================================================================
---
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpFromMessage.java
(original)
+++
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpFromMessage.java
Mon Nov 22 12:27:03 2010
@@ -282,7 +282,6 @@ public class ScpFromMessage extends Abst
private void setLastModified(File localFile) throws JSchException {
SftpATTRS fileAttributes = null;
- String remotePath = null;
ChannelSftp channel = openSftpChannel();
channel.connect();
try {
Modified: ant/core/trunk/src/main/org/apache/tools/ant/types/ZipScanner.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/types/ZipScanner.java?rev=1037691&r1=1037690&r2=1037691&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/types/ZipScanner.java
(original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/types/ZipScanner.java Mon Nov
22 12:27:03 2010
@@ -25,7 +25,6 @@ import java.util.Map;
import java.util.zip.ZipException;
import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.types.resources.FileResource;
import org.apache.tools.ant.types.resources.ZipResource;
import org.apache.tools.ant.types.resources.FileProvider;
import org.apache.tools.zip.ZipEntry;
Modified: ant/core/trunk/src/main/org/apache/tools/ant/util/FileUtils.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/util/FileUtils.java?rev=1037691&r1=1037690&r2=1037691&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/util/FileUtils.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/util/FileUtils.java Mon Nov 22
12:27:03 2010
@@ -24,7 +24,6 @@ import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.OutputStream;
import java.io.Reader;
-import java.io.UnsupportedEncodingException;
import java.io.Writer;
import java.net.MalformedURLException;
import java.net.HttpURLConnection;
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/util/FirstMatchMapper.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/util/FirstMatchMapper.java?rev=1037691&r1=1037690&r2=1037691&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/util/FirstMatchMapper.java
(original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/util/FirstMatchMapper.java Mon
Nov 22 12:27:03 2010
@@ -17,10 +17,7 @@
*/
package org.apache.tools.ant.util;
-import java.util.Arrays;
-import java.util.HashSet;
import java.util.Iterator;
-import java.util.LinkedList;
/**
* A <code>ContainerMapper</code> that returns the results of its
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/util/LayoutPreservingProperties.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/util/LayoutPreservingProperties.java?rev=1037691&r1=1037690&r2=1037691&view=diff
==============================================================================
---
ant/core/trunk/src/main/org/apache/tools/ant/util/LayoutPreservingProperties.java
(original)
+++
ant/core/trunk/src/main/org/apache/tools/ant/util/LayoutPreservingProperties.java
Mon Nov 22 12:27:03 2010
@@ -29,7 +29,6 @@ import java.io.OutputStreamWriter;
import java.io.PrintStream;
import java.io.PushbackReader;
import java.util.ArrayList;
-import java.util.Date;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Properties;
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/util/SymbolicLinkUtils.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/util/SymbolicLinkUtils.java?rev=1037691&r1=1037690&r2=1037691&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/util/SymbolicLinkUtils.java
(original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/util/SymbolicLinkUtils.java
Mon Nov 22 12:27:03 2010
@@ -21,7 +21,6 @@ import java.io.File;
import java.io.FileNotFoundException;
import java.io.FilenameFilter;
import java.io.IOException;
-import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Task;
import org.apache.tools.ant.taskdefs.Execute;
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/util/optional/JavaxScriptRunner.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/util/optional/JavaxScriptRunner.java?rev=1037691&r1=1037690&r2=1037691&view=diff
==============================================================================
---
ant/core/trunk/src/main/org/apache/tools/ant/util/optional/JavaxScriptRunner.java
(original)
+++
ant/core/trunk/src/main/org/apache/tools/ant/util/optional/JavaxScriptRunner.java
Mon Nov 22 12:27:03 2010
@@ -22,7 +22,6 @@ import org.apache.tools.ant.BuildExcepti
import java.util.Iterator;
import org.apache.tools.ant.util.ScriptRunnerBase;
-import org.apache.tools.ant.util.ReflectUtil;
import org.apache.tools.ant.util.ReflectWrapper;
/**
Modified: ant/core/trunk/src/main/org/apache/tools/bzip2/CBZip2InputStream.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/bzip2/CBZip2InputStream.java?rev=1037691&r1=1037690&r2=1037691&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/bzip2/CBZip2InputStream.java
(original)
+++ ant/core/trunk/src/main/org/apache/tools/bzip2/CBZip2InputStream.java Mon
Nov 22 12:27:03 2010
@@ -23,7 +23,6 @@
*/
package org.apache.tools.bzip2;
-import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
Modified: ant/core/trunk/src/main/org/apache/tools/zip/ZipEncodingHelper.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/zip/ZipEncodingHelper.java?rev=1037691&r1=1037690&r2=1037691&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/zip/ZipEncodingHelper.java
(original)
+++ ant/core/trunk/src/main/org/apache/tools/zip/ZipEncodingHelper.java Mon Nov
22 12:27:03 2010
@@ -22,7 +22,6 @@ import java.nio.ByteBuffer;
import java.nio.charset.Charset;
import java.nio.charset.UnsupportedCharsetException;
import java.util.HashMap;
-import java.util.Locale;
import java.util.Map;
/**
Modified: ant/core/trunk/src/main/org/apache/tools/zip/ZipEntry.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/zip/ZipEntry.java?rev=1037691&r1=1037690&r2=1037691&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/zip/ZipEntry.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/zip/ZipEntry.java Mon Nov 22
12:27:03 2010
@@ -19,7 +19,6 @@
package org.apache.tools.zip;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.zip.ZipException;
Modified: ant/core/trunk/src/main/org/apache/tools/zip/ZipLong.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/zip/ZipLong.java?rev=1037691&r1=1037690&r2=1037691&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/zip/ZipLong.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/zip/ZipLong.java Mon Nov 22
12:27:03 2010
@@ -26,7 +26,6 @@ package org.apache.tools.zip;
public final class ZipLong implements Cloneable {
private static final int WORD = 4;
- private static final int BYTE_BIT_SIZE = 8;
private static final int BYTE_MASK = 0xFF;
private static final int BYTE_1 = 1;
Modified:
ant/core/trunk/src/tests/junit/org/apache/tools/ant/AntClassLoaderDelegationTest.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/tests/junit/org/apache/tools/ant/AntClassLoaderDelegationTest.java?rev=1037691&r1=1037690&r2=1037691&view=diff
==============================================================================
---
ant/core/trunk/src/tests/junit/org/apache/tools/ant/AntClassLoaderDelegationTest.java
(original)
+++
ant/core/trunk/src/tests/junit/org/apache/tools/ant/AntClassLoaderDelegationTest.java
Mon Nov 22 12:27:03 2010
@@ -21,7 +21,6 @@ package org.apache.tools.ant;
import java.io.File;
import java.io.IOException;
import java.net.URL;
-import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.Enumeration;
Modified:
ant/core/trunk/src/tests/junit/org/apache/tools/ant/DirectoryScannerTest.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/tests/junit/org/apache/tools/ant/DirectoryScannerTest.java?rev=1037691&r1=1037690&r2=1037691&view=diff
==============================================================================
---
ant/core/trunk/src/tests/junit/org/apache/tools/ant/DirectoryScannerTest.java
(original)
+++
ant/core/trunk/src/tests/junit/org/apache/tools/ant/DirectoryScannerTest.java
Mon Nov 22 12:27:03 2010
@@ -20,7 +20,6 @@ package org.apache.tools.ant;
import org.apache.tools.ant.taskdefs.condition.Os;
import org.apache.tools.ant.types.selectors.TokenizedPath;
-import org.apache.tools.ant.util.FileUtils;
import org.apache.tools.ant.util.SymbolicLinkUtils;
import java.io.File;
Modified:
ant/core/trunk/src/tests/junit/org/apache/tools/ant/taskdefs/AntTest.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/tests/junit/org/apache/tools/ant/taskdefs/AntTest.java?rev=1037691&r1=1037690&r2=1037691&view=diff
==============================================================================
--- ant/core/trunk/src/tests/junit/org/apache/tools/ant/taskdefs/AntTest.java
(original)
+++ ant/core/trunk/src/tests/junit/org/apache/tools/ant/taskdefs/AntTest.java
Mon Nov 22 12:27:03 2010
@@ -101,7 +101,6 @@ public class AntTest extends BuildFileTe
public void testDoNotInheritBasedir() {
File dir1 = getProjectDir();
File dir2 = project.resolveFile("ant");
- String basedir = getProjectDir().getAbsolutePath();
testBaseDirs("doNotInheritBasedir",
new String[] {dir1.getAbsolutePath(),
dir2.getAbsolutePath()
Modified:
ant/core/trunk/src/tests/junit/org/apache/tools/ant/taskdefs/BZip2Test.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/tests/junit/org/apache/tools/ant/taskdefs/BZip2Test.java?rev=1037691&r1=1037690&r2=1037691&view=diff
==============================================================================
--- ant/core/trunk/src/tests/junit/org/apache/tools/ant/taskdefs/BZip2Test.java
(original)
+++ ant/core/trunk/src/tests/junit/org/apache/tools/ant/taskdefs/BZip2Test.java
Mon Nov 22 12:27:03 2010
@@ -19,7 +19,6 @@
package org.apache.tools.ant.taskdefs;
import org.apache.tools.ant.BuildFileTest;
-import org.apache.tools.ant.util.FileUtils;
import org.apache.tools.bzip2.CBZip2InputStream;
import java.io.BufferedInputStream;
@@ -32,9 +31,6 @@ import java.io.IOException;
*/
public class BZip2Test extends BuildFileTest {
- /** Utilities used for file operations */
- private static final FileUtils FILE_UTILS = FileUtils.getFileUtils();
-
public BZip2Test(String name) {
super(name);
}
Modified:
ant/core/trunk/src/tests/junit/org/apache/tools/ant/taskdefs/JavaTest.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/tests/junit/org/apache/tools/ant/taskdefs/JavaTest.java?rev=1037691&r1=1037690&r2=1037691&view=diff
==============================================================================
--- ant/core/trunk/src/tests/junit/org/apache/tools/ant/taskdefs/JavaTest.java
(original)
+++ ant/core/trunk/src/tests/junit/org/apache/tools/ant/taskdefs/JavaTest.java
Mon Nov 22 12:27:03 2010
@@ -62,7 +62,6 @@ public class JavaTest extends BuildFileT
//final String propname="tests-classpath.value";
//String testClasspath=System.getProperty(propname);
//System.out.println("Test cp="+testClasspath);
- String propname="tests-classpath.value";
String runFatal=System.getProperty("junit.run.fatal.tests");
if(runFatal!=null)
runFatalTests=true;
Modified:
ant/core/trunk/src/tests/junit/org/apache/tools/ant/taskdefs/MakeUrlTest.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/tests/junit/org/apache/tools/ant/taskdefs/MakeUrlTest.java?rev=1037691&r1=1037690&r2=1037691&view=diff
==============================================================================
---
ant/core/trunk/src/tests/junit/org/apache/tools/ant/taskdefs/MakeUrlTest.java
(original)
+++
ant/core/trunk/src/tests/junit/org/apache/tools/ant/taskdefs/MakeUrlTest.java
Mon Nov 22 12:27:03 2010
@@ -85,7 +85,6 @@ public class MakeUrlTest extends BuildFi
public void testFileset() {
executeTarget("testFileset");
assertPropertyContains("testFileset", ".xml ");
- String result = getProperty("testFileset");
assertPropertyEndsWith("testFileset", ".xml");
}
Modified:
ant/core/trunk/src/tests/junit/org/apache/tools/ant/taskdefs/StyleTest.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/tests/junit/org/apache/tools/ant/taskdefs/StyleTest.java?rev=1037691&r1=1037690&r2=1037691&view=diff
==============================================================================
--- ant/core/trunk/src/tests/junit/org/apache/tools/ant/taskdefs/StyleTest.java
(original)
+++ ant/core/trunk/src/tests/junit/org/apache/tools/ant/taskdefs/StyleTest.java
Mon Nov 22 12:27:03 2010
@@ -23,7 +23,6 @@ import java.io.IOException;
import java.io.Reader;
import org.apache.tools.ant.BuildFileTest;
-import org.apache.tools.ant.taskdefs.optional.XsltTest;
import org.apache.tools.ant.util.FileUtils;
Modified:
ant/core/trunk/src/tests/junit/org/apache/tools/ant/taskdefs/condition/HttpTest.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/tests/junit/org/apache/tools/ant/taskdefs/condition/HttpTest.java?rev=1037691&r1=1037690&r2=1037691&view=diff
==============================================================================
---
ant/core/trunk/src/tests/junit/org/apache/tools/ant/taskdefs/condition/HttpTest.java
(original)
+++
ant/core/trunk/src/tests/junit/org/apache/tools/ant/taskdefs/condition/HttpTest.java
Mon Nov 22 12:27:03 2010
@@ -17,8 +17,6 @@
*/
package org.apache.tools.ant.taskdefs.condition;
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.BuildFileTest;
/**
Modified:
ant/core/trunk/src/tests/junit/org/apache/tools/ant/taskdefs/optional/EchoPropertiesTest.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/tests/junit/org/apache/tools/ant/taskdefs/optional/EchoPropertiesTest.java?rev=1037691&r1=1037690&r2=1037691&view=diff
==============================================================================
---
ant/core/trunk/src/tests/junit/org/apache/tools/ant/taskdefs/optional/EchoPropertiesTest.java
(original)
+++
ant/core/trunk/src/tests/junit/org/apache/tools/ant/taskdefs/optional/EchoPropertiesTest.java
Mon Nov 22 12:27:03 2010
@@ -43,7 +43,6 @@ public class EchoPropertiesTest extends
private static final String GOOD_OUTFILE_XML = "test.xml";
private static final String PREFIX_OUTFILE = "test-prefix.properties";
private static final String TEST_VALUE = "isSet";
- private static final String BAD_OUTFILE = ".";
public EchoPropertiesTest(String name) {
super(name);
Modified:
ant/core/trunk/src/tests/junit/org/apache/tools/ant/taskdefs/optional/splash/SplashScreenTest.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/tests/junit/org/apache/tools/ant/taskdefs/optional/splash/SplashScreenTest.java?rev=1037691&r1=1037690&r2=1037691&view=diff
==============================================================================
---
ant/core/trunk/src/tests/junit/org/apache/tools/ant/taskdefs/optional/splash/SplashScreenTest.java
(original)
+++
ant/core/trunk/src/tests/junit/org/apache/tools/ant/taskdefs/optional/splash/SplashScreenTest.java
Mon Nov 22 12:27:03 2010
@@ -38,7 +38,7 @@ public class SplashScreenTest {
// give it some time to display
try {
- Thread.currentThread().sleep(2000);
+ Thread.sleep(2000);
} catch (InterruptedException e) {
} // end of try-catch
@@ -46,7 +46,7 @@ public class SplashScreenTest {
System.err.println("finished");
try {
- Thread.currentThread().sleep(2000);
+ Thread.sleep(2000);
} catch (InterruptedException e) {
} // end of try-catch
System.err.println("exiting");
Modified:
ant/core/trunk/src/tests/junit/org/apache/tools/ant/taskdefs/optional/vss/MSVSSTest.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/tests/junit/org/apache/tools/ant/taskdefs/optional/vss/MSVSSTest.java?rev=1037691&r1=1037690&r2=1037691&view=diff
==============================================================================
---
ant/core/trunk/src/tests/junit/org/apache/tools/ant/taskdefs/optional/vss/MSVSSTest.java
(original)
+++
ant/core/trunk/src/tests/junit/org/apache/tools/ant/taskdefs/optional/vss/MSVSSTest.java
Mon Nov 22 12:27:03 2010
@@ -38,13 +38,11 @@ public class MSVSSTest extends BuildFile
private Commandline commandline;
- private static final String VSS_SERVER_PATH =
"\\\\server\\vss\\srcsafe.ini";
private static final String VSS_PROJECT_PATH = "/SourceRoot/Project";
private static final String DS_VSS_PROJECT_PATH = "$/SourceRoot/Project";
private static final String VSS_USERNAME = "ant";
private static final String VSS_PASSWORD = "rocks";
private static final String LOCAL_PATH = "testdir";
- private static final String SRC_FILE = "Class1.java";
private static final String SRC_LABEL = "label1";
private static final String LONG_LABEL = "123456789012345678901234567890";
private static final String SRC_COMMENT = "I fixed a bug";
Modified:
ant/core/trunk/src/tests/junit/org/apache/tools/ant/types/selectors/DateSelectorTest.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/tests/junit/org/apache/tools/ant/types/selectors/DateSelectorTest.java?rev=1037691&r1=1037690&r2=1037691&view=diff
==============================================================================
---
ant/core/trunk/src/tests/junit/org/apache/tools/ant/types/selectors/DateSelectorTest.java
(original)
+++
ant/core/trunk/src/tests/junit/org/apache/tools/ant/types/selectors/DateSelectorTest.java
Mon Nov 22 12:27:03 2010
@@ -19,13 +19,8 @@
package org.apache.tools.ant.types.selectors;
import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Project;
import org.apache.tools.ant.types.Parameter;
-import java.text.SimpleDateFormat;
-import java.text.ParsePosition;
-import java.util.Date;
-
/**
* Tests Date Selectors.
@@ -33,8 +28,6 @@ import java.util.Date;
*/
public class DateSelectorTest extends BaseSelectorTest {
- private Project project;
-
public DateSelectorTest(String name) {
super(name);
}
@@ -175,8 +168,6 @@ public class DateSelectorTest extends Ba
s = (DateSelector)getInstance();
s.setDatetime("11/21/2001 4:55 AM");
- SimpleDateFormat formatter = new SimpleDateFormat();
- Date d = formatter.parse("11/21/2001 4:55 AM",new
ParsePosition(0));
long milliseconds = s.getMillis();
s.setWhen(equal);
Modified:
ant/core/trunk/src/tests/junit/org/apache/tools/ant/types/selectors/DependSelectorTest.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/tests/junit/org/apache/tools/ant/types/selectors/DependSelectorTest.java?rev=1037691&r1=1037690&r2=1037691&view=diff
==============================================================================
---
ant/core/trunk/src/tests/junit/org/apache/tools/ant/types/selectors/DependSelectorTest.java
(original)
+++
ant/core/trunk/src/tests/junit/org/apache/tools/ant/types/selectors/DependSelectorTest.java
Mon Nov 22 12:27:03 2010
@@ -19,7 +19,6 @@
package org.apache.tools.ant.types.selectors;
import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Project;
import org.apache.tools.ant.types.Mapper;
import java.io.File;
@@ -31,8 +30,6 @@ import java.io.File;
*/
public class DependSelectorTest extends BaseSelectorTest {
- private Project project;
-
public DependSelectorTest(String name) {
super(name);
}
Modified:
ant/core/trunk/src/tests/junit/org/apache/tools/ant/types/selectors/DepthSelectorTest.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/tests/junit/org/apache/tools/ant/types/selectors/DepthSelectorTest.java?rev=1037691&r1=1037690&r2=1037691&view=diff
==============================================================================
---
ant/core/trunk/src/tests/junit/org/apache/tools/ant/types/selectors/DepthSelectorTest.java
(original)
+++
ant/core/trunk/src/tests/junit/org/apache/tools/ant/types/selectors/DepthSelectorTest.java
Mon Nov 22 12:27:03 2010
@@ -19,7 +19,6 @@
package org.apache.tools.ant.types.selectors;
import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Project;
import org.apache.tools.ant.types.Parameter;
/**
@@ -28,8 +27,6 @@ import org.apache.tools.ant.types.Parame
*/
public class DepthSelectorTest extends BaseSelectorTest {
- private Project project;
-
public DepthSelectorTest(String name) {
super(name);
}
Modified:
ant/core/trunk/src/tests/junit/org/apache/tools/ant/types/selectors/FilenameSelectorTest.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/tests/junit/org/apache/tools/ant/types/selectors/FilenameSelectorTest.java?rev=1037691&r1=1037690&r2=1037691&view=diff
==============================================================================
---
ant/core/trunk/src/tests/junit/org/apache/tools/ant/types/selectors/FilenameSelectorTest.java
(original)
+++
ant/core/trunk/src/tests/junit/org/apache/tools/ant/types/selectors/FilenameSelectorTest.java
Mon Nov 22 12:27:03 2010
@@ -19,7 +19,6 @@
package org.apache.tools.ant.types.selectors;
import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Project;
import org.apache.tools.ant.types.Parameter;
/**
@@ -28,8 +27,6 @@ import org.apache.tools.ant.types.Parame
*/
public class FilenameSelectorTest extends BaseSelectorTest {
- private Project project;
-
public FilenameSelectorTest(String name) {
super(name);
}
Modified:
ant/core/trunk/src/tests/junit/org/apache/tools/ant/types/selectors/ModifiedSelectorTest.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/tests/junit/org/apache/tools/ant/types/selectors/ModifiedSelectorTest.java?rev=1037691&r1=1037690&r2=1037691&view=diff
==============================================================================
---
ant/core/trunk/src/tests/junit/org/apache/tools/ant/types/selectors/ModifiedSelectorTest.java
(original)
+++
ant/core/trunk/src/tests/junit/org/apache/tools/ant/types/selectors/ModifiedSelectorTest.java
Mon Nov 22 12:27:03 2010
@@ -55,9 +55,6 @@ public class ModifiedSelectorTest extend
// ===================== attributes =====================
- /** Package of the CacheSelector classes. */
- private static String pkg =
"org.apache.tools.ant.types.selectors.modifiedselector";
-
/** Path where the testclasses are. */
private Path testclasses = null;
@@ -459,7 +456,7 @@ public class ModifiedSelectorTest extend
// clear the cache
cache.delete();
Iterator it3 = cache.iterator();
- assertFalse("Cache is not empty", it1.hasNext());
+ assertFalse("Cache is not empty", it3.hasNext());
}
Modified:
ant/core/trunk/src/tests/junit/org/apache/tools/ant/types/selectors/PresentSelectorTest.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/tests/junit/org/apache/tools/ant/types/selectors/PresentSelectorTest.java?rev=1037691&r1=1037690&r2=1037691&view=diff
==============================================================================
---
ant/core/trunk/src/tests/junit/org/apache/tools/ant/types/selectors/PresentSelectorTest.java
(original)
+++
ant/core/trunk/src/tests/junit/org/apache/tools/ant/types/selectors/PresentSelectorTest.java
Mon Nov 22 12:27:03 2010
@@ -19,7 +19,6 @@
package org.apache.tools.ant.types.selectors;
import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Project;
import org.apache.tools.ant.types.Mapper;
import java.io.File;
@@ -31,8 +30,6 @@ import java.io.File;
*/
public class PresentSelectorTest extends BaseSelectorTest {
- private Project project;
-
public PresentSelectorTest(String name) {
super(name);
}
Modified:
ant/core/trunk/src/tests/junit/org/apache/tools/ant/types/selectors/SizeSelectorTest.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/tests/junit/org/apache/tools/ant/types/selectors/SizeSelectorTest.java?rev=1037691&r1=1037690&r2=1037691&view=diff
==============================================================================
---
ant/core/trunk/src/tests/junit/org/apache/tools/ant/types/selectors/SizeSelectorTest.java
(original)
+++
ant/core/trunk/src/tests/junit/org/apache/tools/ant/types/selectors/SizeSelectorTest.java
Mon Nov 22 12:27:03 2010
@@ -20,7 +20,6 @@ package org.apache.tools.ant.types.selec
import java.util.Locale;
import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Project;
import org.apache.tools.ant.types.Parameter;
/**
@@ -29,8 +28,6 @@ import org.apache.tools.ant.types.Parame
*/
public class SizeSelectorTest extends BaseSelectorTest {
- private Project project;
-
public SizeSelectorTest(String name) {
super(name);
}
Modified:
ant/core/trunk/src/tests/junit/org/apache/tools/ant/util/LineOrientedOutputStreamTest.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/tests/junit/org/apache/tools/ant/util/LineOrientedOutputStreamTest.java?rev=1037691&r1=1037690&r2=1037691&view=diff
==============================================================================
---
ant/core/trunk/src/tests/junit/org/apache/tools/ant/util/LineOrientedOutputStreamTest.java
(original)
+++
ant/core/trunk/src/tests/junit/org/apache/tools/ant/util/LineOrientedOutputStreamTest.java
Mon Nov 22 12:27:03 2010
@@ -125,15 +125,13 @@ public class LineOrientedOutputStreamTes
private class DummyStream extends LineOrientedOutputStream {
private boolean invoked;
protected void processLine(String line) {
- LineOrientedOutputStreamTest.this.assertFalse("Only one line",
- invoked);
- LineOrientedOutputStreamTest.this.assertEquals(LINE, line);
+ assertFalse("Only one line", invoked);
+ assertEquals(LINE, line);
invoked = true;
}
private void assertInvoked() {
- LineOrientedOutputStreamTest.this.assertTrue("At least one line",
- invoked);
+ assertTrue("At least one line", invoked);
}
}
}// LineOrientedOutputStreamTest
Modified:
ant/core/trunk/src/tests/junit/org/apache/tools/zip/ExtraFieldUtilsTest.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/tests/junit/org/apache/tools/zip/ExtraFieldUtilsTest.java?rev=1037691&r1=1037690&r2=1037691&view=diff
==============================================================================
---
ant/core/trunk/src/tests/junit/org/apache/tools/zip/ExtraFieldUtilsTest.java
(original)
+++
ant/core/trunk/src/tests/junit/org/apache/tools/zip/ExtraFieldUtilsTest.java
Mon Nov 22 12:27:03 2010
@@ -18,7 +18,6 @@
package org.apache.tools.zip;
-import java.util.Arrays;
import junit.framework.TestCase;
/**
@@ -108,7 +107,6 @@ public class ExtraFieldUtilsTest extends
assertTrue("type field 2", ze[1] instanceof UnparseableExtraFieldData);
assertEquals("data length field 2", 4,
ze[1].getLocalFileDataLength().getValue());
- byte[] expectedData = new byte[4];
for (int i = 0; i < 4; i++) {
assertEquals("byte number " + i,
data2[data.length - 5 + i],
Modified:
ant/core/trunk/src/tests/junit/org/apache/tools/zip/UTF8ZipFilesTest.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/tests/junit/org/apache/tools/zip/UTF8ZipFilesTest.java?rev=1037691&r1=1037690&r2=1037691&view=diff
==============================================================================
--- ant/core/trunk/src/tests/junit/org/apache/tools/zip/UTF8ZipFilesTest.java
(original)
+++ ant/core/trunk/src/tests/junit/org/apache/tools/zip/UTF8ZipFilesTest.java
Mon Nov 22 12:27:03 2010
@@ -21,9 +21,6 @@ package org.apache.tools.zip;
import java.io.File;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.URL;
import java.nio.ByteBuffer;
import java.util.Enumeration;
import java.util.zip.CRC32;
