Fix Eclipse warnings

git-svn-id: https://svn.apache.org/repos/asf/jakarta/bcel/trunk@947869 13f79535-47bb-0310-9956-ffa450edef68

10 files changed, 23 insertions, 23 deletions

diff --git a/src/test/java/org/apache/bcel/AbstractCounterVisitorTestCase.java b/src/test/java/org/apache/bcel/AbstractCounterVisitorTestCase.java
index 9f615e18..1ceaa5ef 100644
--- a/src/test/java/org/apache/bcel/AbstractCounterVisitorTestCase.java
+++ b/src/test/java/org/apache/bcel/AbstractCounterVisitorTestCase.java
@@ -28,7 +28,8 @@ public abstract class AbstractCounterVisitorTestCase extends AbstractTestCase
 
 	private CounterVisitor visitor = null;
 
-	public void setUp() throws ClassNotFoundException
+	@Override
+    public void setUp() throws ClassNotFoundException
 	{
 		visitor = new CounterVisitor();
 		new DescendingVisitor(getTestClass(), getVisitor()).visit();
diff --git a/src/test/java/org/apache/bcel/AbstractTestCase.java b/src/test/java/org/apache/bcel/AbstractTestCase.java
index 0e27b8f8..c61e1f71 100644
--- a/src/test/java/org/apache/bcel/AbstractTestCase.java
+++ b/src/test/java/org/apache/bcel/AbstractTestCase.java
@@ -93,7 +93,7 @@ public abstract class AbstractTestCase extends TestCase
 	protected Attribute[] findAttribute(String name, JavaClass clazz)
 	{
 		Attribute[] all = clazz.getAttributes();
-		List chosenAttrsList = new ArrayList();
+		List<Attribute> chosenAttrsList = new ArrayList<Attribute>();
 		for (int i = 0; i < all.length; i++)
 		{
 			if (verbose)
@@ -101,12 +101,12 @@ public abstract class AbstractTestCase extends TestCase
 			if (all[i].getName().equals(name))
 				chosenAttrsList.add(all[i]);
 		}
-		return (Attribute[]) chosenAttrsList.toArray(new Attribute[] {});
+		return chosenAttrsList.toArray(new Attribute[] {});
 	}
 
 	protected Attribute findAttribute(String name, Attribute[] all)
 	{
-		List chosenAttrsList = new ArrayList();
+		List<Attribute> chosenAttrsList = new ArrayList<Attribute>();
 		for (int i = 0; i < all.length; i++)
 		{
 			if (verbose)
@@ -116,7 +116,7 @@ public abstract class AbstractTestCase extends TestCase
 		}
 		assertTrue("Should be one match: " + chosenAttrsList.size(),
 				chosenAttrsList.size() == 1);
-		return (Attribute) chosenAttrsList.get(0);
+		return chosenAttrsList.get(0);
 	}
 
 	protected String dumpAttributes(Attribute[] as)
@@ -171,7 +171,7 @@ public abstract class AbstractTestCase extends TestCase
 				ElementValueGen.STRING, cp, aFruit);
 		ElementValuePairGen nvGen = new ElementValuePairGen("fruit", evg, cp);
 		ObjectType t = new ObjectType("SimpleStringAnnotation");
-		List elements = new ArrayList();
+		List<ElementValuePairGen> elements = new ArrayList<ElementValuePairGen>();
 		elements.add(nvGen);
 		return new AnnotationEntryGen(t, elements, visibility, cp);
 	}
diff --git a/src/test/java/org/apache/bcel/AnnotationGenTestCase.java b/src/test/java/org/apache/bcel/AnnotationGenTestCase.java
index 8960afc4..320fb054 100644
--- a/src/test/java/org/apache/bcel/AnnotationGenTestCase.java
+++ b/src/test/java/org/apache/bcel/AnnotationGenTestCase.java
@@ -66,7 +66,7 @@ public class AnnotationGenTestCase extends AbstractTestCase
 				"Should include string 'id=4' but says: " + nvGen.toString(),
 				nvGen.toString().indexOf("id=4") != -1);
 		ObjectType t = new ObjectType("SimpleAnnotation");
-		List elements = new ArrayList();
+		List<ElementValuePairGen> elements = new ArrayList<ElementValuePairGen>();
 		elements.add(nvGen);
 		// Build an annotation of type 'SimpleAnnotation' with 'id=4' as the
 		// only value :)
@@ -91,12 +91,12 @@ public class AnnotationGenTestCase extends AbstractTestCase
 				"Should include string 'id=4' but says: " + nvGen.toString(),
 				nvGen.toString().indexOf("id=4") != -1);
 		ObjectType t = new ObjectType("SimpleAnnotation");
-		List elements = new ArrayList();
+		List<ElementValuePairGen> elements = new ArrayList<ElementValuePairGen>();
 		elements.add(nvGen);
 		// Build a RV annotation of type 'SimpleAnnotation' with 'id=4' as the
 		// only value :)
 		AnnotationEntryGen a = new AnnotationEntryGen(t, elements, true, cp);
-		Vector v = new Vector();
+		Vector<AnnotationEntryGen> v = new Vector<AnnotationEntryGen>();
 		v.add(a);
 		Attribute[] attributes = Utility.getAnnotationAttributes(cp, v);
 		boolean foundRV = false;
@@ -113,7 +113,7 @@ public class AnnotationGenTestCase extends AbstractTestCase
 		// Build a RIV annotation of type 'SimpleAnnotation' with 'id=4' as the
 		// only value :)
 		AnnotationEntryGen a2 = new AnnotationEntryGen(t, elements, false, cp);
-		Vector v2 = new Vector();
+		Vector<AnnotationEntryGen> v2 = new Vector<AnnotationEntryGen>();
 		v2.add(a2);
 		Attribute[] attributes2 = Utility.getAnnotationAttributes(cp, v2);
 		boolean foundRIV = false;
diff --git a/src/test/java/org/apache/bcel/CounterVisitorTestCase.java b/src/test/java/org/apache/bcel/CounterVisitorTestCase.java
index ed4e94d5..d947e1d1 100644
--- a/src/test/java/org/apache/bcel/CounterVisitorTestCase.java
+++ b/src/test/java/org/apache/bcel/CounterVisitorTestCase.java
@@ -22,7 +22,8 @@ import org.apache.bcel.classfile.JavaClass;
 
 public class CounterVisitorTestCase extends AbstractCounterVisitorTestCase
 {
-	protected JavaClass getTestClass() throws ClassNotFoundException
+	@Override
+    protected JavaClass getTestClass() throws ClassNotFoundException
 	{
 		return getTestClass("org.apache.bcel.data.MarkedType");
 	}
diff --git a/src/test/java/org/apache/bcel/ElementValueGenTestCase.java b/src/test/java/org/apache/bcel/ElementValueGenTestCase.java
index 6e4aab94..6565062c 100644
--- a/src/test/java/org/apache/bcel/ElementValueGenTestCase.java
+++ b/src/test/java/org/apache/bcel/ElementValueGenTestCase.java
@@ -104,10 +104,10 @@ public class ElementValueGenTestCase extends AbstractTestCase
 		ClassGen cg = createClassGen("HelloWorld");
 		ConstantPoolGen cp = cg.getConstantPool();
 		SimpleElementValueGen evg = new SimpleElementValueGen(
-				ElementValueGen.PRIMITIVE_CHAR, cp, (char) 't');
+				ElementValueGen.PRIMITIVE_CHAR, cp, 't');
 		// Creation of an element like that should leave a new entry in the
 		// cpool
-		int idx = cp.lookupInteger((char) 't');
+		int idx = cp.lookupInteger('t');
 		assertTrue("Should have the same index in the constantpool but "
 				+ evg.getIndex() + "!=" + idx, evg.getIndex() == idx);
 		checkSerialize(evg, cp);
diff --git a/src/test/java/org/apache/bcel/FieldAnnotationsTestCase.java b/src/test/java/org/apache/bcel/FieldAnnotationsTestCase.java
index b5364d0f..7cc8a0af 100644
--- a/src/test/java/org/apache/bcel/FieldAnnotationsTestCase.java
+++ b/src/test/java/org/apache/bcel/FieldAnnotationsTestCase.java
@@ -20,7 +20,6 @@ package org.apache.bcel;
 
 import java.io.File;
 import java.io.IOException;
-import java.util.Iterator;
 import org.apache.bcel.classfile.Field;
 import org.apache.bcel.classfile.JavaClass;
 import org.apache.bcel.classfile.AnnotationEntry;
@@ -56,7 +55,7 @@ public class FieldAnnotationsTestCase extends AbstractTestCase
 		File tfile = createTestdataFile("AnnotatedFields.class");
 		clazz.dump(tfile);
 		SyntheticRepository repos2 = createRepos(".");
-		JavaClass clazz2 = repos2.loadClass("AnnotatedFields");
+		repos2.loadClass("AnnotatedFields");
 		checkAnnotatedField(clazz, "i", "Lorg/apache/bcel/data/SimpleAnnotation;", "id", "1");
 		checkAnnotatedField(clazz, "s", "Lorg/apache/bcel/data/SimpleAnnotation;", "id", "2");
 		assertTrue(tfile.delete());
@@ -67,7 +66,7 @@ public class FieldAnnotationsTestCase extends AbstractTestCase
 	 * reload it and everything is correct.
 	 */
 	public void testFieldAnnotationModification()
-			throws ClassNotFoundException, IOException
+			throws ClassNotFoundException
 	{
 		boolean dbg = false;
 		JavaClass clazz = getTestClass("org.apache.bcel.data.AnnotatedFields");
@@ -132,7 +131,7 @@ public class FieldAnnotationsTestCase extends AbstractTestCase
 				.equals(name));
 		assertTrue("Expected AnnotationEntry to have one element but it had "
 				+ a.getElementValuePairs().length, a.getElementValuePairs().length == 1);
-		ElementValuePair envp = (ElementValuePair) a.getElementValuePairs()[0];
+		ElementValuePair envp = a.getElementValuePairs()[0];
 		assertTrue("Expected element name " + elementname + " but was "
 				+ envp.getNameString(), elementname
 				.equals(envp.getNameString()));
diff --git a/src/test/java/org/apache/bcel/NanoTimer.java b/src/test/java/org/apache/bcel/NanoTimer.java
index 6bd57276..27efb9b0 100644
--- a/src/test/java/org/apache/bcel/NanoTimer.java
+++ b/src/test/java/org/apache/bcel/NanoTimer.java
@@ -42,7 +42,8 @@ public class NanoTimer {
 	/**
 	 * May ony be called after stop has been called as many times as start.
 	 */
-	public String toString() {
+	@Override
+    public String toString() {
 		return ((double) (time) / 1000000000) + " s";
 	}
 
diff --git a/src/test/java/org/apache/bcel/PerformanceTest.java b/src/test/java/org/apache/bcel/PerformanceTest.java
index a63ba22a..48ce9fff 100644
--- a/src/test/java/org/apache/bcel/PerformanceTest.java
+++ b/src/test/java/org/apache/bcel/PerformanceTest.java
@@ -19,11 +19,9 @@
 package org.apache.bcel;
 
 import java.io.ByteArrayInputStream;
-import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Enumeration;
-import java.util.Locale;
 import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
 
@@ -76,7 +74,7 @@ public final class PerformanceTest extends TestCase {
 		String javaHome = System.getProperty("java.home");
 
         JarFile jar = new JarFile(javaHome + "/lib/dt.jar");
-		Enumeration en = jar.entries();
+		Enumeration<?> en = jar.entries();
 		int i = 0;
 
 		while (en.hasMoreElements()) {
diff --git a/src/test/java/org/apache/bcel/data/SimpleEnum.java b/src/test/java/org/apache/bcel/data/SimpleEnum.java
index 8a5b0402..1db0bbf9 100644
--- a/src/test/java/org/apache/bcel/data/SimpleEnum.java
+++ b/src/test/java/org/apache/bcel/data/SimpleEnum.java
@@ -18,4 +18,4 @@
 
 package org.apache.bcel.data;
 
-public enum SimpleEnum { Red,Orange,Yellow,Green,Blue,Indigo,Violet };
+public enum SimpleEnum { Red,Orange,Yellow,Green,Blue,Indigo,Violet }
diff --git a/src/test/java/org/apache/bcel/util/InstructionFinderTest.java b/src/test/java/org/apache/bcel/util/InstructionFinderTest.java
index 4f494462..12871052 100644
--- a/src/test/java/org/apache/bcel/util/InstructionFinderTest.java
+++ b/src/test/java/org/apache/bcel/util/InstructionFinderTest.java
@@ -37,7 +37,7 @@ public class InstructionFinderTest extends AbstractTestCase {
 		il.append(new ISTORE(3));
 		InstructionFinder finder = new InstructionFinder(il);
 		
-		Iterator it = finder.search("ILOAD IADD", il.getInstructionHandles()[0], null );
+		Iterator<?> it = finder.search("ILOAD IADD", il.getInstructionHandles()[0], null );
 		InstructionHandle[] ihs = (InstructionHandle[])it.next();
 		assertEquals(2, ihs.length);
 		assertEquals(ihs[0].getInstruction(), new ILOAD(2));