cvs commit: jakarta-bcel/src/java/org/apache/bcel/generic InstructionList.java LOOKUPSWITCH.java Select.java TABLESWITCH.java

mdahm       2004/11/09 12:34:44

  Modified:    src/java/org/apache/bcel/generic InstructionList.java
                        LOOKUPSWITCH.java Select.java TABLESWITCH.java
  Log:
  select patches
  
  Revision  Changes    Path
  1.4       +3 -1      jakarta-bcel/src/java/org/apache/bcel/generic/InstructionList.java
  
  Index: InstructionList.java
  ===================================================================
  RCS file: /home/cvs/jakarta-bcel/src/java/org/apache/bcel/generic/InstructionList.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- InstructionList.java	23 May 2003 07:55:17 -0000	1.3
  +++ InstructionList.java	9 Nov 2004 20:34:44 -0000	1.4
  @@ -670,6 +670,8 @@
       // Step 3: append after target
   
       if(target == null) { // append to start of list
  +      if (this.start != null)
  +        this.start.prev = end; 
         end.next = this.start;
         this.start = start;
       } else {
  
  
  
  1.3       +3 -3      jakarta-bcel/src/java/org/apache/bcel/generic/LOOKUPSWITCH.java
  
  Index: LOOKUPSWITCH.java
  ===================================================================
  RCS file: /home/cvs/jakarta-bcel/src/java/org/apache/bcel/generic/LOOKUPSWITCH.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- LOOKUPSWITCH.java	23 May 2003 07:55:17 -0000	1.2
  +++ LOOKUPSWITCH.java	9 Nov 2004 20:34:44 -0000	1.3
  @@ -71,8 +71,8 @@
     LOOKUPSWITCH() {}
   
     public LOOKUPSWITCH(int[] match, InstructionHandle[] targets,
  -		      InstructionHandle target) {
  -    super(org.apache.bcel.Constants.LOOKUPSWITCH, match, targets, target);
  +		      InstructionHandle defaultTarget) {
  +    super(org.apache.bcel.Constants.LOOKUPSWITCH, match, targets, defaultTarget);
       
       length = (short)(9 + match_length * 8); /* alignment remainder assumed
   					     * 0 here, until dump time. */
  
  
  
  1.4       +5 -3      jakarta-bcel/src/java/org/apache/bcel/generic/Select.java
  
  Index: Select.java
  ===================================================================
  RCS file: /home/cvs/jakarta-bcel/src/java/org/apache/bcel/generic/Select.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Select.java	23 May 2003 07:55:18 -0000	1.3
  +++ Select.java	9 Nov 2004 20:34:44 -0000	1.4
  @@ -58,6 +58,8 @@
   
   /** 
    * Select - Abstract super class for LOOKUPSWITCH and TABLESWITCH instructions.
  + * 
  + * <p>We use our super's <code>target</code> property as the default target.
    *
    * @version $Id$
    * @author  <A HREF="mailto:[email protected]">M. Dahm</A>
  @@ -90,8 +92,8 @@
      * @param target default instruction target
      */
     Select(short opcode, int[] match, InstructionHandle[] targets,
  -	 InstructionHandle target) {
  -    super(opcode, target);
  +	 InstructionHandle defaultTarget) {
  +    super(opcode, defaultTarget);
   
       this.targets = targets;
       for(int i=0; i < targets.length; i++)
  
  
  
  1.3       +3 -3      jakarta-bcel/src/java/org/apache/bcel/generic/TABLESWITCH.java
  
  Index: TABLESWITCH.java
  ===================================================================
  RCS file: /home/cvs/jakarta-bcel/src/java/org/apache/bcel/generic/TABLESWITCH.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- TABLESWITCH.java	23 May 2003 07:55:18 -0000	1.2
  +++ TABLESWITCH.java	9 Nov 2004 20:34:44 -0000	1.3
  @@ -77,8 +77,8 @@
      * @param target default branch
      */
     public TABLESWITCH(int[] match, InstructionHandle[] targets,
  -		     InstructionHandle target) {
  -    super(org.apache.bcel.Constants.TABLESWITCH, match, targets, target);
  +		     InstructionHandle defaultTarget) {
  +    super(org.apache.bcel.Constants.TABLESWITCH, match, targets, defaultTarget);
       
       length = (short)(13 + match_length * 4); /* Alignment remainder assumed
   					      * 0 here, until dump time */