From 46e149916b753af75934d0781f887664b807a8e4 Mon Sep 17 00:00:00 2001 From: aclement Date: Tue, 5 Apr 2011 15:15:33 +0000 Subject: [PATCH] removed com.sun references, even though they were only referenced from Javadoc --- .../aspectj/apache/bcel/generic/Instruction.java | 13 +++++-------- .../aspectj/apache/bcel/generic/LOOKUPSWITCH.java | 5 +---- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/bcel-builder/src/org/aspectj/apache/bcel/generic/Instruction.java b/bcel-builder/src/org/aspectj/apache/bcel/generic/Instruction.java index ffdf63051..e610253ac 100644 --- a/bcel-builder/src/org/aspectj/apache/bcel/generic/Instruction.java +++ b/bcel-builder/src/org/aspectj/apache/bcel/generic/Instruction.java @@ -62,12 +62,10 @@ import org.aspectj.apache.bcel.Constants; import org.aspectj.apache.bcel.classfile.ConstantPool; import org.aspectj.apache.bcel.util.ByteSequence; -import com.sun.org.apache.bcel.internal.generic.BranchInstruction; - /** * Abstract super class for all Java byte codes. * - * @version $Id: Instruction.java,v 1.9 2009/10/05 17:35:36 aclement Exp $ + * @version $Id: Instruction.java,v 1.10 2011/04/05 15:15:33 aclement Exp $ * @author M. Dahm */ public class Instruction implements Cloneable, Serializable, Constants { @@ -86,10 +84,9 @@ public class Instruction implements Cloneable, Serializable, Constants { } /** - * Use with caution, since `BranchInstruction's have a `target' reference which is not copied correctly (only basic types are). - * This also applies for `Select' instructions with their multiple branch targets. + * Use with caution, since 'BranchInstruction's have a 'target' reference which is not copied correctly (only basic types are). + * This also applies for 'Select' instructions with their multiple branch targets. * - * @see BranchInstruction * @return (shallow) copy of an instruction */ // GET RID OF THIS - make it throw an exception and track the callers @@ -158,8 +155,8 @@ public class Instruction implements Cloneable, Serializable, Constants { obj = new InstructionLV(opcode, wide ? bytes.readUnsignedShort() : bytes.readUnsignedByte()); break; case Constants.IINC: - obj = new IINC(wide ? bytes.readUnsignedShort() : bytes.readUnsignedByte(), wide ? bytes.readShort() : bytes - .readByte(), wide); + obj = new IINC(wide ? bytes.readUnsignedShort() : bytes.readUnsignedByte(), wide ? bytes.readShort() + : bytes.readByte(), wide); break; case Constants.IFNULL: case Constants.IFNONNULL: diff --git a/bcel-builder/src/org/aspectj/apache/bcel/generic/LOOKUPSWITCH.java b/bcel-builder/src/org/aspectj/apache/bcel/generic/LOOKUPSWITCH.java index b04921ddb..c8ebcba4c 100644 --- a/bcel-builder/src/org/aspectj/apache/bcel/generic/LOOKUPSWITCH.java +++ b/bcel-builder/src/org/aspectj/apache/bcel/generic/LOOKUPSWITCH.java @@ -59,14 +59,11 @@ import java.io.IOException; import org.aspectj.apache.bcel.Constants; import org.aspectj.apache.bcel.util.ByteSequence; -import com.sun.org.apache.bcel.internal.generic.SWITCH; - /** * LOOKUPSWITCH - Switch with unordered set of values * - * @version $Id: LOOKUPSWITCH.java,v 1.4 2008/08/28 00:05:29 aclement Exp $ + * @version $Id: LOOKUPSWITCH.java,v 1.5 2011/04/05 15:15:33 aclement Exp $ * @author M. Dahm - * @see SWITCH */ public class LOOKUPSWITCH extends InstructionSelect { -- 2.39.5