Remove redundant specification of type arguments (Java 7).

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

4 files changed, 12 insertions, 12 deletions

diff --git a/src/test/java/org/apache/commons/bcel6/AbstractTestCase.java b/src/test/java/org/apache/commons/bcel6/AbstractTestCase.java
index 7db4b332..302bcd40 100644
--- a/src/test/java/org/apache/commons/bcel6/AbstractTestCase.java
+++ b/src/test/java/org/apache/commons/bcel6/AbstractTestCase.java
@@ -91,7 +91,7 @@ public abstract class AbstractTestCase extends TestCase
     protected Attribute[] findAttribute(String name, JavaClass clazz)
     {
         Attribute[] all = clazz.getAttributes();
-        List<Attribute> chosenAttrsList = new ArrayList<Attribute>();
+        List<Attribute> chosenAttrsList = new ArrayList<>();
         for (Attribute element : all) {
             if (verbose) {
                 System.err.println("Attribute: " + element.getName());
@@ -105,7 +105,7 @@ public abstract class AbstractTestCase extends TestCase
 
     protected Attribute findAttribute(String name, Attribute[] all)
     {
-        List<Attribute> chosenAttrsList = new ArrayList<Attribute>();
+        List<Attribute> chosenAttrsList = new ArrayList<>();
         for (Attribute element : all) {
             if (verbose) {
                 System.err.println("Attribute: " + element.getName());
@@ -174,7 +174,7 @@ public abstract class AbstractTestCase extends TestCase
                 ElementValueGen.STRING, cp, aFruit);
         ElementValuePairGen nvGen = new ElementValuePairGen("fruit", evg, cp);
         ObjectType t = new ObjectType("SimpleStringAnnotation");
-        List<ElementValuePairGen> elements = new ArrayList<ElementValuePairGen>();
+        List<ElementValuePairGen> elements = new ArrayList<>();
         elements.add(nvGen);
         return new AnnotationEntryGen(t, elements, visibility, cp);
     }
diff --git a/src/test/java/org/apache/commons/bcel6/BCELBenchmark.java b/src/test/java/org/apache/commons/bcel6/BCELBenchmark.java
index c71ffc67..34589fbe 100644
--- a/src/test/java/org/apache/commons/bcel6/BCELBenchmark.java
+++ b/src/test/java/org/apache/commons/bcel6/BCELBenchmark.java
@@ -58,7 +58,7 @@ public class BCELBenchmark {
     }
 
     private Iterable<JarEntry> getClasses(JarFile jar) {
-        return new IteratorIterable<JarEntry>(new FilterIterator<JarEntry>(new EnumerationIterator<JarEntry>(jar.entries()), new Predicate<JarEntry>() {
+        return new IteratorIterable<>(new FilterIterator<>(new EnumerationIterator<>(jar.entries()), new Predicate<JarEntry>() {
             @Override
             public boolean evaluate(JarEntry entry) {
                 return entry.getName().endsWith(".class");
diff --git a/src/test/java/org/apache/commons/bcel6/generic/AnnotationGenTestCase.java b/src/test/java/org/apache/commons/bcel6/generic/AnnotationGenTestCase.java
index d01fe1b4..c552d8c1 100644
--- a/src/test/java/org/apache/commons/bcel6/generic/AnnotationGenTestCase.java
+++ b/src/test/java/org/apache/commons/bcel6/generic/AnnotationGenTestCase.java
@@ -66,7 +66,7 @@ public class AnnotationGenTestCase extends AbstractTestCase
                 "Should include string 'id=4' but says: " + nvGen.toString(),
                 nvGen.toString().contains("id=4"));
         ObjectType t = new ObjectType("SimpleAnnotation");
-        List<ElementValuePairGen> elements = new ArrayList<ElementValuePairGen>();
+        List<ElementValuePairGen> elements = new ArrayList<>();
         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().contains("id=4"));
         ObjectType t = new ObjectType("SimpleAnnotation");
-        List<ElementValuePairGen> elements = new ArrayList<ElementValuePairGen>();
+        List<ElementValuePairGen> elements = new ArrayList<>();
         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);
-        List<AnnotationEntryGen> v = new ArrayList<AnnotationEntryGen>();
+        List<AnnotationEntryGen> v = new ArrayList<>();
         v.add(a);
         Attribute[] attributes = AnnotationEntryGen.getAnnotationAttributes(cp, v);
         boolean foundRV = false;
@@ -111,7 +111,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);
-        List<AnnotationEntryGen> v2 = new ArrayList<AnnotationEntryGen>();
+        List<AnnotationEntryGen> v2 = new ArrayList<>();
         v2.add(a2);
         Attribute[] attributes2 = AnnotationEntryGen.getAnnotationAttributes(cp, v2);
         boolean foundRIV = false;
diff --git a/src/test/java/org/apache/commons/bcel6/generic/GeneratingAnnotatedClassesTestCase.java b/src/test/java/org/apache/commons/bcel6/generic/GeneratingAnnotatedClassesTestCase.java
index cd5f51e5..276b66cd 100644
--- a/src/test/java/org/apache/commons/bcel6/generic/GeneratingAnnotatedClassesTestCase.java
+++ b/src/test/java/org/apache/commons/bcel6/generic/GeneratingAnnotatedClassesTestCase.java
@@ -655,7 +655,7 @@ public class GeneratingAnnotatedClassesTestCase extends AbstractTestCase
                 ElementValueGen.PRIMITIVE_INT, cp, 4);
         ElementValuePairGen nvGen = new ElementValuePairGen("id", evg, cp);
         ObjectType t = new ObjectType("SimpleAnnotation");
-        List<ElementValuePairGen> elements = new ArrayList<ElementValuePairGen>();
+        List<ElementValuePairGen> elements = new ArrayList<>();
         elements.add(nvGen);
         AnnotationEntryGen a = new AnnotationEntryGen(t, elements, true, cp);
         return a;
@@ -668,7 +668,7 @@ public class GeneratingAnnotatedClassesTestCase extends AbstractTestCase
                 ElementValueGen.STRING, cp, aFruit);
         ElementValuePairGen nvGen = new ElementValuePairGen("fruit", evg, cp);
         ObjectType t = new ObjectType("SimpleStringAnnotation");
-        List<ElementValuePairGen> elements = new ArrayList<ElementValuePairGen>();
+        List<ElementValuePairGen> elements = new ArrayList<>();
         elements.add(nvGen);
         return new AnnotationEntryGen(t, elements, true, cp);
     }
@@ -680,7 +680,7 @@ public class GeneratingAnnotatedClassesTestCase extends AbstractTestCase
         ArrayElementValueGen array = new ArrayElementValueGen(cp);
         array.addElement(new AnnotationElementValueGen(a, cp));
         ElementValuePairGen nvp = new ElementValuePairGen("value", array, cp);
-        List<ElementValuePairGen> elements = new ArrayList<ElementValuePairGen>();
+        List<ElementValuePairGen> elements = new ArrayList<>();
         elements.add(nvp);
         return new AnnotationEntryGen(new ObjectType("CombinedAnnotation"),
                 elements, true, cp);
@@ -692,7 +692,7 @@ public class GeneratingAnnotatedClassesTestCase extends AbstractTestCase
                 ElementValueGen.PRIMITIVE_INT, cp, 4);
         ElementValuePairGen nvGen = new ElementValuePairGen("id", evg, cp);
         ObjectType t = new ObjectType("SimpleAnnotation");
-        List<ElementValuePairGen> elements = new ArrayList<ElementValuePairGen>();
+        List<ElementValuePairGen> elements = new ArrayList<>();
         elements.add(nvGen);
         AnnotationEntryGen a = new AnnotationEntryGen(t, elements, false, cp);
         return a;