1 files changed, 12 insertions, 5 deletions
diff --git a/src/main/javassist/bytecode/stackmap/MapMaker.java b/src/main/javassist/bytecode/stackmap/MapMaker.java
index 5c4d7a53..538fba67 100644
--- a/src/main/javassist/bytecode/stackmap/MapMaker.java
+++ b/src/main/javassist/bytecode/stackmap/MapMaker.java
@@ -17,10 +17,18 @@
 package javassist.bytecode.stackmap;
 
 import java.util.ArrayList;
+import java.util.List;
+
 import javassist.ClassPool;
-import javassist.CtClass;
 import javassist.NotFoundException;
-import javassist.bytecode.*;
+import javassist.bytecode.BadBytecode;
+import javassist.bytecode.ByteArray;
+import javassist.bytecode.Bytecode;
+import javassist.bytecode.CodeAttribute;
+import javassist.bytecode.ConstPool;
+import javassist.bytecode.MethodInfo;
+import javassist.bytecode.StackMap;
+import javassist.bytecode.StackMapTable;
 
 /**
  * Stack map maker.
@@ -379,7 +387,7 @@ public class MapMaker extends Tracer {
      * their types are also fixed when they are found. 
      */
     private void fixTypes(byte[] code, TypedBlock[] blocks) throws NotFoundException, BadBytecode {
-        ArrayList preOrder = new ArrayList();
+        List<TypeData> preOrder = new ArrayList<TypeData>();
         int len = blocks.length;
         int index = 0;
         for (int i = 0; i < len; i++) {
@@ -522,8 +530,7 @@ public class MapMaker extends Tracer {
                 return diffSize(newTd, len, newTdLen);
             else
                 return -diffSize(oldTd, len, oldTdLen);
-        else
-            return -100;
+        return -100;
     }
 
     private static boolean stackMapEq(TypeData[] oldTd, TypeData[] newTd, int len) {