Upgraded to new JDT compiler - neon.1 and a bit

2 files changed, 3 insertions, 6 deletions

diff --git a/weaver/src/org/aspectj/weaver/bcel/LazyMethodGen.java b/weaver/src/org/aspectj/weaver/bcel/LazyMethodGen.java
index 869ed5819..0b02041ab 100644
--- a/weaver/src/org/aspectj/weaver/bcel/LazyMethodGen.java
+++ b/weaver/src/org/aspectj/weaver/bcel/LazyMethodGen.java
@@ -24,7 +24,6 @@ import java.util.List;
 import java.util.ListIterator;
 import java.util.Map;
 import java.util.Set;
-import java.util.Stack;
 
 import org.aspectj.apache.bcel.Constants;
 import org.aspectj.apache.bcel.classfile.Attribute;
@@ -688,8 +687,7 @@ public final class LazyMethodGen implements Traceable {
 				}
 			}
 			int ecounter = 0;
-			for (Iterator i = exnTable.iterator(); i.hasNext();) {
-				ExceptionRange er = (ExceptionRange) i.next();
+			for (ExceptionRange er: exnTable) {
 				String exceptionLabel = "E" + ecounter++;
 				labelMap.put(Range.getRealStart(er.getHandler()), exceptionLabel);
 				labelMap.put(er.getHandler(), exceptionLabel);
diff --git a/weaver/testsrc/org/aspectj/weaver/bcel/ArgsWeaveTestCase.java b/weaver/testsrc/org/aspectj/weaver/bcel/ArgsWeaveTestCase.java
index 3148cbdaf..8e7f72f4f 100644
--- a/weaver/testsrc/org/aspectj/weaver/bcel/ArgsWeaveTestCase.java
+++ b/weaver/testsrc/org/aspectj/weaver/bcel/ArgsWeaveTestCase.java
@@ -22,6 +22,7 @@ import org.aspectj.apache.bcel.generic.InstructionFactory;
 import org.aspectj.apache.bcel.generic.InstructionHandle;
 import org.aspectj.apache.bcel.generic.InstructionList;
 import org.aspectj.apache.bcel.generic.Type;
+import org.aspectj.weaver.Advice;
 import org.aspectj.weaver.AdviceKind;
 import org.aspectj.weaver.MemberImpl;
 import org.aspectj.weaver.ResolvedType;
@@ -54,8 +55,7 @@ public class ArgsWeaveTestCase extends WeaveTestCase {
     }  
 
     public void testLots() throws IOException {
-        List l = new ArrayList();
-        
+        List<Advice> l = new ArrayList();
         
         BcelAdvice p1 = 
             makeArgsMunger("before");
@@ -70,7 +70,6 @@ public class ArgsWeaveTestCase extends WeaveTestCase {
         l.add(p2);
         l.add(p3);
 
-
         weaveTest("HelloWorld", "ArgsBeforeAfterHelloWorld", addLexicalOrder(l));        
     }