--- old/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantNameAndType.java	2020-01-16 18:00:39.166288494 +0000
+++ new/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantNameAndType.java	2020-01-16 18:00:38.676276458 +0000
@@ -32,7 +32,6 @@
  * and represents a reference to the name and signature
  * of a field or method.
  *
- * @version $Id$
  * @see     Constant
  */
 public final class ConstantNameAndType extends Constant {
@@ -91,7 +90,7 @@
      * @throws IOException
      */
     @Override
-    public final void dump( final DataOutputStream file ) throws IOException {
+    public void dump( final DataOutputStream file ) throws IOException {
         file.writeByte(super.getTag());
         file.writeShort(name_index);
         file.writeShort(signature_index);
@@ -101,14 +100,14 @@
     /**
      * @return Name index in constant pool of field/method name.
      */
-    public final int getNameIndex() {
+    public int getNameIndex() {
         return name_index;
     }
 
 
     /** @return name
      */
-    public final String getName( final ConstantPool cp ) {
+    public String getName( final ConstantPool cp ) {
         return cp.constantToString(getNameIndex(), Const.CONSTANT_Utf8);
     }
 
@@ -116,14 +115,14 @@
     /**
      * @return Index in constant pool of field/method signature.
      */
-    public final int getSignatureIndex() {
+    public int getSignatureIndex() {
         return signature_index;
     }
 
 
     /** @return signature
      */
-    public final String getSignature( final ConstantPool cp ) {
+    public String getSignature( final ConstantPool cp ) {
         return cp.constantToString(getSignatureIndex(), Const.CONSTANT_Utf8);
     }
 
@@ -131,7 +130,7 @@
     /**
      * @param name_index the name index of this constant
      */
-    public final void setNameIndex( final int name_index ) {
+    public void setNameIndex( final int name_index ) {
         this.name_index = name_index;
     }
 
@@ -139,7 +138,7 @@
     /**
      * @param signature_index the signature index in the constant pool of this type
      */
-    public final void setSignatureIndex( final int signature_index ) {
+    public void setSignatureIndex( final int signature_index ) {
         this.signature_index = signature_index;
     }
 
@@ -148,7 +147,7 @@
      * @return String representation
      */
     @Override
-    public final String toString() {
+    public String toString() {
         return super.toString() + "(name_index = " + name_index + ", signature_index = "
                 + signature_index + ")";
     }