From a28f64f5cf1b63d9342683d77d79a5cdf9e67f85 Mon Sep 17 00:00:00 2001 From: Stefan Bodewig Date: Mon, 22 Nov 2010 12:27:03 +0000 Subject: [PATCH] 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. git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@1037691 13f79535-47bb-0310-9956-ffa450edef68 --- src/main/org/apache/tools/ant/ComponentHelper.java | 5 ----- src/main/org/apache/tools/ant/Diagnostics.java | 1 - src/main/org/apache/tools/ant/DirectoryScanner.java | 1 - src/main/org/apache/tools/ant/Task.java | 2 +- .../org/apache/tools/ant/helper/ProjectHelperImpl.java | 2 +- .../org/apache/tools/ant/input/GreedyInputHandler.java | 2 -- src/main/org/apache/tools/ant/taskdefs/Checksum.java | 4 ++-- src/main/org/apache/tools/ant/taskdefs/Delete.java | 1 - src/main/org/apache/tools/ant/taskdefs/Get.java | 2 -- .../org/apache/tools/ant/taskdefs/ManifestClassPath.java | 1 - src/main/org/apache/tools/ant/taskdefs/Parallel.java | 1 - src/main/org/apache/tools/ant/taskdefs/Property.java | 2 +- src/main/org/apache/tools/ant/taskdefs/Replace.java | 1 - src/main/org/apache/tools/ant/taskdefs/VerifyJar.java | 1 - .../org/apache/tools/ant/taskdefs/email/Message.java | 1 - .../tools/ant/taskdefs/optional/ReplaceRegExp.java | 1 - .../apache/tools/ant/taskdefs/optional/net/FTPTask.java | 2 -- .../tools/ant/taskdefs/optional/ssh/ScpFromMessage.java | 1 - src/main/org/apache/tools/ant/types/ZipScanner.java | 1 - src/main/org/apache/tools/ant/util/FileUtils.java | 1 - src/main/org/apache/tools/ant/util/FirstMatchMapper.java | 3 --- .../tools/ant/util/LayoutPreservingProperties.java | 1 - .../org/apache/tools/ant/util/SymbolicLinkUtils.java | 1 - .../tools/ant/util/optional/JavaxScriptRunner.java | 1 - src/main/org/apache/tools/bzip2/CBZip2InputStream.java | 1 - src/main/org/apache/tools/zip/ZipEncodingHelper.java | 1 - src/main/org/apache/tools/zip/ZipEntry.java | 1 - src/main/org/apache/tools/zip/ZipLong.java | 1 - .../apache/tools/ant/AntClassLoaderDelegationTest.java | 1 - .../junit/org/apache/tools/ant/DirectoryScannerTest.java | 1 - .../junit/org/apache/tools/ant/taskdefs/AntTest.java | 1 - .../junit/org/apache/tools/ant/taskdefs/BZip2Test.java | 4 ---- .../junit/org/apache/tools/ant/taskdefs/JavaTest.java | 1 - .../junit/org/apache/tools/ant/taskdefs/MakeUrlTest.java | 1 - .../junit/org/apache/tools/ant/taskdefs/StyleTest.java | 1 - .../apache/tools/ant/taskdefs/condition/HttpTest.java | 2 -- .../tools/ant/taskdefs/optional/EchoPropertiesTest.java | 1 - .../ant/taskdefs/optional/splash/SplashScreenTest.java | 4 ++-- .../tools/ant/taskdefs/optional/vss/MSVSSTest.java | 2 -- .../tools/ant/types/selectors/DateSelectorTest.java | 9 --------- .../tools/ant/types/selectors/DependSelectorTest.java | 3 --- .../tools/ant/types/selectors/DepthSelectorTest.java | 3 --- .../tools/ant/types/selectors/FilenameSelectorTest.java | 3 --- .../tools/ant/types/selectors/ModifiedSelectorTest.java | 5 +---- .../tools/ant/types/selectors/PresentSelectorTest.java | 3 --- .../tools/ant/types/selectors/SizeSelectorTest.java | 3 --- .../tools/ant/util/LineOrientedOutputStreamTest.java | 8 +++----- .../junit/org/apache/tools/zip/ExtraFieldUtilsTest.java | 2 -- .../junit/org/apache/tools/zip/UTF8ZipFilesTest.java | 3 --- 49 files changed, 11 insertions(+), 93 deletions(-) diff --git a/src/main/org/apache/tools/ant/ComponentHelper.java b/src/main/org/apache/tools/ant/ComponentHelper.java index 848eac95f..368a3b125 100644 --- a/src/main/org/apache/tools/ant/ComponentHelper.java +++ b/src/main/org/apache/tools/ant/ComponentHelper.java @@ -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); diff --git a/src/main/org/apache/tools/ant/Diagnostics.java b/src/main/org/apache/tools/ant/Diagnostics.java index 5c1be28e4..ce411a69a 100644 --- a/src/main/org/apache/tools/ant/Diagnostics.java +++ b/src/main/org/apache/tools/ant/Diagnostics.java @@ -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; diff --git a/src/main/org/apache/tools/ant/DirectoryScanner.java b/src/main/org/apache/tools/ant/DirectoryScanner.java index 5aff52b7c..cb98f35c3 100644 --- a/src/main/org/apache/tools/ant/DirectoryScanner.java +++ b/src/main/org/apache/tools/ant/DirectoryScanner.java @@ -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; diff --git a/src/main/org/apache/tools/ant/Task.java b/src/main/org/apache/tools/ant/Task.java index c8254da35..0a203cf34 100644 --- a/src/main/org/apache/tools/ant/Task.java +++ b/src/main/org/apache/tools/ant/Task.java @@ -408,7 +408,7 @@ public abstract class Task extends ProjectComponent { replacement.setProject(getProject()); replacement.setTaskType(taskType); replacement.setTaskName(taskName); - replacement.setLocation(location); + replacement.setLocation(getLocation()); replacement.setOwningTarget(target); replacement.setRuntimeConfigurableWrapper(wrapper); wrapper.setProxy(replacement); diff --git a/src/main/org/apache/tools/ant/helper/ProjectHelperImpl.java b/src/main/org/apache/tools/ant/helper/ProjectHelperImpl.java index c60f566df..9f122b934 100644 --- a/src/main/org/apache/tools/ant/helper/ProjectHelperImpl.java +++ b/src/main/org/apache/tools/ant/helper/ProjectHelperImpl.java @@ -403,7 +403,7 @@ public class ProjectHelperImpl extends ProjectHelper { } if (def != null && !def.equals("")) { - helperImpl.project.setDefaultTarget(def); + helperImpl.project.setDefault(def); } else { throw new BuildException("The default attribute is required"); } diff --git a/src/main/org/apache/tools/ant/input/GreedyInputHandler.java b/src/main/org/apache/tools/ant/input/GreedyInputHandler.java index e4b0ed3f2..c0e24c0ff 100644 --- a/src/main/org/apache/tools/ant/input/GreedyInputHandler.java +++ b/src/main/org/apache/tools/ant/input/GreedyInputHandler.java @@ -31,8 +31,6 @@ import org.apache.tools.ant.util.FileUtils; */ public class GreedyInputHandler extends DefaultInputHandler { - private static final int BUFFER_SIZE = 1024; - /** * Empty no-arg constructor */ diff --git a/src/main/org/apache/tools/ant/taskdefs/Checksum.java b/src/main/org/apache/tools/ant/taskdefs/Checksum.java index 523005a9c..34ebc3d4a 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Checksum.java +++ b/src/main/org/apache/tools/ant/taskdefs/Checksum.java @@ -532,11 +532,11 @@ public class Checksum extends MatchingTask implements Condition { fos.write(format.format(new Object[] { checksum, src.getName(), - FILE_UTILS + FileUtils .getRelativePath(dest .getParentFile(), src), - FILE_UTILS + FileUtils .getRelativePath(getProject() .getBaseDir(), src), diff --git a/src/main/org/apache/tools/ant/taskdefs/Delete.java b/src/main/org/apache/tools/ant/taskdefs/Delete.java index 77baac56a..dbb690c68 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Delete.java +++ b/src/main/org/apache/tools/ant/taskdefs/Delete.java @@ -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; diff --git a/src/main/org/apache/tools/ant/taskdefs/Get.java b/src/main/org/apache/tools/ant/taskdefs/Get.java index 586a22239..5e5213427 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Get.java +++ b/src/main/org/apache/tools/ant/taskdefs/Get.java @@ -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; diff --git a/src/main/org/apache/tools/ant/taskdefs/ManifestClassPath.java b/src/main/org/apache/tools/ant/taskdefs/ManifestClassPath.java index 0897993c1..badd749c2 100644 --- a/src/main/org/apache/tools/ant/taskdefs/ManifestClassPath.java +++ b/src/main/org/apache/tools/ant/taskdefs/ManifestClassPath.java @@ -78,7 +78,6 @@ public class ManifestClassPath extends Task { 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]); diff --git a/src/main/org/apache/tools/ant/taskdefs/Parallel.java b/src/main/org/apache/tools/ant/taskdefs/Parallel.java index a1ffd6a2e..9641a940d 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Parallel.java +++ b/src/main/org/apache/tools/ant/taskdefs/Parallel.java @@ -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; diff --git a/src/main/org/apache/tools/ant/taskdefs/Property.java b/src/main/org/apache/tools/ant/taskdefs/Property.java index 67dada022..d7494c3a1 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Property.java +++ b/src/main/org/apache/tools/ant/taskdefs/Property.java @@ -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) { diff --git a/src/main/org/apache/tools/ant/taskdefs/Replace.java b/src/main/org/apache/tools/ant/taskdefs/Replace.java index 6c5c0fdb4..fac1b4018 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Replace.java +++ b/src/main/org/apache/tools/ant/taskdefs/Replace.java @@ -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; diff --git a/src/main/org/apache/tools/ant/taskdefs/VerifyJar.java b/src/main/org/apache/tools/ant/taskdefs/VerifyJar.java index c4f9cb87d..5fd818d77 100644 --- a/src/main/org/apache/tools/ant/taskdefs/VerifyJar.java +++ b/src/main/org/apache/tools/ant/taskdefs/VerifyJar.java @@ -26,7 +26,6 @@ import org.apache.tools.ant.types.FilterChain; 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; diff --git a/src/main/org/apache/tools/ant/taskdefs/email/Message.java b/src/main/org/apache/tools/ant/taskdefs/email/Message.java index 026d29d0b..29813dd07 100644 --- a/src/main/org/apache/tools/ant/taskdefs/email/Message.java +++ b/src/main/org/apache/tools/ant/taskdefs/email/Message.java @@ -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. diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ReplaceRegExp.java b/src/main/org/apache/tools/ant/taskdefs/optional/ReplaceRegExp.java index fed565d94..afb2f79cc 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ReplaceRegExp.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ReplaceRegExp.java @@ -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; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/net/FTPTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/net/FTPTask.java index eedbb2ac3..79780c78c 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/net/FTPTask.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/net/FTPTask.java @@ -19,8 +19,6 @@ package org.apache.tools.ant.taskdefs.optional.net; 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; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpFromMessage.java b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpFromMessage.java index f0fafeda5..969ef9f0b 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpFromMessage.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpFromMessage.java @@ -282,7 +282,6 @@ public class ScpFromMessage extends AbstractSshMessage { private void setLastModified(File localFile) throws JSchException { SftpATTRS fileAttributes = null; - String remotePath = null; ChannelSftp channel = openSftpChannel(); channel.connect(); try { diff --git a/src/main/org/apache/tools/ant/types/ZipScanner.java b/src/main/org/apache/tools/ant/types/ZipScanner.java index 453d51f39..eb0930b0f 100644 --- a/src/main/org/apache/tools/ant/types/ZipScanner.java +++ b/src/main/org/apache/tools/ant/types/ZipScanner.java @@ -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; diff --git a/src/main/org/apache/tools/ant/util/FileUtils.java b/src/main/org/apache/tools/ant/util/FileUtils.java index 073d98b62..9472a5bf9 100644 --- a/src/main/org/apache/tools/ant/util/FileUtils.java +++ b/src/main/org/apache/tools/ant/util/FileUtils.java @@ -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; diff --git a/src/main/org/apache/tools/ant/util/FirstMatchMapper.java b/src/main/org/apache/tools/ant/util/FirstMatchMapper.java index 85a2e7571..b0e47f296 100644 --- a/src/main/org/apache/tools/ant/util/FirstMatchMapper.java +++ b/src/main/org/apache/tools/ant/util/FirstMatchMapper.java @@ -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 ContainerMapper that returns the results of its diff --git a/src/main/org/apache/tools/ant/util/LayoutPreservingProperties.java b/src/main/org/apache/tools/ant/util/LayoutPreservingProperties.java index ed7385a18..26dd1631e 100644 --- a/src/main/org/apache/tools/ant/util/LayoutPreservingProperties.java +++ b/src/main/org/apache/tools/ant/util/LayoutPreservingProperties.java @@ -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; diff --git a/src/main/org/apache/tools/ant/util/SymbolicLinkUtils.java b/src/main/org/apache/tools/ant/util/SymbolicLinkUtils.java index 83fc0ee79..bac58c46a 100644 --- a/src/main/org/apache/tools/ant/util/SymbolicLinkUtils.java +++ b/src/main/org/apache/tools/ant/util/SymbolicLinkUtils.java @@ -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; diff --git a/src/main/org/apache/tools/ant/util/optional/JavaxScriptRunner.java b/src/main/org/apache/tools/ant/util/optional/JavaxScriptRunner.java index e89aca7d3..82377ccf4 100644 --- a/src/main/org/apache/tools/ant/util/optional/JavaxScriptRunner.java +++ b/src/main/org/apache/tools/ant/util/optional/JavaxScriptRunner.java @@ -22,7 +22,6 @@ import org.apache.tools.ant.BuildException; 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; /** diff --git a/src/main/org/apache/tools/bzip2/CBZip2InputStream.java b/src/main/org/apache/tools/bzip2/CBZip2InputStream.java index 14cfd0337..d977b4a60 100644 --- a/src/main/org/apache/tools/bzip2/CBZip2InputStream.java +++ b/src/main/org/apache/tools/bzip2/CBZip2InputStream.java @@ -23,7 +23,6 @@ */ package org.apache.tools.bzip2; -import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; diff --git a/src/main/org/apache/tools/zip/ZipEncodingHelper.java b/src/main/org/apache/tools/zip/ZipEncodingHelper.java index bf6020456..451de70a1 100644 --- a/src/main/org/apache/tools/zip/ZipEncodingHelper.java +++ b/src/main/org/apache/tools/zip/ZipEncodingHelper.java @@ -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; /** diff --git a/src/main/org/apache/tools/zip/ZipEntry.java b/src/main/org/apache/tools/zip/ZipEntry.java index bd6fb1e59..33dbcaa2e 100644 --- a/src/main/org/apache/tools/zip/ZipEntry.java +++ b/src/main/org/apache/tools/zip/ZipEntry.java @@ -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; diff --git a/src/main/org/apache/tools/zip/ZipLong.java b/src/main/org/apache/tools/zip/ZipLong.java index 4b48656bb..324d0f2ee 100644 --- a/src/main/org/apache/tools/zip/ZipLong.java +++ b/src/main/org/apache/tools/zip/ZipLong.java @@ -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; diff --git a/src/tests/junit/org/apache/tools/ant/AntClassLoaderDelegationTest.java b/src/tests/junit/org/apache/tools/ant/AntClassLoaderDelegationTest.java index 6d483ecf3..9839ed0d3 100644 --- a/src/tests/junit/org/apache/tools/ant/AntClassLoaderDelegationTest.java +++ b/src/tests/junit/org/apache/tools/ant/AntClassLoaderDelegationTest.java @@ -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; diff --git a/src/tests/junit/org/apache/tools/ant/DirectoryScannerTest.java b/src/tests/junit/org/apache/tools/ant/DirectoryScannerTest.java index 112a03553..e52261aab 100644 --- a/src/tests/junit/org/apache/tools/ant/DirectoryScannerTest.java +++ b/src/tests/junit/org/apache/tools/ant/DirectoryScannerTest.java @@ -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; diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/AntTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/AntTest.java index cab40e8b8..36581d768 100644 --- a/src/tests/junit/org/apache/tools/ant/taskdefs/AntTest.java +++ b/src/tests/junit/org/apache/tools/ant/taskdefs/AntTest.java @@ -101,7 +101,6 @@ public class AntTest extends BuildFileTest { public void testDoNotInheritBasedir() { File dir1 = getProjectDir(); File dir2 = project.resolveFile("ant"); - String basedir = getProjectDir().getAbsolutePath(); testBaseDirs("doNotInheritBasedir", new String[] {dir1.getAbsolutePath(), dir2.getAbsolutePath() diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/BZip2Test.java b/src/tests/junit/org/apache/tools/ant/taskdefs/BZip2Test.java index d5f7de450..686e87886 100644 --- a/src/tests/junit/org/apache/tools/ant/taskdefs/BZip2Test.java +++ b/src/tests/junit/org/apache/tools/ant/taskdefs/BZip2Test.java @@ -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); } diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/JavaTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/JavaTest.java index fd8226d2c..bee211e6b 100644 --- a/src/tests/junit/org/apache/tools/ant/taskdefs/JavaTest.java +++ b/src/tests/junit/org/apache/tools/ant/taskdefs/JavaTest.java @@ -62,7 +62,6 @@ public class JavaTest extends BuildFileTest { //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; diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/MakeUrlTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/MakeUrlTest.java index 7f9885fe3..01c6115f4 100644 --- a/src/tests/junit/org/apache/tools/ant/taskdefs/MakeUrlTest.java +++ b/src/tests/junit/org/apache/tools/ant/taskdefs/MakeUrlTest.java @@ -85,7 +85,6 @@ public class MakeUrlTest extends BuildFileTest { public void testFileset() { executeTarget("testFileset"); assertPropertyContains("testFileset", ".xml "); - String result = getProperty("testFileset"); assertPropertyEndsWith("testFileset", ".xml"); } diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/StyleTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/StyleTest.java index 2c1778e69..faf12ffaf 100644 --- a/src/tests/junit/org/apache/tools/ant/taskdefs/StyleTest.java +++ b/src/tests/junit/org/apache/tools/ant/taskdefs/StyleTest.java @@ -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; diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/condition/HttpTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/condition/HttpTest.java index afa8bb3c2..af98b0840 100644 --- a/src/tests/junit/org/apache/tools/ant/taskdefs/condition/HttpTest.java +++ b/src/tests/junit/org/apache/tools/ant/taskdefs/condition/HttpTest.java @@ -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; /** diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/optional/EchoPropertiesTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/optional/EchoPropertiesTest.java index 8e51c6140..d62c8cc16 100644 --- a/src/tests/junit/org/apache/tools/ant/taskdefs/optional/EchoPropertiesTest.java +++ b/src/tests/junit/org/apache/tools/ant/taskdefs/optional/EchoPropertiesTest.java @@ -43,7 +43,6 @@ public class EchoPropertiesTest extends BuildFileTest { 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); diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/optional/splash/SplashScreenTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/optional/splash/SplashScreenTest.java index 81da89385..fb75301f4 100644 --- a/src/tests/junit/org/apache/tools/ant/taskdefs/optional/splash/SplashScreenTest.java +++ b/src/tests/junit/org/apache/tools/ant/taskdefs/optional/splash/SplashScreenTest.java @@ -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"); diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/optional/vss/MSVSSTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/optional/vss/MSVSSTest.java index 7891d0b94..cd6c2f9bd 100644 --- a/src/tests/junit/org/apache/tools/ant/taskdefs/optional/vss/MSVSSTest.java +++ b/src/tests/junit/org/apache/tools/ant/taskdefs/optional/vss/MSVSSTest.java @@ -38,13 +38,11 @@ public class MSVSSTest extends BuildFileTest implements MSVSSConstants { 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"; diff --git a/src/tests/junit/org/apache/tools/ant/types/selectors/DateSelectorTest.java b/src/tests/junit/org/apache/tools/ant/types/selectors/DateSelectorTest.java index 2126d4334..38e069107 100644 --- a/src/tests/junit/org/apache/tools/ant/types/selectors/DateSelectorTest.java +++ b/src/tests/junit/org/apache/tools/ant/types/selectors/DateSelectorTest.java @@ -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 BaseSelectorTest { 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); diff --git a/src/tests/junit/org/apache/tools/ant/types/selectors/DependSelectorTest.java b/src/tests/junit/org/apache/tools/ant/types/selectors/DependSelectorTest.java index 6dc9e8950..82e7547b3 100644 --- a/src/tests/junit/org/apache/tools/ant/types/selectors/DependSelectorTest.java +++ b/src/tests/junit/org/apache/tools/ant/types/selectors/DependSelectorTest.java @@ -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); } diff --git a/src/tests/junit/org/apache/tools/ant/types/selectors/DepthSelectorTest.java b/src/tests/junit/org/apache/tools/ant/types/selectors/DepthSelectorTest.java index 64c260fe9..e180f3c2a 100644 --- a/src/tests/junit/org/apache/tools/ant/types/selectors/DepthSelectorTest.java +++ b/src/tests/junit/org/apache/tools/ant/types/selectors/DepthSelectorTest.java @@ -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.Parameter; */ public class DepthSelectorTest extends BaseSelectorTest { - private Project project; - public DepthSelectorTest(String name) { super(name); } diff --git a/src/tests/junit/org/apache/tools/ant/types/selectors/FilenameSelectorTest.java b/src/tests/junit/org/apache/tools/ant/types/selectors/FilenameSelectorTest.java index 11836a22e..8046ce689 100644 --- a/src/tests/junit/org/apache/tools/ant/types/selectors/FilenameSelectorTest.java +++ b/src/tests/junit/org/apache/tools/ant/types/selectors/FilenameSelectorTest.java @@ -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.Parameter; */ public class FilenameSelectorTest extends BaseSelectorTest { - private Project project; - public FilenameSelectorTest(String name) { super(name); } diff --git a/src/tests/junit/org/apache/tools/ant/types/selectors/ModifiedSelectorTest.java b/src/tests/junit/org/apache/tools/ant/types/selectors/ModifiedSelectorTest.java index e3265eccf..570b983af 100644 --- a/src/tests/junit/org/apache/tools/ant/types/selectors/ModifiedSelectorTest.java +++ b/src/tests/junit/org/apache/tools/ant/types/selectors/ModifiedSelectorTest.java @@ -55,9 +55,6 @@ public class ModifiedSelectorTest extends BaseSelectorTest { // ===================== 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 extends BaseSelectorTest { // clear the cache cache.delete(); Iterator it3 = cache.iterator(); - assertFalse("Cache is not empty", it1.hasNext()); + assertFalse("Cache is not empty", it3.hasNext()); } diff --git a/src/tests/junit/org/apache/tools/ant/types/selectors/PresentSelectorTest.java b/src/tests/junit/org/apache/tools/ant/types/selectors/PresentSelectorTest.java index 180faf3c1..1bb70864d 100644 --- a/src/tests/junit/org/apache/tools/ant/types/selectors/PresentSelectorTest.java +++ b/src/tests/junit/org/apache/tools/ant/types/selectors/PresentSelectorTest.java @@ -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); } diff --git a/src/tests/junit/org/apache/tools/ant/types/selectors/SizeSelectorTest.java b/src/tests/junit/org/apache/tools/ant/types/selectors/SizeSelectorTest.java index 9dbbb04ae..97e40b8df 100644 --- a/src/tests/junit/org/apache/tools/ant/types/selectors/SizeSelectorTest.java +++ b/src/tests/junit/org/apache/tools/ant/types/selectors/SizeSelectorTest.java @@ -20,7 +20,6 @@ package org.apache.tools.ant.types.selectors; 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.Parameter; */ public class SizeSelectorTest extends BaseSelectorTest { - private Project project; - public SizeSelectorTest(String name) { super(name); } diff --git a/src/tests/junit/org/apache/tools/ant/util/LineOrientedOutputStreamTest.java b/src/tests/junit/org/apache/tools/ant/util/LineOrientedOutputStreamTest.java index 7bcb4dcb1..2283acd7d 100644 --- a/src/tests/junit/org/apache/tools/ant/util/LineOrientedOutputStreamTest.java +++ b/src/tests/junit/org/apache/tools/ant/util/LineOrientedOutputStreamTest.java @@ -125,15 +125,13 @@ public class LineOrientedOutputStreamTest extends TestCase { 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 diff --git a/src/tests/junit/org/apache/tools/zip/ExtraFieldUtilsTest.java b/src/tests/junit/org/apache/tools/zip/ExtraFieldUtilsTest.java index 400efd266..51a77f1af 100644 --- a/src/tests/junit/org/apache/tools/zip/ExtraFieldUtilsTest.java +++ b/src/tests/junit/org/apache/tools/zip/ExtraFieldUtilsTest.java @@ -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 TestCase implements UnixStat { 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], diff --git a/src/tests/junit/org/apache/tools/zip/UTF8ZipFilesTest.java b/src/tests/junit/org/apache/tools/zip/UTF8ZipFilesTest.java index ddd4f1e9e..820c39f51 100644 --- a/src/tests/junit/org/apache/tools/zip/UTF8ZipFilesTest.java +++ b/src/tests/junit/org/apache/tools/zip/UTF8ZipFilesTest.java @@ -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;