svn commit: r1697698 - /commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/CPInstruction.java

[se...@apache.org]

Author: sebb
Date: Tue Aug 25 15:25:36 2015
New Revision: 1697698

URL: http://svn.apache.org/r1697698
Log:
Add deprecated markers to non-private mutable fields so usage is detected
Add getters/setters as necessary to give access

Modified:
    commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/CPInstruction.java

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/CPInstruction.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/CPInstruction.java?rev=1697698&r1=1697697&r2=1697698&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/CPInstruction.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/CPInstruction.java Tue Aug 25 15:25:36 2015
@@ -38,6 +38,10 @@ import org.apache.commons.bcel6.util.Byt
 public abstract class CPInstruction extends Instruction implements TypedInstruction,
         IndexedInstruction {
 
+    /**
+     * @deprecated will be made private; do not access directly, use getter/setter
+     */
+    @Deprecated
     protected int index; // index to constant pool
 
 
@@ -64,7 +68,7 @@ public abstract class CPInstruction exte
      */
     @Override
     public void dump( DataOutputStream out ) throws IOException {
-        out.writeByte(opcode);
+        out.writeByte(super.getOpcode());
         out.writeShort(index);
     }
 
@@ -94,7 +98,7 @@ public abstract class CPInstruction exte
         if (c instanceof ConstantClass) {
             str = str.replace('.', '/');
         }
-        return org.apache.commons.bcel6.Constants.OPCODE_NAMES[opcode] + " " + str;
+        return org.apache.commons.bcel6.Constants.OPCODE_NAMES[super.getOpcode()] + " " + str;
     }
 
 
@@ -106,7 +110,7 @@ public abstract class CPInstruction exte
     @Override
     protected void initFromFile( ByteSequence bytes, boolean wide ) throws IOException {
         setIndex(bytes.readUnsignedShort());
-        length = 3;
+        super.setLength(3);
     }