From 1c9118e27e66b669d46e1600649b57cc87b5a97c Mon Sep 17 00:00:00 2001 From: Gintas Grigelionis Date: Mon, 2 Apr 2018 19:55:27 +0200 Subject: [PATCH] Generify --- .../tools/ant/taskdefs/compilers/Javac12.java | 2 +- .../ant/taskdefs/optional/TraXLiaison.java | 4 +-- .../taskdefs/optional/XMLValidateTask.java | 2 +- .../tools/ant/taskdefs/AntStructureTest.java | 7 ++-- .../apache/tools/ant/taskdefs/JarTest.java | 4 +-- .../tools/ant/taskdefs/ManifestTest.java | 20 +++++------ .../tools/ant/taskdefs/TypeAdapterTest.java | 2 +- .../tools/ant/taskdefs/XmlPropertyTest.java | 34 ++++++++----------- .../taskdefs/optional/depend/DependTest.java | 6 ++-- .../optional/junit/JUnitReportTest.java | 2 +- .../ant/taskdefs/optional/net/FTPTest.java | 4 +-- .../apache/tools/ant/types/FilterSetTest.java | 2 +- .../apache/tools/ant/types/MapperTest.java | 2 +- .../ant/types/selectors/MockComparator.java | 2 +- .../types/selectors/ModifiedSelectorTest.java | 8 ++--- .../tools/ant/util/ClasspathUtilsTest.java | 3 +- .../tools/ant/util/LinkedHashtableTest.java | 12 +++---- .../apache/tools/ant/util/VectorSetTest.java | 2 +- .../ant/util/regexp/RegexpMatcherTest.java | 4 +-- .../apache/tools/mail/MailMessageTest.java | 10 +++--- .../apache/tools/zip/UTF8ZipFilesTest.java | 4 +-- 21 files changed, 67 insertions(+), 69 deletions(-) diff --git a/src/main/org/apache/tools/ant/taskdefs/compilers/Javac12.java b/src/main/org/apache/tools/ant/taskdefs/compilers/Javac12.java index bc2984061..4c1a9a368 100644 --- a/src/main/org/apache/tools/ant/taskdefs/compilers/Javac12.java +++ b/src/main/org/apache/tools/ant/taskdefs/compilers/Javac12.java @@ -55,7 +55,7 @@ public class Javac12 extends DefaultCompilerAdapter { // Create an instance of the compiler, redirecting output to // the project log Class c = Class.forName(CLASSIC_COMPILER_CLASSNAME); - Constructor cons = c.getConstructor(OutputStream.class, String.class); + Constructor cons = c.getConstructor(OutputStream.class, String.class); Object compiler = cons.newInstance(logstr, "javac"); // Call the compile() method diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/TraXLiaison.java b/src/main/org/apache/tools/ant/taskdefs/optional/TraXLiaison.java index 6a4a0903d..4420f109f 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/TraXLiaison.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/TraXLiaison.java @@ -335,7 +335,7 @@ public class TraXLiaison implements XSLTLiaison4, ErrorListener, XSLTLoggerAware if ("org.apache.xalan.transformer.TransformerImpl" //NOSONAR .equals(transformer.getClass().getName())) { try { - final Class traceSupport = + final Class traceSupport = Class.forName("org.apache.tools.ant.taskdefs.optional." + "Xalan2TraceSupport", true, Thread.currentThread() @@ -389,7 +389,7 @@ public class TraXLiaison implements XSLTLiaison4, ErrorListener, XSLTLoggerAware tfactory = TransformerFactory.newInstance(); } else { try { - Class clazz = null; + Class clazz = null; try { clazz = Class.forName(factoryName, true, diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/XMLValidateTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/XMLValidateTask.java index 673bb6ec6..4865e4489 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/XMLValidateTask.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/XMLValidateTask.java @@ -382,7 +382,7 @@ public class XMLValidateTask extends Task { reader = createDefaultReaderOrParser(); } else { - Class readerClass = null; + Class readerClass = null; try { // load the parser class if (classpath != null) { diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/AntStructureTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/AntStructureTest.java index 406b44149..5c19bc44e 100644 --- a/src/tests/junit/org/apache/tools/ant/taskdefs/AntStructureTest.java +++ b/src/tests/junit/org/apache/tools/ant/taskdefs/AntStructureTest.java @@ -80,8 +80,9 @@ public class AntStructureTest { private int elementCalled = 0; private Project p; - public void printHead(PrintWriter out, Project p, Hashtable tasks, - Hashtable types) { + public void printHead(PrintWriter out, Project p, + Hashtable> tasks, + Hashtable> types) { assertTrue(!headCalled); assertTrue(!targetCalled); assertTrue(!tailCalled); @@ -96,7 +97,7 @@ public class AntStructureTest { targetCalled = true; } public void printElementDecl(PrintWriter out, Project p, String name, - Class element) { + Class element) { assertTrue(headCalled); assertTrue(targetCalled); assertTrue(!tailCalled); diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/JarTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/JarTest.java index 402979c27..3d29597b1 100644 --- a/src/tests/junit/org/apache/tools/ant/taskdefs/JarTest.java +++ b/src/tests/junit/org/apache/tools/ant/taskdefs/JarTest.java @@ -265,10 +265,10 @@ public class JarTest { try { buildRule.executeTarget("testIndexTests"); archive = new ZipFile(new File(getOutputDir(), tempJar)); - Enumeration e = archive.entries(); + Enumeration e = archive.entries(); int numberOfIndexLists = 0; while (e.hasMoreElements()) { - ZipEntry ze = (ZipEntry) e.nextElement(); + ZipEntry ze = e.nextElement(); if (ze.getName().equals("META-INF/INDEX.LIST")) { numberOfIndexLists++; } diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/ManifestTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/ManifestTest.java index 82760dba4..690d27e71 100644 --- a/src/tests/junit/org/apache/tools/ant/taskdefs/ManifestTest.java +++ b/src/tests/junit/org/apache/tools/ant/taskdefs/ManifestTest.java @@ -319,16 +319,16 @@ public class ManifestTest { buildRule.executeTarget("testOrder1"); Manifest manifest = getManifest(expandedManifest); - Enumeration e = manifest.getSectionNames(); - String section1 = (String) e.nextElement(); - String section2 = (String) e.nextElement(); + Enumeration e = manifest.getSectionNames(); + String section1 = e.nextElement(); + String section2 = e.nextElement(); assertEquals("First section name unexpected", "Test1", section1); assertEquals("Second section name unexpected", "Test2", section2); Manifest.Section section = manifest.getSection("Test1"); e = section.getAttributeKeys(); - String attr1Key = (String) e.nextElement(); - String attr2Key = (String) e.nextElement(); + String attr1Key = e.nextElement(); + String attr2Key = e.nextElement(); String attr1 = section.getAttribute(attr1Key).getName(); String attr2 = section.getAttribute(attr2Key).getName(); assertEquals("First attribute name unexpected", "TestAttr1", attr1); @@ -343,16 +343,16 @@ public class ManifestTest { buildRule.executeTarget("testOrder2"); Manifest manifest = getManifest(expandedManifest); - Enumeration e = manifest.getSectionNames(); - String section1 = (String) e.nextElement(); - String section2 = (String) e.nextElement(); + Enumeration e = manifest.getSectionNames(); + String section1 = e.nextElement(); + String section2 = e.nextElement(); assertEquals("First section name unexpected", "Test2", section1); assertEquals("Second section name unexpected", "Test1", section2); Manifest.Section section = manifest.getSection("Test1"); e = section.getAttributeKeys(); - String attr1Key = (String) e.nextElement(); - String attr2Key = (String) e.nextElement(); + String attr1Key = e.nextElement(); + String attr2Key = e.nextElement(); String attr1 = section.getAttribute(attr1Key).getName(); String attr2 = section.getAttribute(attr2Key).getName(); assertEquals("First attribute name unexpected", "TestAttr2", attr1); diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/TypeAdapterTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/TypeAdapterTest.java index 5ac9b2d3c..2751ea521 100644 --- a/src/tests/junit/org/apache/tools/ant/taskdefs/TypeAdapterTest.java +++ b/src/tests/junit/org/apache/tools/ant/taskdefs/TypeAdapterTest.java @@ -136,7 +136,7 @@ public class TypeAdapterTest { throw new BuildException(message); } } - public void checkProxyClass(Class proxyClass) { + public void checkProxyClass(Class proxyClass) { getExecuteMethod(proxyClass); } diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/XmlPropertyTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/XmlPropertyTest.java index 33b744343..a21411fc1 100644 --- a/src/tests/junit/org/apache/tools/ant/taskdefs/XmlPropertyTest.java +++ b/src/tests/junit/org/apache/tools/ant/taskdefs/XmlPropertyTest.java @@ -24,7 +24,9 @@ import java.io.FileInputStream; import java.io.IOException; import java.util.Enumeration; import java.util.Hashtable; +import java.util.Map; import java.util.Properties; +import java.util.Set; import java.util.Vector; import org.apache.tools.ant.BuildFileRule; @@ -145,10 +147,10 @@ public class XmlPropertyTest { */ private void doTest(String msg, boolean keepRoot, boolean collapse, boolean semantic, boolean include, boolean localRoot) throws IOException { - Enumeration iter = + Enumeration iter = getFiles(new File(System.getProperty("root"), "src/etc/testcases/taskdefs/xmlproperty/inputs")); while (iter.hasMoreElements()) { - File inputFile = (File) iter.nextElement(); + File inputFile = iter.nextElement(); // What's the working directory? If local, then its the // folder of the input file. Otherwise, its the "current" dir.. File workingDir; @@ -209,11 +211,9 @@ public class XmlPropertyTest { private static void ensureProperties(String msg, File inputFile, File workingDir, Project p, Properties properties) { - Hashtable xmlproperties = p.getProperties(); + Hashtable xmlproperties = p.getProperties(); // Every key identified by the Properties must have been loaded. - Enumeration propertyKeyEnum = properties.propertyNames(); - while (propertyKeyEnum.hasMoreElements()) { - String currentKey = propertyKeyEnum.nextElement().toString(); + for (String currentKey : properties.stringPropertyNames()) { String assertMsg = msg + "-" + inputFile.getName() + " Key=" + currentKey; @@ -266,24 +266,20 @@ public class XmlPropertyTest { /** * Debugging method to print the properties in the given hashtable */ - private static void printProperties(Hashtable xmlproperties) { - Enumeration keyEnum = xmlproperties.keys(); - while (keyEnum.hasMoreElements()) { - String currentKey = keyEnum.nextElement().toString(); - System.out.println(currentKey + " = " - + xmlproperties.get(currentKey)); + private static void printProperties(Hashtable xmlproperties) { + for (Map.Entry entry : xmlproperties.entrySet()) { + System.out.println(entry.getKey() + " = " + entry.getValue()); } } /** * Ensure all references loaded by the project are valid. */ - private static void ensureReferences (String msg, File inputFile, - Hashtable references) { - Enumeration referenceKeyEnum = references.keys(); - while(referenceKeyEnum.hasMoreElements()){ - String currentKey = referenceKeyEnum.nextElement().toString(); - Object currentValue = references.get(currentKey); + private static void ensureReferences(String msg, File inputFile, + Hashtable references) { + for (Map.Entry entry : references.entrySet()) { + String currentKey = entry.getKey(); + Object currentValue = entry.getValue(); if (!(currentValue instanceof Path) && !(currentValue instanceof String) && !currentKey.startsWith("ant.")) { @@ -337,7 +333,7 @@ public class XmlPropertyTest { * Retrieve a list of xml files in the specified folder * and below. */ - private static Enumeration getFiles (final File startingDir) { + private static Enumeration getFiles (final File startingDir) { Vector result = new Vector<>(); getFiles(startingDir, result); return result.elements(); diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/optional/depend/DependTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/optional/depend/DependTest.java index 7b5f5a86c..d2fce93c5 100644 --- a/src/tests/junit/org/apache/tools/ant/taskdefs/optional/depend/DependTest.java +++ b/src/tests/junit/org/apache/tools/ant/taskdefs/optional/depend/DependTest.java @@ -65,7 +65,7 @@ public class DependTest { FileUtilities.rollbackTimestamps(new File(buildRule.getProject().getProperty("classes.dir")), 5); buildRule.executeTarget("testdirect"); - Hashtable files = getResultFiles(); + Hashtable files = getResultFiles(); assertEquals("Depend did not leave correct number of files", 3, files.size()); assertTrue("Result did not contain A.class", @@ -86,7 +86,7 @@ public class DependTest { FileUtilities.rollbackTimestamps(new File(buildRule.getProject().getProperty("classes.dir")), 5); buildRule.executeTarget("testclosure"); - Hashtable files = getResultFiles(); + Hashtable files = getResultFiles(); assertTrue("Depend did not leave correct number of files", files.size() <= 2); assertTrue("Result did not contain D.class", @@ -159,7 +159,7 @@ public class DependTest { * @return a Hashtable containing the names of the files in the result * fileset */ - private Hashtable getResultFiles() { + private Hashtable getResultFiles() { FileSet resultFileSet = buildRule.getProject().getReference(RESULT_FILESET); DirectoryScanner scanner = resultFileSet.getDirectoryScanner(buildRule.getProject()); Hashtable files = new Hashtable<>(); diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/optional/junit/JUnitReportTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/optional/junit/JUnitReportTest.java index 1f30e35a7..c9fcde46f 100644 --- a/src/tests/junit/org/apache/tools/ant/taskdefs/optional/junit/JUnitReportTest.java +++ b/src/tests/junit/org/apache/tools/ant/taskdefs/optional/junit/JUnitReportTest.java @@ -92,7 +92,7 @@ public class JUnitReportTest { try { assertTrue("This shouldn't be an empty stream.", reportStream.available() > 0); } finally { - FileUtils.getFileUtils().close(reportStream); + FileUtils.close(reportStream); } } diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/optional/net/FTPTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/optional/net/FTPTest.java index 1afd5ce18..f6cd0831e 100644 --- a/src/tests/junit/org/apache/tools/ant/taskdefs/optional/net/FTPTest.java +++ b/src/tests/junit/org/apache/tools/ant/taskdefs/optional/net/FTPTest.java @@ -478,7 +478,7 @@ public class FTPTest { * to parse the log output. */ private class CountLogListener extends DefaultLogger { - private Vector lastMatchGroups = null; + private Vector lastMatchGroups = null; private RegexpMatcher matcher = new RegexpMatcherFactory().newRegexpMatcher(); /** @@ -514,7 +514,7 @@ public class FTPTest { if (this.lastMatchGroups == null) { return -1; } - return Integer.parseInt((String) this.lastMatchGroups.get(1)); + return Integer.parseInt(this.lastMatchGroups.get(1)); } } diff --git a/src/tests/junit/org/apache/tools/ant/types/FilterSetTest.java b/src/tests/junit/org/apache/tools/ant/types/FilterSetTest.java index 6fed14234..92010bbf8 100644 --- a/src/tests/junit/org/apache/tools/ant/types/FilterSetTest.java +++ b/src/tests/junit/org/apache/tools/ant/types/FilterSetTest.java @@ -153,7 +153,7 @@ public class FilterSetTest { buildRule.executeTarget("test-nested-filtersets"); FilterSet fs = buildRule.getProject().getReference("1"); - Hashtable filters = fs.getFilterHash(); + Hashtable filters = fs.getFilterHash(); assertEquals(1, filters.size()); assertEquals("value1", filters.get("token1")); diff --git a/src/tests/junit/org/apache/tools/ant/types/MapperTest.java b/src/tests/junit/org/apache/tools/ant/types/MapperTest.java index 77c181107..37433eaf3 100644 --- a/src/tests/junit/org/apache/tools/ant/types/MapperTest.java +++ b/src/tests/junit/org/apache/tools/ant/types/MapperTest.java @@ -175,7 +175,7 @@ public class MapperTest { String[] targets = fileNameMapper.mapFileName("fromfilename"); assertNotNull("no filenames mapped", targets); assertEquals("wrong number of filenames mapped", 3, targets.length); - List list = Arrays.asList(targets); + List list = Arrays.asList(targets); assertTrue("cannot find expected target \"tofilename\"", list.contains("tofilename")); assertTrue("cannot find expected target \"fromfilename\"", diff --git a/src/tests/junit/org/apache/tools/ant/types/selectors/MockComparator.java b/src/tests/junit/org/apache/tools/ant/types/selectors/MockComparator.java index 180aa46e5..97b69f289 100644 --- a/src/tests/junit/org/apache/tools/ant/types/selectors/MockComparator.java +++ b/src/tests/junit/org/apache/tools/ant/types/selectors/MockComparator.java @@ -20,7 +20,7 @@ package org.apache.tools.ant.types.selectors; import java.util.Comparator; -public class MockComparator implements Comparator { +public class MockComparator implements Comparator { public int compare(Object o1, Object o2) { return 0; 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 01c16e404..93dab59f7 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 @@ -408,7 +408,7 @@ public class ModifiedSelectorTest { String value2 = "value2"; // given cache must be empty - Iterator it1 = cache.iterator(); + Iterator it1 = cache.iterator(); assertFalse("Cache is not empty", it1.hasNext()); // cache must return a stored value @@ -418,8 +418,8 @@ public class ModifiedSelectorTest { assertEquals("cache returned wrong value", value2, cache.get(key2)); // test the iterator - Iterator it2 = cache.iterator(); - Object returned = it2.next(); + Iterator it2 = cache.iterator(); + String returned = it2.next(); boolean ok = (key1.equals(returned) || key2.equals(returned)); String msg = "Iterator returned unexpected value." + " key1.equals(returned)=" + key1.equals(returned) @@ -430,7 +430,7 @@ public class ModifiedSelectorTest { // clear the cache cache.delete(); - Iterator it3 = cache.iterator(); + Iterator it3 = cache.iterator(); assertFalse("Cache is not empty", it3.hasNext()); } diff --git a/src/tests/junit/org/apache/tools/ant/util/ClasspathUtilsTest.java b/src/tests/junit/org/apache/tools/ant/util/ClasspathUtilsTest.java index 916915638..c95bd55b7 100644 --- a/src/tests/junit/org/apache/tools/ant/util/ClasspathUtilsTest.java +++ b/src/tests/junit/org/apache/tools/ant/util/ClasspathUtilsTest.java @@ -19,6 +19,7 @@ package org.apache.tools.ant.util; import java.io.IOException; +import java.net.URL; import java.util.Enumeration; import org.apache.tools.ant.BuildException; @@ -46,7 +47,7 @@ public class ClasspathUtilsTest { @Test public void testOnlyOneInstance() { - Enumeration enumeration; + Enumeration enumeration; ClassLoader c = ClasspathUtils.getUniqueClassLoaderForPath(p, null, false); try { enumeration = c.getResources( diff --git a/src/tests/junit/org/apache/tools/ant/util/LinkedHashtableTest.java b/src/tests/junit/org/apache/tools/ant/util/LinkedHashtableTest.java index 6012a5a2d..bf7afab91 100644 --- a/src/tests/junit/org/apache/tools/ant/util/LinkedHashtableTest.java +++ b/src/tests/junit/org/apache/tools/ant/util/LinkedHashtableTest.java @@ -46,7 +46,7 @@ public class LinkedHashtableTest { public void testClone() { h.put(K1, V1); - Hashtable h2 = (Hashtable) h.clone(); + Hashtable h2 = (Hashtable) h.clone(); assertTrue(h2 instanceof LinkedHashtable); assertTrue(h2.containsKey(K1)); } @@ -130,13 +130,13 @@ public class LinkedHashtableTest { @Test public void testEntrySet() { multiSetup(); - Iterator i = h.entrySet().iterator(); + Iterator> i = h.entrySet().iterator(); assertTrue(i.hasNext()); - Map.Entry e = (Map.Entry) i.next(); + Map.Entry e = i.next(); assertSame(K1, e.getKey()); assertSame(V1, e.getValue()); assertTrue(i.hasNext()); - e = (Map.Entry) i.next(); + e = i.next(); assertSame(K2, e.getKey()); assertSame(V2, e.getValue()); assertFalse(i.hasNext()); @@ -147,7 +147,7 @@ public class LinkedHashtableTest { h.put(K2, V2); } - private static void assertKeys(Iterator i) { + private static void assertKeys(Iterator i) { assertTrue(i.hasNext()); assertSame(K1, i.next()); assertTrue(i.hasNext()); @@ -155,7 +155,7 @@ public class LinkedHashtableTest { assertFalse(i.hasNext()); } - private static void assertValues(Iterator i) { + private static void assertValues(Iterator i) { assertTrue(i.hasNext()); assertSame(V1, i.next()); assertTrue(i.hasNext()); diff --git a/src/tests/junit/org/apache/tools/ant/util/VectorSetTest.java b/src/tests/junit/org/apache/tools/ant/util/VectorSetTest.java index b8ce4cdeb..9c54ed2da 100644 --- a/src/tests/junit/org/apache/tools/ant/util/VectorSetTest.java +++ b/src/tests/junit/org/apache/tools/ant/util/VectorSetTest.java @@ -80,7 +80,7 @@ public class VectorSetTest { v.add(O); Object o = v.clone(); assertTrue(o instanceof VectorSet); - VectorSet vs = (VectorSet) o; + VectorSet vs = (VectorSet) o; assertEquals(1, vs.size()); assertTrue(vs.contains(O)); } diff --git a/src/tests/junit/org/apache/tools/ant/util/regexp/RegexpMatcherTest.java b/src/tests/junit/org/apache/tools/ant/util/regexp/RegexpMatcherTest.java index 7f4d15241..9feb67ce9 100644 --- a/src/tests/junit/org/apache/tools/ant/util/regexp/RegexpMatcherTest.java +++ b/src/tests/junit/org/apache/tools/ant/util/regexp/RegexpMatcherTest.java @@ -78,7 +78,7 @@ public abstract class RegexpMatcherTest { @Test public void testGroups() { reg.setPattern("aaaa"); - Vector v = reg.getGroups("xaaaa"); + Vector v = reg.getGroups("xaaaa"); assertEquals("No parens -> no extra groups", 1, v.size()); assertEquals("Trivial match with no parens", "aaaa", v.elementAt(0)); @@ -102,7 +102,7 @@ public abstract class RegexpMatcherTest { @Test public void testBugzillaReport14619() { reg.setPattern("^(.*)/src/((.*/)*)([a-zA-Z0-9_\\.]+)\\.java$"); - Vector v = reg.getGroups("de/tom/src/Google.java"); + Vector v = reg.getGroups("de/tom/src/Google.java"); assertEquals(5, v.size()); assertEquals("de/tom", v.elementAt(1)); assertEquals("", v.elementAt(2)); diff --git a/src/tests/junit/org/apache/tools/mail/MailMessageTest.java b/src/tests/junit/org/apache/tools/mail/MailMessageTest.java index b7aa0a7d3..56407ac89 100644 --- a/src/tests/junit/org/apache/tools/mail/MailMessageTest.java +++ b/src/tests/junit/org/apache/tools/mail/MailMessageTest.java @@ -603,26 +603,26 @@ public class MailMessageTest { try { msg.from(from); - Enumeration e; + Enumeration e; e = replyToList.elements(); while (e.hasMoreElements()) { - msg.replyto(e.nextElement().toString()); + msg.replyto(e.nextElement()); } e = toList.elements(); while (e.hasMoreElements()) { - msg.to(e.nextElement().toString()); + msg.to(e.nextElement()); } e = ccList.elements(); while (e.hasMoreElements()) { - msg.cc(e.nextElement().toString()); + msg.cc(e.nextElement()); } e = bccList.elements(); while (e.hasMoreElements()) { - msg.bcc(e.nextElement().toString()); + msg.bcc(e.nextElement()); } if (subject != null) { diff --git a/src/tests/junit/org/apache/tools/zip/UTF8ZipFilesTest.java b/src/tests/junit/org/apache/tools/zip/UTF8ZipFilesTest.java index 6f21ca8e9..f2a875a82 100644 --- a/src/tests/junit/org/apache/tools/zip/UTF8ZipFilesTest.java +++ b/src/tests/junit/org/apache/tools/zip/UTF8ZipFilesTest.java @@ -200,9 +200,9 @@ public class UTF8ZipFilesTest { try { zf = new ZipFile(file, encoding, false); - Enumeration e = zf.getEntries(); + Enumeration e = zf.getEntries(); while (e.hasMoreElements()) { - ZipEntry ze = (ZipEntry) e.nextElement(); + ZipEntry ze = e.nextElement(); if (ze.getName().endsWith("sser.txt")) { assertUnicodeName(ze, OIL_BARREL_TXT, encoding);