You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by se...@apache.org on 2015/08/10 16:09:40 UTC

svn commit: r1695079 - in /commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6: classfile/ generic/

Author: sebb
Date: Mon Aug 10 14:09:39 2015
New Revision: 1695079

URL: http://svn.apache.org/r1695079
Log:
Use getters/setters where they exist

Modified:
    commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/BootstrapMethods.java
    commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Code.java
    commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ConstantCP.java
    commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ConstantClass.java
    commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ConstantDouble.java
    commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ConstantFloat.java
    commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ConstantInteger.java
    commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ConstantLong.java
    commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ConstantMethodHandle.java
    commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ConstantMethodType.java
    commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ConstantNameAndType.java
    commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ConstantString.java
    commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ConstantUtf8.java
    commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ConstantValue.java
    commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Deprecated.java
    commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/EnclosingMethod.java
    commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ExceptionTable.java
    commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Field.java
    commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/FieldOrMethod.java
    commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/InnerClasses.java
    commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/JavaClass.java
    commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/LineNumberTable.java
    commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/LocalVariableTable.java
    commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/LocalVariableTypeTable.java
    commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Method.java
    commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/MethodParameters.java
    commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/PMGClass.java
    commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Signature.java
    commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/SourceFile.java
    commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/StackMap.java
    commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/StackMapTable.java
    commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Synthetic.java
    commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Unknown.java
    commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ClassGen.java
    commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/FieldGen.java
    commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/MethodGen.java

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/BootstrapMethods.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/BootstrapMethods.java?rev=1695079&r1=1695078&r2=1695079&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/BootstrapMethods.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/BootstrapMethods.java Mon Aug 10 14:09:39 2015
@@ -107,7 +107,7 @@ public class BootstrapMethods extends At
         for (int i = 0; i < bootstrap_methods.length; i++) {
             c.bootstrap_methods[i] = bootstrap_methods[i].copy();
         }
-        c.constant_pool = _constant_pool;
+        c.setConstantPool(_constant_pool);
         return c;
     }
 
@@ -138,7 +138,7 @@ public class BootstrapMethods extends At
         buf.append("):\n");
         for (int i = 0; i < bootstrap_methods.length; i++) {
             buf.append("  ").append(i).append(": ");
-            buf.append(bootstrap_methods[i].toString(constant_pool)).append("\n");
+            buf.append(bootstrap_methods[i].toString(super.getConstantPool())).append("\n");
         }
         return buf.toString();
     }

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Code.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Code.java?rev=1695079&r1=1695078&r2=1695079&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Code.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Code.java Mon Aug 10 14:09:39 2015
@@ -96,7 +96,7 @@ public final class Code extends Attribut
          * is incorrect, because it didn't take the internal attributes
          * into account yet! Very subtle bug, fixed in 3.1.1.
          */
-        this.length = length;
+        super.setLength(length);
     }
 
 
@@ -247,7 +247,7 @@ public final class Code extends Attribut
         int len = 0;
         if (attributes != null) {
             for (Attribute attribute : attributes) {
-                len += attribute.length + 6 /*attribute header size*/;
+                len += attribute.getLength() + 6 /*attribute header size*/;
             }
         }
         return len + getInternalLength();
@@ -259,7 +259,7 @@ public final class Code extends Attribut
      */
     public final void setAttributes( Attribute[] attributes ) {
         this.attributes = attributes != null ? attributes : new Attribute[0];
-        length = calculateLength(); // Adjust length
+        super.setLength(calculateLength()); // Adjust length
     }
 
 
@@ -268,7 +268,7 @@ public final class Code extends Attribut
      */
     public final void setCode( byte[] code ) {
         this.code = code != null ? code : new byte[0];
-        length = calculateLength(); // Adjust length
+        super.setLength(calculateLength()); // Adjust length
     }
 
 
@@ -277,7 +277,7 @@ public final class Code extends Attribut
      */
     public final void setExceptionTable( CodeException[] exception_table ) {
         this.exception_table = exception_table != null ? exception_table : new CodeException[0];
-        length = calculateLength(); // Adjust length
+        super.setLength(calculateLength()); // Adjust length
     }
 
 
@@ -304,11 +304,11 @@ public final class Code extends Attribut
         StringBuilder buf = new StringBuilder(100);
         buf.append("Code(max_stack = ").append(max_stack).append(", max_locals = ").append(
                 max_locals).append(", code_length = ").append(code.length).append(")\n").append(
-                Utility.codeToString(code, constant_pool, 0, -1, verbose));
+                Utility.codeToString(code, super.getConstantPool(), 0, -1, verbose));
         if (exception_table.length > 0) {
             buf.append("\nException handler(s) = \n").append("From\tTo\tHandler\tType\n");
             for (CodeException exception : exception_table) {
-                buf.append(exception.toString(constant_pool, verbose)).append("\n");
+                buf.append(exception.toString(super.getConstantPool(), verbose)).append("\n");
             }
         }
         if (attributes.length > 0) {
@@ -342,7 +342,7 @@ public final class Code extends Attribut
             c.code = new byte[code.length];
             System.arraycopy(code, 0, c.code, 0, code.length);
         }
-        c.constant_pool = _constant_pool;
+        c.setConstantPool(_constant_pool);
         c.exception_table = new CodeException[exception_table.length];
         for (int i = 0; i < exception_table.length; i++) {
             c.exception_table[i] = exception_table[i].copy();

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ConstantCP.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ConstantCP.java?rev=1695079&r1=1695078&r2=1695079&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ConstantCP.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ConstantCP.java Mon Aug 10 14:09:39 2015
@@ -85,7 +85,7 @@ public abstract class ConstantCP extends
      */
     @Override
     public final void dump( DataOutputStream file ) throws IOException {
-        file.writeByte(tag);
+        file.writeByte(super.getTag());
         file.writeShort(class_index);
         file.writeShort(name_and_type_index);
     }

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ConstantClass.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ConstantClass.java?rev=1695079&r1=1695078&r2=1695079&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ConstantClass.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ConstantClass.java Mon Aug 10 14:09:39 2015
@@ -88,7 +88,7 @@ public final class ConstantClass extends
      */
     @Override
     public final void dump( DataOutputStream file ) throws IOException {
-        file.writeByte(tag);
+        file.writeByte(super.getTag());
         file.writeShort(name_index);
     }
 

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ConstantDouble.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ConstantDouble.java?rev=1695079&r1=1695078&r2=1695079&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ConstantDouble.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ConstantDouble.java Mon Aug 10 14:09:39 2015
@@ -87,7 +87,7 @@ public final class ConstantDouble extend
      */
     @Override
     public final void dump( DataOutputStream file ) throws IOException {
-        file.writeByte(tag);
+        file.writeByte(super.getTag());
         file.writeDouble(bytes);
     }
 

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ConstantFloat.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ConstantFloat.java?rev=1695079&r1=1695078&r2=1695079&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ConstantFloat.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ConstantFloat.java Mon Aug 10 14:09:39 2015
@@ -88,7 +88,7 @@ public final class ConstantFloat extends
      */
     @Override
     public final void dump( DataOutputStream file ) throws IOException {
-        file.writeByte(tag);
+        file.writeByte(super.getTag());
         file.writeFloat(bytes);
     }
 

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ConstantInteger.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ConstantInteger.java?rev=1695079&r1=1695078&r2=1695079&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ConstantInteger.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ConstantInteger.java Mon Aug 10 14:09:39 2015
@@ -87,7 +87,7 @@ public final class ConstantInteger exten
      */
     @Override
     public final void dump( DataOutputStream file ) throws IOException {
-        file.writeByte(tag);
+        file.writeByte(super.getTag());
         file.writeInt(bytes);
     }
 

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ConstantLong.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ConstantLong.java?rev=1695079&r1=1695078&r2=1695079&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ConstantLong.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ConstantLong.java Mon Aug 10 14:09:39 2015
@@ -87,7 +87,7 @@ public final class ConstantLong extends
      */
     @Override
     public final void dump( DataOutputStream file ) throws IOException {
-        file.writeByte(tag);
+        file.writeByte(super.getTag());
         file.writeLong(bytes);
     }
 

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ConstantMethodHandle.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ConstantMethodHandle.java?rev=1695079&r1=1695078&r2=1695079&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ConstantMethodHandle.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ConstantMethodHandle.java Mon Aug 10 14:09:39 2015
@@ -85,7 +85,7 @@ public final class ConstantMethodHandle
      */
     @Override
     public final void dump( DataOutputStream file ) throws IOException {
-        file.writeByte(tag);
+        file.writeByte(super.getTag());
         file.writeByte(reference_kind);
         file.writeShort(reference_index);
     }

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ConstantMethodType.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ConstantMethodType.java?rev=1695079&r1=1695078&r2=1695079&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ConstantMethodType.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ConstantMethodType.java Mon Aug 10 14:09:39 2015
@@ -83,7 +83,7 @@ public final class ConstantMethodType ex
      */
     @Override
     public final void dump( DataOutputStream file ) throws IOException {
-        file.writeByte(tag);
+        file.writeByte(super.getTag());
         file.writeShort(descriptor_index);
     }
 

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ConstantNameAndType.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ConstantNameAndType.java?rev=1695079&r1=1695078&r2=1695079&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ConstantNameAndType.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ConstantNameAndType.java Mon Aug 10 14:09:39 2015
@@ -91,7 +91,7 @@ public final class ConstantNameAndType e
      */
     @Override
     public final void dump( DataOutputStream file ) throws IOException {
-        file.writeByte(tag);
+        file.writeByte(super.getTag());
         file.writeShort(name_index);
         file.writeShort(signature_index);
     }

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ConstantString.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ConstantString.java?rev=1695079&r1=1695078&r2=1695079&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ConstantString.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ConstantString.java Mon Aug 10 14:09:39 2015
@@ -87,7 +87,7 @@ public final class ConstantString extend
      */
     @Override
     public final void dump( DataOutputStream file ) throws IOException {
-        file.writeByte(tag);
+        file.writeByte(super.getTag());
         file.writeShort(string_index);
     }
 

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ConstantUtf8.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ConstantUtf8.java?rev=1695079&r1=1695078&r2=1695079&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ConstantUtf8.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ConstantUtf8.java Mon Aug 10 14:09:39 2015
@@ -170,7 +170,7 @@ public final class ConstantUtf8 extends
      */
     @Override
     public final void dump( DataOutputStream file ) throws IOException {
-        file.writeByte(tag);
+        file.writeByte(super.getTag());
         file.writeUTF(bytes);
     }
 

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ConstantValue.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ConstantValue.java?rev=1695079&r1=1695078&r2=1695079&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ConstantValue.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ConstantValue.java Mon Aug 10 14:09:39 2015
@@ -121,7 +121,7 @@ public final class ConstantValue extends
      */
     @Override
     public final String toString() {
-        Constant c = constant_pool.getConstant(constantvalue_index);
+        Constant c = super.getConstantPool().getConstant(constantvalue_index);
         String buf;
         int i;
         // Print constant to string depending on its type
@@ -140,7 +140,7 @@ public final class ConstantValue extends
                 break;
             case Constants.CONSTANT_String:
                 i = ((ConstantString) c).getStringIndex();
-                c = constant_pool.getConstant(i, Constants.CONSTANT_Utf8);
+                c = super.getConstantPool().getConstant(i, Constants.CONSTANT_Utf8);
                 buf = "\"" + Utility.convertString(((ConstantUtf8) c).getBytes()) + "\"";
                 break;
             default:
@@ -156,7 +156,7 @@ public final class ConstantValue extends
     @Override
     public Attribute copy( ConstantPool _constant_pool ) {
         ConstantValue c = (ConstantValue) clone();
-        c.constant_pool = _constant_pool;
+        c.setConstantPool(_constant_pool);
         return c;
     }
 }

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Deprecated.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Deprecated.java?rev=1695079&r1=1695078&r2=1695079&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Deprecated.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Deprecated.java Mon Aug 10 14:09:39 2015
@@ -101,8 +101,8 @@ public final class Deprecated extends At
     @Override
     public final void dump( DataOutputStream file ) throws IOException {
         super.dump(file);
-        if (length > 0) {
-            file.write(bytes, 0, length);
+        if (super.getLength() > 0) {
+            file.write(bytes, 0, super.getLength());
         }
     }
 
@@ -142,7 +142,7 @@ public final class Deprecated extends At
             c.bytes = new byte[bytes.length];
             System.arraycopy(bytes, 0, c.bytes, 0, bytes.length);
         }
-        c.constant_pool = _constant_pool;
+        c.setConstantPool(_constant_pool);
         return c;
     }
 }

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/EnclosingMethod.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/EnclosingMethod.java?rev=1695079&r1=1695078&r2=1695079&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/EnclosingMethod.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/EnclosingMethod.java Mon Aug 10 14:09:39 2015
@@ -78,7 +78,7 @@ public class EnclosingMethod extends Att
 
     public final ConstantClass getEnclosingClass() {
         ConstantClass c = 
-            (ConstantClass)constant_pool.getConstant(classIndex,Constants.CONSTANT_Class);
+            (ConstantClass)super.getConstantPool().getConstant(classIndex,Constants.CONSTANT_Class);
         return c;
     }
 
@@ -87,7 +87,7 @@ public class EnclosingMethod extends Att
             return null;
         }
         ConstantNameAndType nat = 
-            (ConstantNameAndType)constant_pool.getConstant(methodIndex,Constants.CONSTANT_NameAndType);
+            (ConstantNameAndType)super.getConstantPool().getConstant(methodIndex,Constants.CONSTANT_NameAndType);
         return nat;
     }
 

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ExceptionTable.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ExceptionTable.java?rev=1695079&r1=1695078&r2=1695079&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ExceptionTable.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ExceptionTable.java Mon Aug 10 14:09:39 2015
@@ -133,7 +133,7 @@ public final class ExceptionTable extend
     public final String[] getExceptionNames() {
         String[] names = new String[exception_index_table.length];
         for (int i = 0; i < exception_index_table.length; i++) {
-            names[i] = constant_pool.getConstantString(exception_index_table[i], 
+            names[i] = super.getConstantPool().getConstantString(exception_index_table[i], 
                     Constants.CONSTANT_Class).replace('/', '.');
         }
         return names;
@@ -157,7 +157,7 @@ public final class ExceptionTable extend
         StringBuilder buf = new StringBuilder();
         String str;
         for (int i = 0; i < exception_index_table.length; i++) {
-            str = constant_pool.getConstantString(exception_index_table[i], Constants.CONSTANT_Class);
+            str = super.getConstantPool().getConstantString(exception_index_table[i], Constants.CONSTANT_Class);
             buf.append(Utility.compactClassName(str, false));
             if (i < exception_index_table.length - 1) {
                 buf.append(", ");
@@ -178,7 +178,7 @@ public final class ExceptionTable extend
             System.arraycopy(exception_index_table, 0, c.exception_index_table, 0,
                     exception_index_table.length);
         }
-        c.constant_pool = _constant_pool;
+        c.setConstantPool(_constant_pool);
         return c;
     }
 }

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Field.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Field.java?rev=1695079&r1=1695078&r2=1695079&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Field.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Field.java Mon Aug 10 14:09:39 2015
@@ -118,7 +118,7 @@ public final class Field extends FieldOr
     public final String toString() {
         String name, signature, access; // Short cuts to constant pool
         // Get names from constant pool
-        access = Utility.accessToString(access_flags);
+        access = Utility.accessToString(super.getAccessFlags());
         access = access.equals("") ? "" : (access + " ");
         signature = Utility.signatureToString(getSignature());
         name = getName();

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/FieldOrMethod.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/FieldOrMethod.java?rev=1695079&r1=1695078&r2=1695079&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/FieldOrMethod.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/FieldOrMethod.java Mon Aug 10 14:09:39 2015
@@ -94,7 +94,7 @@ public abstract class FieldOrMethod exte
      */
     protected FieldOrMethod(int access_flags, int name_index, int signature_index,
             Attribute[] attributes, ConstantPool constant_pool) {
-        this.access_flags = access_flags;
+        super.setAccessFlags(access_flags);
         this.name_index = name_index;
         this.signature_index = signature_index;
         this.constant_pool = constant_pool;
@@ -109,7 +109,7 @@ public abstract class FieldOrMethod exte
      * @throws IOException
      */
     public final void dump( DataOutputStream file ) throws IOException {
-        file.writeShort(access_flags);
+        file.writeShort(super.getAccessFlags());
         file.writeShort(name_index);
         file.writeShort(signature_index);
         file.writeShort(attributes.length);

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/InnerClasses.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/InnerClasses.java?rev=1695079&r1=1695078&r2=1695079&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/InnerClasses.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/InnerClasses.java Mon Aug 10 14:09:39 2015
@@ -133,7 +133,7 @@ public final class InnerClasses extends
     public final String toString() {
         StringBuilder buf = new StringBuilder();
         for (InnerClass inner_class : inner_classes) {
-            buf.append(inner_class.toString(constant_pool)).append("\n");
+            buf.append(inner_class.toString(super.getConstantPool())).append("\n");
         }
         return buf.toString();
     }
@@ -149,7 +149,7 @@ public final class InnerClasses extends
         for (int i = 0; i < inner_classes.length; i++) {
             c.inner_classes[i] = inner_classes[i].copy();
         }
-        c.constant_pool = _constant_pool;
+        c.setConstantPool(_constant_pool);
         return c;
     }
 }

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/JavaClass.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/JavaClass.java?rev=1695079&r1=1695078&r2=1695079&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/JavaClass.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/JavaClass.java Mon Aug 10 14:09:39 2015
@@ -136,7 +136,7 @@ public class JavaClass extends AccessFla
         this.file_name = file_name;
         this.major = major;
         this.minor = minor;
-        this.access_flags = access_flags;
+        super.setAccessFlags(access_flags);
         this.constant_pool = constant_pool;
         this.interfaces = interfaces;
         this.fields = fields;
@@ -300,7 +300,7 @@ public class JavaClass extends AccessFla
         file.writeShort(minor);
         file.writeShort(major);
         constant_pool.dump(file);
-        file.writeShort(access_flags);
+        file.writeShort(super.getAccessFlags());
         file.writeShort(class_name_index);
         file.writeShort(superclass_name_index);
         file.writeShort(interfaces.length);
@@ -600,10 +600,10 @@ public class JavaClass extends AccessFla
      */
     @Override
     public String toString() {
-        String access = Utility.accessToString(access_flags, true);
+        String access = Utility.accessToString(super.getAccessFlags(), true);
         access = access.equals("") ? "" : (access + " ");
         StringBuilder buf = new StringBuilder(128);
-        buf.append(access).append(Utility.classOrInterface(access_flags)).append(" ").append(
+        buf.append(access).append(Utility.classOrInterface(super.getAccessFlags())).append(" ").append(
                 class_name).append(" extends ").append(
                 Utility.compactClassName(superclass_name, false)).append('\n');
         int size = interfaces.length;
@@ -620,7 +620,7 @@ public class JavaClass extends AccessFla
         buf.append("filename\t\t").append(file_name).append('\n');
         buf.append("compiled from\t\t").append(source_file_name).append('\n');
         buf.append("compiler version\t").append(major).append(".").append(minor).append('\n');
-        buf.append("access flags\t\t").append(access_flags).append('\n');
+        buf.append("access flags\t\t").append(super.getAccessFlags()).append('\n');
         buf.append("constant pool\t\t").append(constant_pool.getLength()).append(" entries\n");
         buf.append("ACC_SUPER flag\t\t").append(isSuper()).append("\n");
         if (attributes.length > 0) {
@@ -691,12 +691,12 @@ public class JavaClass extends AccessFla
 
 
     public final boolean isSuper() {
-        return (access_flags & Constants.ACC_SUPER) != 0;
+        return (super.getAccessFlags() & Constants.ACC_SUPER) != 0;
     }
 
 
     public final boolean isClass() {
-        return (access_flags & Constants.ACC_INTERFACE) == 0;
+        return (super.getAccessFlags() & Constants.ACC_INTERFACE) == 0;
     }
 
     public final boolean isAnonymous() {

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/LineNumberTable.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/LineNumberTable.java?rev=1695079&r1=1695078&r2=1695079&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/LineNumberTable.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/LineNumberTable.java Mon Aug 10 14:09:39 2015
@@ -202,7 +202,7 @@ public final class LineNumberTable exten
         for (int i = 0; i < line_number_table.length; i++) {
             c.line_number_table[i] = line_number_table[i].copy();
         }
-        c.constant_pool = _constant_pool;
+        c.setConstantPool(_constant_pool);
         return c;
     }
 

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/LocalVariableTable.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/LocalVariableTable.java?rev=1695079&r1=1695078&r2=1695079&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/LocalVariableTable.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/LocalVariableTable.java Mon Aug 10 14:09:39 2015
@@ -188,7 +188,7 @@ public class LocalVariableTable extends
         for (int i = 0; i < local_variable_table.length; i++) {
             c.local_variable_table[i] = local_variable_table[i].copy();
         }
-        c.constant_pool = _constant_pool;
+        c.setConstantPool(_constant_pool);
         return c;
     }
 

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/LocalVariableTypeTable.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/LocalVariableTypeTable.java?rev=1695079&r1=1695078&r2=1695079&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/LocalVariableTypeTable.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/LocalVariableTypeTable.java Mon Aug 10 14:09:39 2015
@@ -142,7 +142,7 @@ public class LocalVariableTypeTable exte
             c.local_variable_type_table[i] = local_variable_type_table[i].copy();
         }
 
-        c.constant_pool = constant_pool;
+        c.setConstantPool(constant_pool);
         return c;
     }
 

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Method.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Method.java?rev=1695079&r1=1695078&r2=1695079&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Method.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Method.java Mon Aug 10 14:09:39 2015
@@ -170,7 +170,7 @@ public final class Method extends FieldO
         ConstantUtf8 c;
         String name, signature, access; // Short cuts to constant pool
         StringBuilder buf;
-        access = Utility.accessToString(access_flags);
+        access = Utility.accessToString(super.getAccessFlags());
         // Get name and signature from constant pool
         c = (ConstantUtf8) constant_pool.getConstant(signature_index, Constants.CONSTANT_Utf8);
         signature = c.getBytes();

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/MethodParameters.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/MethodParameters.java?rev=1695079&r1=1695078&r2=1695079&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/MethodParameters.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/MethodParameters.java Mon Aug 10 14:09:39 2015
@@ -67,7 +67,7 @@ public class MethodParameters extends At
         for (int i = 0; i < parameters.length; i++) {
             c.parameters[i] = parameters[i].copy();
         }
-        c.constant_pool = _constant_pool;
+        c.setConstantPool(_constant_pool);
         return c;
     }
 

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/PMGClass.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/PMGClass.java?rev=1695079&r1=1695078&r2=1695079&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/PMGClass.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/PMGClass.java Mon Aug 10 14:09:39 2015
@@ -139,7 +139,7 @@ public final class PMGClass extends Attr
      * @return PMG name.
      */
     public final String getPMGName() {
-        ConstantUtf8 c = (ConstantUtf8) constant_pool.getConstant(pmg_index,
+        ConstantUtf8 c = (ConstantUtf8) super.getConstantPool().getConstant(pmg_index,
                 Constants.CONSTANT_Utf8);
         return c.getBytes();
     }
@@ -149,7 +149,7 @@ public final class PMGClass extends Attr
      * @return PMG class name.
      */
     public final String getPMGClassName() {
-        ConstantUtf8 c = (ConstantUtf8) constant_pool.getConstant(pmg_class_index,
+        ConstantUtf8 c = (ConstantUtf8) super.getConstantPool().getConstant(pmg_class_index,
                 Constants.CONSTANT_Utf8);
         return c.getBytes();
     }

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Signature.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Signature.java?rev=1695079&r1=1695078&r2=1695079&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Signature.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Signature.java Mon Aug 10 14:09:39 2015
@@ -120,7 +120,7 @@ public final class Signature extends Att
      * @return GJ signature.
      */
     public final String getSignature() {
-        ConstantUtf8 c = (ConstantUtf8) constant_pool.getConstant(signature_index,
+        ConstantUtf8 c = (ConstantUtf8) super.getConstantPool().getConstant(signature_index,
                 Constants.CONSTANT_Utf8);
         return c.getBytes();
     }

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/SourceFile.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/SourceFile.java?rev=1695079&r1=1695078&r2=1695079&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/SourceFile.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/SourceFile.java Mon Aug 10 14:09:39 2015
@@ -127,7 +127,7 @@ public final class SourceFile extends At
      * @return Source file name.
      */
     public final String getSourceFileName() {
-        ConstantUtf8 c = (ConstantUtf8) constant_pool.getConstant(sourcefile_index,
+        ConstantUtf8 c = (ConstantUtf8) super.getConstantPool().getConstant(sourcefile_index,
                 Constants.CONSTANT_Utf8);
         return c.getBytes();
     }

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/StackMap.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/StackMap.java?rev=1695079&r1=1695078&r2=1695079&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/StackMap.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/StackMap.java Mon Aug 10 14:09:39 2015
@@ -134,7 +134,7 @@ public final class StackMap extends Attr
         for (int i = 0; i < map.length; i++) {
             c.map[i] = map[i].copy();
         }
-        c.constant_pool = _constant_pool;
+        c.setConstantPool(_constant_pool);
         return c;
     }
 

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/StackMapTable.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/StackMapTable.java?rev=1695079&r1=1695078&r2=1695079&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/StackMapTable.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/StackMapTable.java Mon Aug 10 14:09:39 2015
@@ -134,7 +134,7 @@ public final class StackMapTable extends
         for (int i = 0; i < map.length; i++) {
             c.map[i] = map[i].copy();
         }
-        c.constant_pool = _constant_pool;
+        c.setConstantPool(_constant_pool);
         return c;
     }
 

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Synthetic.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Synthetic.java?rev=1695079&r1=1695078&r2=1695079&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Synthetic.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Synthetic.java Mon Aug 10 14:09:39 2015
@@ -107,8 +107,8 @@ public final class Synthetic extends Att
     @Override
     public final void dump( DataOutputStream file ) throws IOException {
         super.dump(file);
-        if (length > 0) {
-            file.write(bytes, 0, length);
+        if (super.getLength() > 0) {
+            file.write(bytes, 0, super.getLength());
         }
     }
 
@@ -135,7 +135,7 @@ public final class Synthetic extends Att
     @Override
     public final String toString() {
         StringBuilder buf = new StringBuilder("Synthetic");
-        if (length > 0) {
+        if (super.getLength() > 0) {
             buf.append(" ").append(Utility.toHexString(bytes));
         }
         return buf.toString();
@@ -152,7 +152,7 @@ public final class Synthetic extends Att
             c.bytes = new byte[bytes.length];
             System.arraycopy(bytes, 0, c.bytes, 0, bytes.length);
         }
-        c.constant_pool = _constant_pool;
+        c.setConstantPool(_constant_pool);
         return c;
     }
 }

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Unknown.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Unknown.java?rev=1695079&r1=1695078&r2=1695079&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Unknown.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Unknown.java Mon Aug 10 14:09:39 2015
@@ -124,8 +124,8 @@ public final class Unknown extends Attri
     @Override
     public final void dump( DataOutputStream file ) throws IOException {
         super.dump(file);
-        if (length > 0) {
-            file.write(bytes, 0, length);
+        if (super.getLength() > 0) {
+            file.write(bytes, 0, super.getLength());
         }
     }
 
@@ -160,11 +160,11 @@ public final class Unknown extends Attri
      */
     @Override
     public final String toString() {
-        if (length == 0 || bytes == null) {
+        if (super.getLength() == 0 || bytes == null) {
             return "(Unknown attribute " + name + ")";
         }
         String hex;
-        if (length > 10) {
+        if (super.getLength() > 10) {
             byte[] tmp = new byte[10];
             System.arraycopy(bytes, 0, tmp, 0, 10);
             hex = Utility.toHexString(tmp) + "... (truncated)";
@@ -185,7 +185,7 @@ public final class Unknown extends Attri
             c.bytes = new byte[bytes.length];
             System.arraycopy(bytes, 0, c.bytes, 0, bytes.length);
         }
-        c.constant_pool = _constant_pool;
+        c.setConstantPool(_constant_pool);
         return c;
     }
 }

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ClassGen.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ClassGen.java?rev=1695079&r1=1695078&r2=1695079&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ClassGen.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ClassGen.java Mon Aug 10 14:09:39 2015
@@ -89,7 +89,7 @@ public class ClassGen extends AccessFlag
         this.class_name = class_name;
         this.super_class_name = super_class_name;
         this.file_name = file_name;
-        this.access_flags = access_flags;
+        super.setAccessFlags(access_flags);
         this.cp = cp;
         // Put everything needed by default into the constant pool and the vectors
         if (file_name != null) {
@@ -131,7 +131,7 @@ public class ClassGen extends AccessFlag
         class_name = clazz.getClassName();
         super_class_name = clazz.getSuperclassName();
         file_name = clazz.getSourceFileName();
-        access_flags = clazz.getAccessFlags();
+        super.setAccessFlags(clazz.getAccessFlags());
         cp = new ConstantPoolGen(clazz.getConstantPool());
         major = clazz.getMajor();
         minor = clazz.getMinor();
@@ -211,7 +211,7 @@ public class ClassGen extends AccessFlag
         // Must be last since the above calls may still add something to it
         ConstantPool _cp = this.cp.getFinalConstantPool();
         return new JavaClass(class_name_index, superclass_name_index, file_name, major, minor,
-                access_flags, _cp, interfaces, fields, methods, attributes);
+                super.getAccessFlags(), _cp, interfaces, fields, methods, attributes);
     }
 
 

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/FieldGen.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/FieldGen.java?rev=1695079&r1=1695078&r2=1695079&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/FieldGen.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/FieldGen.java Mon Aug 10 14:09:39 2015
@@ -222,7 +222,7 @@ public class FieldGen extends FieldGenOr
                     .getConstantPool()));
         }
         addAnnotationsAsAttribute(cp);
-        return new Field(access_flags, name_index, signature_index, getAttributes(), cp
+        return new Field(super.getAccessFlags(), name_index, signature_index, getAttributes(), cp
                 .getConstantPool());
     }
 
@@ -314,7 +314,7 @@ public class FieldGen extends FieldGenOr
     @Override
     public final String toString() {
         String name, signature, access; // Short cuts to constant pool
-        access = Utility.accessToString(access_flags);
+        access = Utility.accessToString(super.getAccessFlags());
         access = access.equals("") ? "" : (access + " ");
         signature = type.toString();
         name = getName();

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/MethodGen.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/MethodGen.java?rev=1695079&r1=1695078&r2=1695079&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/MethodGen.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/MethodGen.java Mon Aug 10 14:09:39 2015
@@ -685,7 +685,7 @@ public class MethodGen extends FieldGenO
             addAttribute(et = getExceptionTable(cp));
             // Add `Exceptions' if there are "throws" clauses
         }
-        Method m = new Method(access_flags, name_index, signature_index, getAttributes(), cp
+        Method m = new Method(super.getAccessFlags(), name_index, signature_index, getAttributes(), cp
                 .getConstantPool());
         // Undo effects of adding attributes
         if (lvt != null) {
@@ -1050,7 +1050,7 @@ public class MethodGen extends FieldGenO
      */
     @Override
     public final String toString() {
-        String access = Utility.accessToString(access_flags);
+        String access = Utility.accessToString(super.getAccessFlags());
         String signature = Type.getMethodSignature(type, arg_types);
         signature = Utility.methodSignatureToString(signature, name, access, true,
                 getLocalVariableTable(cp));