remove jdk5 deps

git-svn-id: http://anonsvn.jboss.org/repos/javassist/trunk@444 30ef5769-5b8d-40dd-aea6-55b5d6557bb3

3 files changed, 9 insertions, 9 deletions

diff --git a/src/main/javassist/bytecode/analysis/Analyzer.java b/src/main/javassist/bytecode/analysis/Analyzer.java
index 7ef0b00b..ea565997 100644
--- a/src/main/javassist/bytecode/analysis/Analyzer.java
+++ b/src/main/javassist/bytecode/analysis/Analyzer.java
@@ -221,7 +221,7 @@ public class Analyzer implements Opcode {
             try {
                 type = index == 0 ? Type.THROWABLE : Type.get(classes.get(constPool.getClassInfo(index)));
             } catch (NotFoundException e) {
-                throw new IllegalStateException(e);
+                throw new IllegalStateException(e.getMessage());
             }
 
             exceptions[i] = new ExceptionInfo(table.startPc(i), table.endPc(i), table.handlerPc(i), type);
diff --git a/src/main/javassist/bytecode/analysis/Subroutine.java b/src/main/javassist/bytecode/analysis/Subroutine.java
index 924d37a6..1347813e 100644
--- a/src/main/javassist/bytecode/analysis/Subroutine.java
+++ b/src/main/javassist/bytecode/analysis/Subroutine.java
@@ -33,11 +33,11 @@ public class Subroutine {
 
     public Subroutine(int start, int caller) {
         this.start = start;
-        callers.add(Integer.valueOf(caller));
+        callers.add(new Integer(caller));
     }
 
     public void addCaller(int caller) {
-        callers.add(Integer.valueOf(caller));
+        callers.add(new Integer(caller));
     }
 
     public int start() {
@@ -45,11 +45,11 @@ public class Subroutine {
     }
 
     public void access(int index) {
-        access.add(Integer.valueOf(index));
+        access.add(new Integer(index));
     }
 
     public boolean isAccessed(int index) {
-        return access.contains(Integer.valueOf(index));
+        return access.contains(new Integer(index));
     }
 
     public Collection accessed() {
diff --git a/src/main/javassist/bytecode/analysis/SubroutineScanner.java b/src/main/javassist/bytecode/analysis/SubroutineScanner.java
index 3feae539..f42202ea 100644
--- a/src/main/javassist/bytecode/analysis/SubroutineScanner.java
+++ b/src/main/javassist/bytecode/analysis/SubroutineScanner.java
@@ -61,10 +61,10 @@ public class SubroutineScanner implements Opcode {
 
     private void scan(int pos, CodeIterator iter, Subroutine sub) throws BadBytecode {
         // Skip already processed blocks
-        if (done.contains(Integer.valueOf(pos)))
+        if (done.contains(new Integer(pos)))
             return;
 
-        done.add(Integer.valueOf(pos));
+        done.add(new Integer(pos));
 
         int old = iter.lookAhead();
         iter.move(pos);
@@ -102,10 +102,10 @@ public class SubroutineScanner implements Opcode {
         if (Util.isJumpInstruction(opcode)) {
             int target = Util.getJumpTarget(pos, iter);
             if (opcode == JSR || opcode == JSR_W) {
-                Subroutine s = (Subroutine) subTable.get(Integer.valueOf(target));
+                Subroutine s = (Subroutine) subTable.get(new Integer(target));
                 if (s == null) {
                     s = new Subroutine(target, pos);
-                    subTable.put(Integer.valueOf(target), s);
+                    subTable.put(new Integer(target), s);
                     scan(target, iter, s);
                 } else {
                     s.addCaller(pos);