src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/Deprecated.java

@@ -16,65 +16,64 @@
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package com.sun.org.apache.bcel.internal.classfile;
 
+import java.io.DataInput;
+import java.io.DataOutputStream;
+import java.io.IOException;
 
-import  com.sun.org.apache.bcel.internal.Constants;
-import  java.io.*;
+import com.sun.org.apache.bcel.internal.Const;
 
 /**
  * This class is derived from <em>Attribute</em> and denotes that this is a
- * deprecated method.
- * It is instantiated from the <em>Attribute.readAttribute()</em> method.
+ * deprecated method. It is instantiated from the
+ * <em>Attribute.readAttribute()</em> method.
  *
- * @author  <A HREF="mailto:markus.dahm@berlin.de">M. Dahm</A>
+ * @version $Id: Deprecated.java 1749603 2016-06-21 20:50:19Z ggregory $
  * @see     Attribute
  */
 public final class Deprecated extends Attribute {
+
   private byte[] bytes;
 
   /**
    * Initialize from another object. Note that both objects use the same
    * references (shallow copy). Use clone() for a physical copy.
    */
-  public Deprecated(Deprecated c) {
+    public Deprecated(final Deprecated c) {
     this(c.getNameIndex(), c.getLength(), c.getBytes(), c.getConstantPool());
   }
 
   /**
    * @param name_index Index in constant pool to CONSTANT_Utf8
    * @param length Content length in bytes
    * @param bytes Attribute contents
    * @param constant_pool Array of constants
    */
-  public Deprecated(int name_index, int length, byte[] bytes,
-                    ConstantPool constant_pool)
-  {
-    super(Constants.ATTR_DEPRECATED, name_index, length, constant_pool);
+    public Deprecated(final int name_index, final int length, final byte[] bytes, final ConstantPool constant_pool) {
+        super(Const.ATTR_DEPRECATED, name_index, length, constant_pool);
     this.bytes = bytes;
   }
 
   /**
-   * Construct object from file stream.
+     * Construct object from input stream.
+     *
    * @param name_index Index in constant pool to CONSTANT_Utf8
    * @param length Content length in bytes
-   * @param file Input stream
+     * @param input Input stream
    * @param constant_pool Array of constants
    * @throws IOException
    */
-  Deprecated(int name_index, int length, DataInputStream file,
-             ConstantPool constant_pool) throws IOException
-  {
-    this(name_index, length, (byte [])null, constant_pool);
-
-    if(length > 0) {
+    Deprecated(final int name_index, final int length, final DataInput input, final ConstantPool constant_pool)
+            throws IOException {
+        this(name_index, length, (byte[]) null, constant_pool);
+        if (length > 0) {
       bytes = new byte[length];
-      file.readFully(bytes);
+            input.readFully(bytes);
       System.err.println("Deprecated attribute with length > 0");
     }
   }
 
   /**

@@ -82,55 +81,60 @@
    * defined by the contents of a Java class. I.e., the hierarchy of methods,
    * fields, attributes, etc. spawns a tree of objects.
    *
    * @param v Visitor object
    */
-  public void accept(Visitor v) {
+    @Override
+    public void accept(final Visitor v) {
     v.visitDeprecated(this);
   }
 
   /**
    * Dump source file attribute to file stream in binary format.
    *
    * @param file Output file stream
    * @throws IOException
    */
-  public final void dump(DataOutputStream file) throws IOException
-  {
+    @Override
+    public final void dump(final 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());
+        }
   }
 
   /**
    * @return data bytes.
    */
-  public final byte[] getBytes() { return bytes; }
+    public final byte[] getBytes() {
+        return bytes;
+    }
 
   /**
-   * @param bytes.
+     * @param bytes the raw bytes that represents this byte array
    */
-  public final void setBytes(byte[] bytes) {
+    public final void setBytes(final byte[] bytes) {
     this.bytes = bytes;
   }
 
   /**
    * @return attribute name
    */
+    @Override
   public final String toString() {
-    return Constants.ATTRIBUTE_NAMES[Constants.ATTR_DEPRECATED];
+        return Const.getAttributeName(Const.ATTR_DEPRECATED);
   }
 
   /**
    * @return deep copy of this attribute
    */
-  public Attribute copy(ConstantPool constant_pool) {
-    Deprecated c = (Deprecated)clone();
-
-    if(bytes != null)
-      c.bytes = (byte[])bytes.clone();
-
-    c.constant_pool = constant_pool;
+    @Override
+    public Attribute copy(final ConstantPool _constant_pool) {
+        final Deprecated c = (Deprecated) clone();
+        if (bytes != null) {
+            c.bytes = new byte[bytes.length];
+            System.arraycopy(bytes, 0, c.bytes, 0, bytes.length);
+        }
+        c.setConstantPool(_constant_pool);
     return c;
   }
 }