svn commit: r1646701 - in /commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile: AnnotationDefault.java Annotations.java EnclosingMethod.java RuntimeVisibleAnnotations.java

[eb...@apache.org]

Author: ebourg
Date: Fri Dec 19 13:16:22 2014
New Revision: 1646701

URL: http://svn.apache.org/r1646701
Log:
Package private constructors for the classes extending Attribute

Modified:
    commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/AnnotationDefault.java
    commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Annotations.java
    commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/EnclosingMethod.java
    commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/RuntimeVisibleAnnotations.java

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/AnnotationDefault.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/AnnotationDefault.java?rev=1646701&r1=1646700&r2=1646701&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/AnnotationDefault.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/AnnotationDefault.java Fri Dec 19 13:16:22 2014
@@ -45,9 +45,7 @@ public class AnnotationDefault extends A
          * @param constant_pool
          *            Array of constants
          */
-        public AnnotationDefault(int name_index, int length,
-                        DataInput input, ConstantPool constant_pool)
-                        throws IOException
+        AnnotationDefault(int name_index, int length, DataInput input, ConstantPool constant_pool) throws IOException
         {
                 this(name_index, length, (ElementValue) null,
                                 constant_pool);

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Annotations.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Annotations.java?rev=1646701&r1=1646700&r2=1646701&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Annotations.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Annotations.java Fri Dec 19 13:16:22 2014
@@ -42,7 +42,7 @@ public abstract class Annotations extend
      * @param input Input stream
      * @param constant_pool Array of constants
      */
-    public Annotations(byte annotation_type, int name_index, int length, DataInput input, ConstantPool constant_pool, boolean isRuntimeVisible) throws IOException {
+    Annotations(byte annotation_type, int name_index, int length, DataInput input, ConstantPool constant_pool, boolean isRuntimeVisible) throws IOException {
         this(annotation_type, name_index, length, (AnnotationEntry[]) null, constant_pool, isRuntimeVisible);
         final int annotation_table_length = (input.readUnsignedShort());
         annotation_table = new AnnotationEntry[annotation_table_length];

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/EnclosingMethod.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/EnclosingMethod.java?rev=1646701&r1=1646700&r2=1646701&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/EnclosingMethod.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/EnclosingMethod.java Fri Dec 19 13:16:22 2014
@@ -45,7 +45,7 @@ public class EnclosingMethod extends Att
     private int methodIndex;
 
     // Ctors - and code to read an attribute in.
-    public EnclosingMethod(int nameIndex, int len, DataInput input, ConstantPool cpool) throws IOException {
+    EnclosingMethod(int nameIndex, int len, DataInput input, ConstantPool cpool) throws IOException {
         this(nameIndex, len, input.readUnsignedShort(), input.readUnsignedShort(), cpool);
     }
 

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/RuntimeVisibleAnnotations.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/RuntimeVisibleAnnotations.java?rev=1646701&r1=1646700&r2=1646701&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/RuntimeVisibleAnnotations.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/RuntimeVisibleAnnotations.java Fri Dec 19 13:16:22 2014
@@ -44,8 +44,7 @@ public class RuntimeVisibleAnnotations e
      * @param constant_pool
      *            Array of constants
      */
-    public RuntimeVisibleAnnotations(int name_index, int length, DataInput input, ConstantPool constant_pool)
-            throws IOException
+    RuntimeVisibleAnnotations(int name_index, int length, DataInput input, ConstantPool constant_pool) throws IOException
     {
         super(Constants.ATTR_RUNTIME_VISIBLE_ANNOTATIONS, name_index, length, input, constant_pool, true);
     }
@@ -56,8 +55,7 @@ public class RuntimeVisibleAnnotations e
     @Override
     public Attribute copy(ConstantPool constant_pool)
     {
-        Annotations c = (Annotations) clone();
-        return c;
+        return (Annotations) clone();
     }
 
     @Override