--- old/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/InnerClass.java	2020-01-16 18:00:53.425638754 +0000
+++ new/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/InnerClass.java	2020-01-16 18:00:52.930626595 +0000
@@ -32,7 +32,6 @@
  * indices of the inner and outer classes, the name and the attributes
  * of the inner class.
  *
- * @version $Id$
  * @see InnerClasses
  */
 public final class InnerClass implements Cloneable, Node {
@@ -97,7 +96,7 @@
      * @param file Output file stream
      * @throws IOException
      */
-    public final void dump( final DataOutputStream file ) throws IOException {
+    public void dump( final DataOutputStream file ) throws IOException {
         file.writeShort(inner_class_index);
         file.writeShort(outer_class_index);
         file.writeShort(inner_name_index);
@@ -108,7 +107,7 @@
     /**
      * @return access flags of inner class.
      */
-    public final int getInnerAccessFlags() {
+    public int getInnerAccessFlags() {
         return inner_access_flags;
     }
 
@@ -116,7 +115,7 @@
     /**
      * @return class index of inner class.
      */
-    public final int getInnerClassIndex() {
+    public int getInnerClassIndex() {
         return inner_class_index;
     }
 
@@ -124,7 +123,7 @@
     /**
      * @return name index of inner class.
      */
-    public final int getInnerNameIndex() {
+    public int getInnerNameIndex() {
         return inner_name_index;
     }
 
@@ -132,7 +131,7 @@
     /**
      * @return class index of outer class.
      */
-    public final int getOuterClassIndex() {
+    public int getOuterClassIndex() {
         return outer_class_index;
     }
 
@@ -140,7 +139,7 @@
     /**
      * @param inner_access_flags access flags for this inner class
      */
-    public final void setInnerAccessFlags( final int inner_access_flags ) {
+    public void setInnerAccessFlags( final int inner_access_flags ) {
         this.inner_access_flags = inner_access_flags;
     }
 
@@ -148,7 +147,7 @@
     /**
      * @param inner_class_index index into the constant pool for this class
      */
-    public final void setInnerClassIndex( final int inner_class_index ) {
+    public void setInnerClassIndex( final int inner_class_index ) {
         this.inner_class_index = inner_class_index;
     }
 
@@ -156,7 +155,7 @@
     /**
      * @param inner_name_index index into the constant pool for this class's name
      */
-    public final void setInnerNameIndex( final int inner_name_index ) { // TODO unused
+    public void setInnerNameIndex( final int inner_name_index ) { // TODO unused
         this.inner_name_index = inner_name_index;
     }
 
@@ -164,7 +163,7 @@
     /**
      * @param outer_class_index index into the constant pool for the owning class
      */
-    public final void setOuterClassIndex( final int outer_class_index ) { // TODO unused
+    public void setOuterClassIndex( final int outer_class_index ) { // TODO unused
         this.outer_class_index = outer_class_index;
     }
 
@@ -173,7 +172,7 @@
      * @return String representation.
      */
     @Override
-    public final String toString() {
+    public String toString() {
         return "InnerClass(" + inner_class_index + ", " + outer_class_index + ", "
                 + inner_name_index + ", " + inner_access_flags + ")";
     }
@@ -182,16 +181,16 @@
     /**
      * @return Resolved string representation
      */
-    public final String toString( final ConstantPool constant_pool ) {
+    public String toString( final ConstantPool constant_pool ) {
         String outer_class_name;
         String inner_name;
         String inner_class_name = constant_pool.getConstantString(inner_class_index,
                 Const.CONSTANT_Class);
-        inner_class_name = Utility.compactClassName(inner_class_name);
+        inner_class_name = Utility.compactClassName(inner_class_name, false);
         if (outer_class_index != 0) {
             outer_class_name = constant_pool.getConstantString(outer_class_index,
                     Const.CONSTANT_Class);
-            outer_class_name = " of class " + Utility.compactClassName(outer_class_name);
+            outer_class_name = " of class " + Utility.compactClassName(outer_class_name, false);
         } else {
             outer_class_name = "";
         }