[jboss-cvs] javassist/src/main/javassist/bytecode/analysis ...

[Jason Thomas Greene]

  User: jgreene 
  Date: 08/06/12 12:24:36

  Modified:    src/main/javassist/bytecode/analysis    Analyzer.java
                        Subroutine.java SubroutineScanner.java
  Log:
  remove jdk5 deps
  
  Revision  Changes    Path
  1.2       +1 -1      javassist/src/main/javassist/bytecode/analysis/Analyzer.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Analyzer.java
  ===================================================================
  RCS file: /cvsroot/jboss/javassist/src/main/javassist/bytecode/analysis/Analyzer.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- Analyzer.java	24 May 2008 05:12:52 -0000	1.1
  +++ Analyzer.java	12 Jun 2008 16:24:36 -0000	1.2
  @@ -221,7 +221,7 @@
               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);
  
  
  
  1.2       +4 -4      javassist/src/main/javassist/bytecode/analysis/Subroutine.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Subroutine.java
  ===================================================================
  RCS file: /cvsroot/jboss/javassist/src/main/javassist/bytecode/analysis/Subroutine.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- Subroutine.java	24 May 2008 05:12:52 -0000	1.1
  +++ Subroutine.java	12 Jun 2008 16:24:36 -0000	1.2
  @@ -33,11 +33,11 @@
   
       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 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() {
  
  
  
  1.2       +4 -4      javassist/src/main/javassist/bytecode/analysis/SubroutineScanner.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: SubroutineScanner.java
  ===================================================================
  RCS file: /cvsroot/jboss/javassist/src/main/javassist/bytecode/analysis/SubroutineScanner.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- SubroutineScanner.java	24 May 2008 05:12:52 -0000	1.1
  +++ SubroutineScanner.java	12 Jun 2008 16:24:36 -0000	1.2
  @@ -61,10 +61,10 @@
   
       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 @@
           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);