You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@jakarta.apache.org by se...@apache.org on 2010/05/25 02:08:22 UTC
svn commit: r947869 - in /jakarta/bcel/trunk/src/test/java/org/apache/bcel:
./ data/ util/
Author: sebb
Date: Tue May 25 00:08:22 2010
New Revision: 947869
URL: http://svn.apache.org/viewvc?rev=947869&view=rev
Log:
Fix Eclipse warnings
Modified:
jakarta/bcel/trunk/src/test/java/org/apache/bcel/AbstractCounterVisitorTestCase.java
jakarta/bcel/trunk/src/test/java/org/apache/bcel/AbstractTestCase.java
jakarta/bcel/trunk/src/test/java/org/apache/bcel/AnnotationGenTestCase.java
jakarta/bcel/trunk/src/test/java/org/apache/bcel/CounterVisitorTestCase.java
jakarta/bcel/trunk/src/test/java/org/apache/bcel/ElementValueGenTestCase.java
jakarta/bcel/trunk/src/test/java/org/apache/bcel/FieldAnnotationsTestCase.java
jakarta/bcel/trunk/src/test/java/org/apache/bcel/NanoTimer.java
jakarta/bcel/trunk/src/test/java/org/apache/bcel/PerformanceTest.java
jakarta/bcel/trunk/src/test/java/org/apache/bcel/data/SimpleEnum.java
jakarta/bcel/trunk/src/test/java/org/apache/bcel/util/InstructionFinderTest.java
Modified: jakarta/bcel/trunk/src/test/java/org/apache/bcel/AbstractCounterVisitorTestCase.java
URL: http://svn.apache.org/viewvc/jakarta/bcel/trunk/src/test/java/org/apache/bcel/AbstractCounterVisitorTestCase.java?rev=947869&r1=947868&r2=947869&view=diff
==============================================================================
--- jakarta/bcel/trunk/src/test/java/org/apache/bcel/AbstractCounterVisitorTestCase.java (original)
+++ jakarta/bcel/trunk/src/test/java/org/apache/bcel/AbstractCounterVisitorTestCase.java Tue May 25 00:08:22 2010
@@ -28,7 +28,8 @@ public abstract class AbstractCounterVis
private CounterVisitor visitor = null;
- public void setUp() throws ClassNotFoundException
+ @Override
+ public void setUp() throws ClassNotFoundException
{
visitor = new CounterVisitor();
new DescendingVisitor(getTestClass(), getVisitor()).visit();
Modified: jakarta/bcel/trunk/src/test/java/org/apache/bcel/AbstractTestCase.java
URL: http://svn.apache.org/viewvc/jakarta/bcel/trunk/src/test/java/org/apache/bcel/AbstractTestCase.java?rev=947869&r1=947868&r2=947869&view=diff
==============================================================================
--- jakarta/bcel/trunk/src/test/java/org/apache/bcel/AbstractTestCase.java (original)
+++ jakarta/bcel/trunk/src/test/java/org/apache/bcel/AbstractTestCase.java Tue May 25 00:08:22 2010
@@ -93,7 +93,7 @@ public abstract class AbstractTestCase e
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 e
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 e
}
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 e
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);
}
Modified: jakarta/bcel/trunk/src/test/java/org/apache/bcel/AnnotationGenTestCase.java
URL: http://svn.apache.org/viewvc/jakarta/bcel/trunk/src/test/java/org/apache/bcel/AnnotationGenTestCase.java?rev=947869&r1=947868&r2=947869&view=diff
==============================================================================
--- jakarta/bcel/trunk/src/test/java/org/apache/bcel/AnnotationGenTestCase.java (original)
+++ jakarta/bcel/trunk/src/test/java/org/apache/bcel/AnnotationGenTestCase.java Tue May 25 00:08:22 2010
@@ -66,7 +66,7 @@ public class AnnotationGenTestCase exten
"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 exten
"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 exten
// 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;
Modified: jakarta/bcel/trunk/src/test/java/org/apache/bcel/CounterVisitorTestCase.java
URL: http://svn.apache.org/viewvc/jakarta/bcel/trunk/src/test/java/org/apache/bcel/CounterVisitorTestCase.java?rev=947869&r1=947868&r2=947869&view=diff
==============================================================================
--- jakarta/bcel/trunk/src/test/java/org/apache/bcel/CounterVisitorTestCase.java (original)
+++ jakarta/bcel/trunk/src/test/java/org/apache/bcel/CounterVisitorTestCase.java Tue May 25 00:08:22 2010
@@ -22,7 +22,8 @@ import org.apache.bcel.classfile.JavaCla
public class CounterVisitorTestCase extends AbstractCounterVisitorTestCase
{
- protected JavaClass getTestClass() throws ClassNotFoundException
+ @Override
+ protected JavaClass getTestClass() throws ClassNotFoundException
{
return getTestClass("org.apache.bcel.data.MarkedType");
}
Modified: jakarta/bcel/trunk/src/test/java/org/apache/bcel/ElementValueGenTestCase.java
URL: http://svn.apache.org/viewvc/jakarta/bcel/trunk/src/test/java/org/apache/bcel/ElementValueGenTestCase.java?rev=947869&r1=947868&r2=947869&view=diff
==============================================================================
--- jakarta/bcel/trunk/src/test/java/org/apache/bcel/ElementValueGenTestCase.java (original)
+++ jakarta/bcel/trunk/src/test/java/org/apache/bcel/ElementValueGenTestCase.java Tue May 25 00:08:22 2010
@@ -104,10 +104,10 @@ public class ElementValueGenTestCase ext
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);
Modified: jakarta/bcel/trunk/src/test/java/org/apache/bcel/FieldAnnotationsTestCase.java
URL: http://svn.apache.org/viewvc/jakarta/bcel/trunk/src/test/java/org/apache/bcel/FieldAnnotationsTestCase.java?rev=947869&r1=947868&r2=947869&view=diff
==============================================================================
--- jakarta/bcel/trunk/src/test/java/org/apache/bcel/FieldAnnotationsTestCase.java (original)
+++ jakarta/bcel/trunk/src/test/java/org/apache/bcel/FieldAnnotationsTestCase.java Tue May 25 00:08:22 2010
@@ -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 ex
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 ex
* 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 ex
.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()));
Modified: jakarta/bcel/trunk/src/test/java/org/apache/bcel/NanoTimer.java
URL: http://svn.apache.org/viewvc/jakarta/bcel/trunk/src/test/java/org/apache/bcel/NanoTimer.java?rev=947869&r1=947868&r2=947869&view=diff
==============================================================================
--- jakarta/bcel/trunk/src/test/java/org/apache/bcel/NanoTimer.java (original)
+++ jakarta/bcel/trunk/src/test/java/org/apache/bcel/NanoTimer.java Tue May 25 00:08:22 2010
@@ -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";
}
Modified: jakarta/bcel/trunk/src/test/java/org/apache/bcel/PerformanceTest.java
URL: http://svn.apache.org/viewvc/jakarta/bcel/trunk/src/test/java/org/apache/bcel/PerformanceTest.java?rev=947869&r1=947868&r2=947869&view=diff
==============================================================================
--- jakarta/bcel/trunk/src/test/java/org/apache/bcel/PerformanceTest.java (original)
+++ jakarta/bcel/trunk/src/test/java/org/apache/bcel/PerformanceTest.java Tue May 25 00:08:22 2010
@@ -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 exten
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()) {
Modified: jakarta/bcel/trunk/src/test/java/org/apache/bcel/data/SimpleEnum.java
URL: http://svn.apache.org/viewvc/jakarta/bcel/trunk/src/test/java/org/apache/bcel/data/SimpleEnum.java?rev=947869&r1=947868&r2=947869&view=diff
==============================================================================
--- jakarta/bcel/trunk/src/test/java/org/apache/bcel/data/SimpleEnum.java (original)
+++ jakarta/bcel/trunk/src/test/java/org/apache/bcel/data/SimpleEnum.java Tue May 25 00:08:22 2010
@@ -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 }
Modified: jakarta/bcel/trunk/src/test/java/org/apache/bcel/util/InstructionFinderTest.java
URL: http://svn.apache.org/viewvc/jakarta/bcel/trunk/src/test/java/org/apache/bcel/util/InstructionFinderTest.java?rev=947869&r1=947868&r2=947869&view=diff
==============================================================================
--- jakarta/bcel/trunk/src/test/java/org/apache/bcel/util/InstructionFinderTest.java (original)
+++ jakarta/bcel/trunk/src/test/java/org/apache/bcel/util/InstructionFinderTest.java Tue May 25 00:08:22 2010
@@ -37,7 +37,7 @@ public class InstructionFinderTest exten
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));
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@jakarta.apache.org
For additional commands, e-mail: notifications-help@jakarta.apache.org