You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by br...@apache.org on 2016/06/07 17:28:47 UTC

svn commit: r1747278 [2/6] - in /commons/proper/bcel/trunk: ./ src/main/java/org/apache/bcel/classfile/ src/main/java/org/apache/bcel/generic/ src/main/java/org/apache/bcel/util/ src/main/java/org/apache/bcel/verifier/ src/main/java/org/apache/bcel/ver...

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/MethodParameters.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/MethodParameters.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/MethodParameters.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/MethodParameters.java Tue Jun  7 17:28:43 2016
@@ -15,13 +15,13 @@
  *  limitations under the License.
  */
 
-package org.apache.commons.bcel6.classfile;
+package org.apache.bcel.classfile;
 
 import java.io.DataInput;
 import java.io.DataOutputStream;
 import java.io.IOException;
 
-import org.apache.commons.bcel6.Const;
+import org.apache.bcel.Const;
 
 /**
  * This class represents a MethodParameters attribute.

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Node.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Node.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Node.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Node.java Tue Jun  7 17:28:43 2016
@@ -15,7 +15,7 @@
  *  limitations under the License.
  *
  */
-package org.apache.commons.bcel6.classfile;
+package org.apache.bcel.classfile;
 
 /**
  * Denote class to have an accept method();

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/PMGClass.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/PMGClass.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/PMGClass.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/PMGClass.java Tue Jun  7 17:28:43 2016
@@ -15,13 +15,13 @@
  *  limitations under the License.
  *
  */
-package org.apache.commons.bcel6.classfile;
+package org.apache.bcel.classfile;
 
 import java.io.DataInput;
 import java.io.DataOutputStream;
 import java.io.IOException;
 
-import org.apache.commons.bcel6.Const;
+import org.apache.bcel.Const;
 
 /**
  * This class is derived from <em>Attribute</em> and represents a reference

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ParameterAnnotationEntry.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ParameterAnnotationEntry.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ParameterAnnotationEntry.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ParameterAnnotationEntry.java Tue Jun  7 17:28:43 2016
@@ -15,7 +15,7 @@
  *  limitations under the License.
  *
  */
-package org.apache.commons.bcel6.classfile;
+package org.apache.bcel.classfile;
 
 import java.io.DataInput;
 import java.io.DataOutputStream;

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ParameterAnnotations.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ParameterAnnotations.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ParameterAnnotations.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ParameterAnnotations.java Tue Jun  7 17:28:43 2016
@@ -15,7 +15,7 @@
  *  limitations under the License.
  *
  */
-package org.apache.commons.bcel6.classfile;
+package org.apache.bcel.classfile;
 
 import java.io.DataInput;
 import java.io.DataOutputStream;

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/RuntimeInvisibleAnnotations.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/RuntimeInvisibleAnnotations.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/RuntimeInvisibleAnnotations.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/RuntimeInvisibleAnnotations.java Tue Jun  7 17:28:43 2016
@@ -15,13 +15,13 @@
  *  limitations under the License.
  *
  */
-package org.apache.commons.bcel6.classfile;
+package org.apache.bcel.classfile;
 
 import java.io.DataInput;
 import java.io.DataOutputStream;
 import java.io.IOException;
 
-import org.apache.commons.bcel6.Const;
+import org.apache.bcel.Const;
 
 /**
  * represents an annotation that is represented in the class file but is not

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/RuntimeInvisibleParameterAnnotations.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/RuntimeInvisibleParameterAnnotations.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/RuntimeInvisibleParameterAnnotations.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/RuntimeInvisibleParameterAnnotations.java Tue Jun  7 17:28:43 2016
@@ -15,12 +15,12 @@
  *  limitations under the License.
  *
  */
-package org.apache.commons.bcel6.classfile;
+package org.apache.bcel.classfile;
 
 import java.io.DataInput;
 import java.io.IOException;
 
-import org.apache.commons.bcel6.Const;
+import org.apache.bcel.Const;
 
 /**
  * Represents a parameter annotation that is represented in the class file

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=1747278&r1=1747277&r2=1747278&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 Tue Jun  7 17:28:43 2016
@@ -15,13 +15,13 @@
  *  limitations under the License.
  *
  */
-package org.apache.commons.bcel6.classfile;
+package org.apache.bcel.classfile;
 
 import java.io.DataInput;
 import java.io.DataOutputStream;
 import java.io.IOException;
 
-import org.apache.commons.bcel6.Const;
+import org.apache.bcel.Const;
 
 /**
  * represents an annotation that is represented in the class file and is

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/RuntimeVisibleParameterAnnotations.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/RuntimeVisibleParameterAnnotations.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/RuntimeVisibleParameterAnnotations.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/RuntimeVisibleParameterAnnotations.java Tue Jun  7 17:28:43 2016
@@ -15,12 +15,12 @@
  *  limitations under the License.
  *
  */
-package org.apache.commons.bcel6.classfile;
+package org.apache.bcel.classfile;
 
 import java.io.DataInput;
 import java.io.IOException;
 
-import org.apache.commons.bcel6.Const;
+import org.apache.bcel.Const;
 
 /**
  * Represents a parameter annotation that is represented in the class file

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Signature.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Signature.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Signature.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Signature.java Tue Jun  7 17:28:43 2016
@@ -15,14 +15,14 @@
  *  limitations under the License.
  *
  */
-package org.apache.commons.bcel6.classfile;
+package org.apache.bcel.classfile;
 
 import java.io.ByteArrayInputStream;
 import java.io.DataInput;
 import java.io.DataOutputStream;
 import java.io.IOException;
 
-import org.apache.commons.bcel6.Const;
+import org.apache.bcel.Const;
 
 /**
  * This class is derived from <em>Attribute</em> and represents a reference

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/SimpleElementValue.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/SimpleElementValue.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/SimpleElementValue.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/SimpleElementValue.java Tue Jun  7 17:28:43 2016
@@ -15,12 +15,12 @@
  *  limitations under the License.
  *
  */
-package org.apache.commons.bcel6.classfile;
+package org.apache.bcel.classfile;
 
 import java.io.DataOutputStream;
 import java.io.IOException;
 
-import org.apache.commons.bcel6.Const;
+import org.apache.bcel.Const;
 
 /**
  * @since 6.0

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/SourceFile.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/SourceFile.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/SourceFile.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/SourceFile.java Tue Jun  7 17:28:43 2016
@@ -15,13 +15,13 @@
  *  limitations under the License.
  *
  */
-package org.apache.commons.bcel6.classfile;
+package org.apache.bcel.classfile;
 
 import java.io.DataInput;
 import java.io.DataOutputStream;
 import java.io.IOException;
 
-import org.apache.commons.bcel6.Const;
+import org.apache.bcel.Const;
 
 /**
  * This class is derived from <em>Attribute</em> and represents a reference

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/StackMap.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/StackMap.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/StackMap.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/StackMap.java Tue Jun  7 17:28:43 2016
@@ -15,13 +15,13 @@
  *  limitations under the License.
  *
  */
-package org.apache.commons.bcel6.classfile;
+package org.apache.bcel.classfile;
 
 import java.io.DataInput;
 import java.io.DataOutputStream;
 import java.io.IOException;
 
-import org.apache.commons.bcel6.Const;
+import org.apache.bcel.Const;
 
 /**
  * This class represents a stack map attribute used for

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/StackMapEntry.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/StackMapEntry.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/StackMapEntry.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/StackMapEntry.java Tue Jun  7 17:28:43 2016
@@ -15,12 +15,12 @@
  *  limitations under the License.
  */
 
-package org.apache.commons.bcel6.classfile;
+package org.apache.bcel.classfile;
 
 import java.io.DataInput;
 import java.io.DataOutputStream;
 import java.io.IOException;
-import org.apache.commons.bcel6.Const;
+import org.apache.bcel.Const;
 
 /**
  * This class represents a stack map entry recording the types of

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/StackMapType.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/StackMapType.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/StackMapType.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/StackMapType.java Tue Jun  7 17:28:43 2016
@@ -15,13 +15,13 @@
  *  limitations under the License.
  *
  */
-package org.apache.commons.bcel6.classfile;
+package org.apache.bcel.classfile;
 
 import java.io.DataInput;
 import java.io.DataOutputStream;
 import java.io.IOException;
 
-import org.apache.commons.bcel6.Const;
+import org.apache.bcel.Const;
 
 /**
  * This class represents the type of a local variable or item on stack

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Synthetic.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Synthetic.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Synthetic.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Synthetic.java Tue Jun  7 17:28:43 2016
@@ -15,13 +15,13 @@
  *  limitations under the License.
  *
  */
-package org.apache.commons.bcel6.classfile;
+package org.apache.bcel.classfile;
 
 import java.io.DataInput;
 import java.io.DataOutputStream;
 import java.io.IOException;
 
-import org.apache.commons.bcel6.Const;
+import org.apache.bcel.Const;
 
 /**
  * This class is derived from <em>Attribute</em> and declares this class as

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Unknown.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Unknown.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Unknown.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Unknown.java Tue Jun  7 17:28:43 2016
@@ -15,7 +15,7 @@
  *  limitations under the License.
  *
  */
-package org.apache.commons.bcel6.classfile;
+package org.apache.bcel.classfile;
 
 import java.io.DataInput;
 import java.io.DataOutputStream;
@@ -23,7 +23,7 @@ import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.commons.bcel6.Const;
+import org.apache.bcel.Const;
 
 /**
  * This class represents a reference to an unknown (i.e.,

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/UnknownAttributeReader.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/UnknownAttributeReader.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/UnknownAttributeReader.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/UnknownAttributeReader.java Tue Jun  7 17:28:43 2016
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package org.apache.commons.bcel6.classfile;
+package org.apache.bcel.classfile;
 
 /**
  * Unknown (non-standard) attributes may be read via user-defined factory

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Utility.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Utility.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Utility.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Utility.java Tue Jun  7 17:28:43 2016
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package org.apache.commons.bcel6.classfile;
+package org.apache.bcel.classfile;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -34,8 +34,8 @@ import java.util.Locale;
 import java.util.zip.GZIPInputStream;
 import java.util.zip.GZIPOutputStream;
 
-import org.apache.commons.bcel6.Const;
-import org.apache.commons.bcel6.util.ByteSequence;
+import org.apache.bcel.Const;
+import org.apache.bcel.util.ByteSequence;
 
 /**
  * Utility functions that do not really belong to any class in particular.

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Visitor.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Visitor.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Visitor.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Visitor.java Tue Jun  7 17:28:43 2016
@@ -15,7 +15,7 @@
  *  limitations under the License.
  *
  */
-package org.apache.commons.bcel6.classfile;
+package org.apache.bcel.classfile;
 
 /**
  * Interface to make use of the Visitor pattern programming style. I.e. a class

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/AALOAD.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/AALOAD.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/AALOAD.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/AALOAD.java Tue Jun  7 17:28:43 2016
@@ -15,7 +15,7 @@
  *  limitations under the License.
  *
  */
-package org.apache.commons.bcel6.generic;
+package org.apache.bcel.generic;
 
 /** 
  * AALOAD - Load reference from array
@@ -28,7 +28,7 @@ public class AALOAD extends ArrayInstruc
     /** Load reference from array
      */
     public AALOAD() {
-        super(org.apache.commons.bcel6.Const.AALOAD);
+        super(org.apache.bcel.Const.AALOAD);
     }
 
 

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/AASTORE.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/AASTORE.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/AASTORE.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/AASTORE.java Tue Jun  7 17:28:43 2016
@@ -15,7 +15,7 @@
  *  limitations under the License.
  *
  */
-package org.apache.commons.bcel6.generic;
+package org.apache.bcel.generic;
 
 /** 
  * AASTORE -  Store into reference array
@@ -28,7 +28,7 @@ public class AASTORE extends ArrayInstru
     /** Store into reference array
      */
     public AASTORE() {
-        super(org.apache.commons.bcel6.Const.AASTORE);
+        super(org.apache.bcel.Const.AASTORE);
     }
 
 

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ACONST_NULL.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ACONST_NULL.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ACONST_NULL.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ACONST_NULL.java Tue Jun  7 17:28:43 2016
@@ -15,7 +15,7 @@
  *  limitations under the License.
  *
  */
-package org.apache.commons.bcel6.generic;
+package org.apache.bcel.generic;
 
 /** 
  * ACONST_NULL - Push null reference
@@ -29,7 +29,7 @@ public class ACONST_NULL extends Instruc
      * Push null reference
      */
     public ACONST_NULL() {
-        super(org.apache.commons.bcel6.Const.ACONST_NULL, (short) 1);
+        super(org.apache.bcel.Const.ACONST_NULL, (short) 1);
     }
 
 

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ALOAD.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ALOAD.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ALOAD.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ALOAD.java Tue Jun  7 17:28:43 2016
@@ -15,7 +15,7 @@
  *  limitations under the License.
  *
  */
-package org.apache.commons.bcel6.generic;
+package org.apache.bcel.generic;
 
 /** 
  * ALOAD - Load reference from local variable
@@ -30,7 +30,7 @@ public class ALOAD extends LoadInstructi
      * Instruction.readInstruction(). Not to be used otherwise.
      */
     ALOAD() {
-        super(org.apache.commons.bcel6.Const.ALOAD, org.apache.commons.bcel6.Const.ALOAD_0);
+        super(org.apache.bcel.Const.ALOAD, org.apache.bcel.Const.ALOAD_0);
     }
 
 
@@ -38,7 +38,7 @@ public class ALOAD extends LoadInstructi
      * @param n index of local variable
      */
     public ALOAD(final int n) {
-        super(org.apache.commons.bcel6.Const.ALOAD, org.apache.commons.bcel6.Const.ALOAD_0, n);
+        super(org.apache.bcel.Const.ALOAD, org.apache.bcel.Const.ALOAD_0, n);
     }
 
 

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ANEWARRAY.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ANEWARRAY.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ANEWARRAY.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ANEWARRAY.java Tue Jun  7 17:28:43 2016
@@ -15,9 +15,9 @@
  *  limitations under the License.
  *
  */
-package org.apache.commons.bcel6.generic;
+package org.apache.bcel.generic;
 
-import org.apache.commons.bcel6.ExceptionConst;
+import org.apache.bcel.ExceptionConst;
 
 /** 
  * ANEWARRAY -  Create new array of references
@@ -37,7 +37,7 @@ public class ANEWARRAY extends CPInstruc
 
 
     public ANEWARRAY(final int index) {
-        super(org.apache.commons.bcel6.Const.ANEWARRAY, index);
+        super(org.apache.bcel.Const.ANEWARRAY, index);
     }
 
 

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ARETURN.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ARETURN.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ARETURN.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ARETURN.java Tue Jun  7 17:28:43 2016
@@ -15,7 +15,7 @@
  *  limitations under the License.
  *
  */
-package org.apache.commons.bcel6.generic;
+package org.apache.bcel.generic;
 
 /** 
  * ARETURN -  Return reference from method
@@ -29,7 +29,7 @@ public class ARETURN extends ReturnInstr
      * Return reference from method
      */
     public ARETURN() {
-        super(org.apache.commons.bcel6.Const.ARETURN);
+        super(org.apache.bcel.Const.ARETURN);
     }
 
 

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ARRAYLENGTH.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ARRAYLENGTH.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ARRAYLENGTH.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ARRAYLENGTH.java Tue Jun  7 17:28:43 2016
@@ -15,9 +15,9 @@
  *  limitations under the License.
  *
  */
-package org.apache.commons.bcel6.generic;
+package org.apache.bcel.generic;
 
-import org.apache.commons.bcel6.ExceptionConst;
+import org.apache.bcel.ExceptionConst;
 
 /** 
  * ARRAYLENGTH -  Get length of array
@@ -30,7 +30,7 @@ public class ARRAYLENGTH extends Instruc
     /** Get length of array
      */
     public ARRAYLENGTH() {
-        super(org.apache.commons.bcel6.Const.ARRAYLENGTH, (short) 1);
+        super(org.apache.bcel.Const.ARRAYLENGTH, (short) 1);
     }
 
 

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ASTORE.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ASTORE.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ASTORE.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ASTORE.java Tue Jun  7 17:28:43 2016
@@ -15,7 +15,7 @@
  *  limitations under the License.
  *
  */
-package org.apache.commons.bcel6.generic;
+package org.apache.bcel.generic;
 
 /** 
  * ASTORE - Store reference into local variable
@@ -30,7 +30,7 @@ public class ASTORE extends StoreInstruc
      * Instruction.readInstruction(). Not to be used otherwise.
      */
     ASTORE() {
-        super(org.apache.commons.bcel6.Const.ASTORE, org.apache.commons.bcel6.Const.ASTORE_0);
+        super(org.apache.bcel.Const.ASTORE, org.apache.bcel.Const.ASTORE_0);
     }
 
 
@@ -38,7 +38,7 @@ public class ASTORE extends StoreInstruc
      * @param n index of local variable
      */
     public ASTORE(final int n) {
-        super(org.apache.commons.bcel6.Const.ASTORE, org.apache.commons.bcel6.Const.ASTORE_0, n);
+        super(org.apache.bcel.Const.ASTORE, org.apache.bcel.Const.ASTORE_0, n);
     }
 
 

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ATHROW.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ATHROW.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ATHROW.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ATHROW.java Tue Jun  7 17:28:43 2016
@@ -15,9 +15,9 @@
  *  limitations under the License.
  *
  */
-package org.apache.commons.bcel6.generic;
+package org.apache.bcel.generic;
 
-import org.apache.commons.bcel6.ExceptionConst;
+import org.apache.bcel.ExceptionConst;
 
 /** 
  * ATHROW -  Throw exception
@@ -31,7 +31,7 @@ public class ATHROW extends Instruction
      *  Throw exception
      */
     public ATHROW() {
-        super(org.apache.commons.bcel6.Const.ATHROW, (short) 1);
+        super(org.apache.bcel.Const.ATHROW, (short) 1);
     }
 
 

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/AllocationInstruction.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/AllocationInstruction.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/AllocationInstruction.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/AllocationInstruction.java Tue Jun  7 17:28:43 2016
@@ -15,7 +15,7 @@
  *  limitations under the License.
  *
  */
-package org.apache.commons.bcel6.generic;
+package org.apache.bcel.generic;
 
 /**
  * Denote family of instructions that allocates space in the heap.

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/AnnotationElementValueGen.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/AnnotationElementValueGen.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/AnnotationElementValueGen.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/AnnotationElementValueGen.java Tue Jun  7 17:28:43 2016
@@ -15,13 +15,13 @@
  *  limitations under the License.
  *
  */
-package org.apache.commons.bcel6.generic;
+package org.apache.bcel.generic;
 
 import java.io.DataOutputStream;
 import java.io.IOException;
 
-import org.apache.commons.bcel6.classfile.AnnotationElementValue;
-import org.apache.commons.bcel6.classfile.ElementValue;
+import org.apache.bcel.classfile.AnnotationElementValue;
+import org.apache.bcel.classfile.ElementValue;
 
 /**
  * @since 6.0

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/AnnotationEntryGen.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/AnnotationEntryGen.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/AnnotationEntryGen.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/AnnotationEntryGen.java Tue Jun  7 17:28:43 2016
@@ -15,7 +15,7 @@
  *  limitations under the License.
  *
  */
-package org.apache.commons.bcel6.generic;
+package org.apache.bcel.generic;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -26,14 +26,14 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.commons.bcel6.classfile.AnnotationEntry;
-import org.apache.commons.bcel6.classfile.Attribute;
-import org.apache.commons.bcel6.classfile.ConstantUtf8;
-import org.apache.commons.bcel6.classfile.ElementValuePair;
-import org.apache.commons.bcel6.classfile.RuntimeInvisibleAnnotations;
-import org.apache.commons.bcel6.classfile.RuntimeInvisibleParameterAnnotations;
-import org.apache.commons.bcel6.classfile.RuntimeVisibleAnnotations;
-import org.apache.commons.bcel6.classfile.RuntimeVisibleParameterAnnotations;
+import org.apache.bcel.classfile.AnnotationEntry;
+import org.apache.bcel.classfile.Attribute;
+import org.apache.bcel.classfile.ConstantUtf8;
+import org.apache.bcel.classfile.ElementValuePair;
+import org.apache.bcel.classfile.RuntimeInvisibleAnnotations;
+import org.apache.bcel.classfile.RuntimeInvisibleParameterAnnotations;
+import org.apache.bcel.classfile.RuntimeVisibleAnnotations;
+import org.apache.bcel.classfile.RuntimeVisibleParameterAnnotations;
 
 /**
  * @since 6.0

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ArithmeticInstruction.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ArithmeticInstruction.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ArithmeticInstruction.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ArithmeticInstruction.java Tue Jun  7 17:28:43 2016
@@ -15,9 +15,9 @@
  *  limitations under the License.
  *
  */
-package org.apache.commons.bcel6.generic;
+package org.apache.bcel.generic;
 
-import org.apache.commons.bcel6.Const;
+import org.apache.bcel.Const;
 
 /**
  * Super class for the family of arithmetic instructions.

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ArrayElementValueGen.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ArrayElementValueGen.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ArrayElementValueGen.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ArrayElementValueGen.java Tue Jun  7 17:28:43 2016
@@ -15,15 +15,15 @@
  *  limitations under the License.
  *
  */
-package org.apache.commons.bcel6.generic;
+package org.apache.bcel.generic;
 
 import java.io.DataOutputStream;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.commons.bcel6.classfile.ArrayElementValue;
-import org.apache.commons.bcel6.classfile.ElementValue;
+import org.apache.bcel.classfile.ArrayElementValue;
+import org.apache.bcel.classfile.ElementValue;
 
 /**
  * @since 6.0

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ArrayInstruction.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ArrayInstruction.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ArrayInstruction.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ArrayInstruction.java Tue Jun  7 17:28:43 2016
@@ -15,9 +15,9 @@
  *  limitations under the License.
  *
  */
-package org.apache.commons.bcel6.generic;
+package org.apache.bcel.generic;
 
-import org.apache.commons.bcel6.ExceptionConst;
+import org.apache.bcel.ExceptionConst;
 
 /**
  * Super class for instructions dealing with array access such as IALOAD.
@@ -55,29 +55,29 @@ public abstract class ArrayInstruction e
     public Type getType( final ConstantPoolGen cp ) {
         final short _opcode = super.getOpcode();
         switch (_opcode) {
-            case org.apache.commons.bcel6.Const.IALOAD:
-            case org.apache.commons.bcel6.Const.IASTORE:
+            case org.apache.bcel.Const.IALOAD:
+            case org.apache.bcel.Const.IASTORE:
                 return Type.INT;
-            case org.apache.commons.bcel6.Const.CALOAD:
-            case org.apache.commons.bcel6.Const.CASTORE:
+            case org.apache.bcel.Const.CALOAD:
+            case org.apache.bcel.Const.CASTORE:
                 return Type.CHAR;
-            case org.apache.commons.bcel6.Const.BALOAD:
-            case org.apache.commons.bcel6.Const.BASTORE:
+            case org.apache.bcel.Const.BALOAD:
+            case org.apache.bcel.Const.BASTORE:
                 return Type.BYTE;
-            case org.apache.commons.bcel6.Const.SALOAD:
-            case org.apache.commons.bcel6.Const.SASTORE:
+            case org.apache.bcel.Const.SALOAD:
+            case org.apache.bcel.Const.SASTORE:
                 return Type.SHORT;
-            case org.apache.commons.bcel6.Const.LALOAD:
-            case org.apache.commons.bcel6.Const.LASTORE:
+            case org.apache.bcel.Const.LALOAD:
+            case org.apache.bcel.Const.LASTORE:
                 return Type.LONG;
-            case org.apache.commons.bcel6.Const.DALOAD:
-            case org.apache.commons.bcel6.Const.DASTORE:
+            case org.apache.bcel.Const.DALOAD:
+            case org.apache.bcel.Const.DASTORE:
                 return Type.DOUBLE;
-            case org.apache.commons.bcel6.Const.FALOAD:
-            case org.apache.commons.bcel6.Const.FASTORE:
+            case org.apache.bcel.Const.FALOAD:
+            case org.apache.bcel.Const.FASTORE:
                 return Type.FLOAT;
-            case org.apache.commons.bcel6.Const.AALOAD:
-            case org.apache.commons.bcel6.Const.AASTORE:
+            case org.apache.bcel.Const.AALOAD:
+            case org.apache.bcel.Const.AASTORE:
                 return Type.OBJECT;
             default:
                 throw new ClassGenException("Oops: unknown case in switch" + _opcode);

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ArrayType.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ArrayType.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ArrayType.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ArrayType.java Tue Jun  7 17:28:43 2016
@@ -15,9 +15,9 @@
  *  limitations under the License.
  *
  */
-package org.apache.commons.bcel6.generic;
+package org.apache.bcel.generic;
 
-import org.apache.commons.bcel6.Const;
+import org.apache.bcel.Const;
 
 /** 
  * Denotes array type, such as int[][]

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/BALOAD.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/BALOAD.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/BALOAD.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/BALOAD.java Tue Jun  7 17:28:43 2016
@@ -15,7 +15,7 @@
  *  limitations under the License.
  *
  */
-package org.apache.commons.bcel6.generic;
+package org.apache.bcel.generic;
 
 /** 
  * BALOAD - Load byte or boolean from array
@@ -28,7 +28,7 @@ public class BALOAD extends ArrayInstruc
     /** Load byte or boolean from array
      */
     public BALOAD() {
-        super(org.apache.commons.bcel6.Const.BALOAD);
+        super(org.apache.bcel.Const.BALOAD);
     }
 
 

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/BASTORE.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/BASTORE.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/BASTORE.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/BASTORE.java Tue Jun  7 17:28:43 2016
@@ -15,7 +15,7 @@
  *  limitations under the License.
  *
  */
-package org.apache.commons.bcel6.generic;
+package org.apache.bcel.generic;
 
 /** 
  * BASTORE -  Store into byte or boolean array
@@ -28,7 +28,7 @@ public class BASTORE extends ArrayInstru
     /** Store byte or boolean into array
      */
     public BASTORE() {
-        super(org.apache.commons.bcel6.Const.BASTORE);
+        super(org.apache.bcel.Const.BASTORE);
     }
 
 

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/BIPUSH.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/BIPUSH.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/BIPUSH.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/BIPUSH.java Tue Jun  7 17:28:43 2016
@@ -15,12 +15,12 @@
  *  limitations under the License.
  *
  */
-package org.apache.commons.bcel6.generic;
+package org.apache.bcel.generic;
 
 import java.io.DataOutputStream;
 import java.io.IOException;
 
-import org.apache.commons.bcel6.util.ByteSequence;
+import org.apache.bcel.util.ByteSequence;
 
 /** 
  * BIPUSH - Push byte on stack
@@ -45,7 +45,7 @@ public class BIPUSH extends Instruction
     /** Push byte on stack
      */
     public BIPUSH(final byte b) {
-        super(org.apache.commons.bcel6.Const.BIPUSH, (short) 2);
+        super(org.apache.bcel.Const.BIPUSH, (short) 2);
         this.b = b;
     }
 

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/BREAKPOINT.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/BREAKPOINT.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/BREAKPOINT.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/BREAKPOINT.java Tue Jun  7 17:28:43 2016
@@ -15,7 +15,7 @@
  *  limitations under the License.
  *
  */
-package org.apache.commons.bcel6.generic;
+package org.apache.bcel.generic;
 
 /**
  * BREAKPOINT, JVM dependent, ignored by default
@@ -25,7 +25,7 @@ package org.apache.commons.bcel6.generic
 public class BREAKPOINT extends Instruction {
 
     public BREAKPOINT() {
-        super(org.apache.commons.bcel6.Const.BREAKPOINT, (short) 1);
+        super(org.apache.bcel.Const.BREAKPOINT, (short) 1);
     }
 
 

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/BasicType.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/BasicType.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/BasicType.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/BasicType.java Tue Jun  7 17:28:43 2016
@@ -15,9 +15,9 @@
  *  limitations under the License.
  *
  */
-package org.apache.commons.bcel6.generic;
+package org.apache.bcel.generic;
 
-import org.apache.commons.bcel6.Const;
+import org.apache.bcel.Const;
 
 /** 
  * Denotes basic type such as int.

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/BranchHandle.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/BranchHandle.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/BranchHandle.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/BranchHandle.java Tue Jun  7 17:28:43 2016
@@ -15,7 +15,7 @@
  *  limitations under the License.
  *
  */
-package org.apache.commons.bcel6.generic;
+package org.apache.bcel.generic;
 
 /**
  * BranchHandle is returned by specialized InstructionList.append() whenever a

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/BranchInstruction.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/BranchInstruction.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/BranchInstruction.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/BranchInstruction.java Tue Jun  7 17:28:43 2016
@@ -15,12 +15,12 @@
  *  limitations under the License.
  *
  */
-package org.apache.commons.bcel6.generic;
+package org.apache.bcel.generic;
 
 import java.io.DataOutputStream;
 import java.io.IOException;
 
-import org.apache.commons.bcel6.util.ByteSequence;
+import org.apache.bcel.util.ByteSequence;
 
 /** 
  * Abstract super class for branching instructions like GOTO, IFEQ, etc..

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/CALOAD.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/CALOAD.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/CALOAD.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/CALOAD.java Tue Jun  7 17:28:43 2016
@@ -15,7 +15,7 @@
  *  limitations under the License.
  *
  */
-package org.apache.commons.bcel6.generic;
+package org.apache.bcel.generic;
 
 /** 
  * CALOAD - Load char from array
@@ -28,7 +28,7 @@ public class CALOAD extends ArrayInstruc
     /** Load char from array
      */
     public CALOAD() {
-        super(org.apache.commons.bcel6.Const.CALOAD);
+        super(org.apache.bcel.Const.CALOAD);
     }
 
 

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/CASTORE.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/CASTORE.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/CASTORE.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/CASTORE.java Tue Jun  7 17:28:43 2016
@@ -15,7 +15,7 @@
  *  limitations under the License.
  *
  */
-package org.apache.commons.bcel6.generic;
+package org.apache.bcel.generic;
 
 /** 
  * CASTORE -  Store into char array
@@ -28,7 +28,7 @@ public class CASTORE extends ArrayInstru
     /** Store char into array
      */
     public CASTORE() {
-        super(org.apache.commons.bcel6.Const.CASTORE);
+        super(org.apache.bcel.Const.CASTORE);
     }
 
 

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/CHECKCAST.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/CHECKCAST.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/CHECKCAST.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/CHECKCAST.java Tue Jun  7 17:28:43 2016
@@ -15,9 +15,9 @@
  *  limitations under the License.
  *
  */
-package org.apache.commons.bcel6.generic;
+package org.apache.bcel.generic;
 
-import org.apache.commons.bcel6.ExceptionConst;
+import org.apache.bcel.ExceptionConst;
 
 /** 
  * CHECKCAST - Check whether object is of given type
@@ -40,7 +40,7 @@ public class CHECKCAST extends CPInstruc
      * @param index index to class in constant pool
      */
     public CHECKCAST(final int index) {
-        super(org.apache.commons.bcel6.Const.CHECKCAST, index);
+        super(org.apache.bcel.Const.CHECKCAST, index);
     }
 
 

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/CPInstruction.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/CPInstruction.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/CPInstruction.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/CPInstruction.java Tue Jun  7 17:28:43 2016
@@ -15,15 +15,15 @@
  *  limitations under the License.
  *
  */
-package org.apache.commons.bcel6.generic;
+package org.apache.bcel.generic;
 
 import java.io.DataOutputStream;
 import java.io.IOException;
 
-import org.apache.commons.bcel6.classfile.Constant;
-import org.apache.commons.bcel6.classfile.ConstantClass;
-import org.apache.commons.bcel6.classfile.ConstantPool;
-import org.apache.commons.bcel6.util.ByteSequence;
+import org.apache.bcel.classfile.Constant;
+import org.apache.bcel.classfile.ConstantClass;
+import org.apache.bcel.classfile.ConstantPool;
+import org.apache.bcel.util.ByteSequence;
 
 /** 
  * Abstract super class for instructions that use an index into the 
@@ -98,7 +98,7 @@ public abstract class CPInstruction exte
         if (c instanceof ConstantClass) {
             str = str.replace('.', '/');
         }
-        return org.apache.commons.bcel6.Const.getOpcodeName(super.getOpcode()) + " " + str;
+        return org.apache.bcel.Const.getOpcodeName(super.getOpcode()) + " " + str;
     }
 
 
@@ -141,7 +141,7 @@ public abstract class CPInstruction exte
     @Override
     public Type getType( final ConstantPoolGen cpg ) {
         ConstantPool cp = cpg.getConstantPool();
-        String name = cp.getConstantString(index, org.apache.commons.bcel6.Const.CONSTANT_Class);
+        String name = cp.getConstantString(index, org.apache.bcel.Const.CONSTANT_Class);
         if (!name.startsWith("[")) {
             name = "L" + name + ";";
         }

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ClassElementValueGen.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ClassElementValueGen.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ClassElementValueGen.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ClassElementValueGen.java Tue Jun  7 17:28:43 2016
@@ -15,14 +15,14 @@
  *  limitations under the License.
  *
  */
-package org.apache.commons.bcel6.generic;
+package org.apache.bcel.generic;
 
 import java.io.DataOutputStream;
 import java.io.IOException;
 
-import org.apache.commons.bcel6.classfile.ClassElementValue;
-import org.apache.commons.bcel6.classfile.ConstantUtf8;
-import org.apache.commons.bcel6.classfile.ElementValue;
+import org.apache.bcel.classfile.ClassElementValue;
+import org.apache.bcel.classfile.ConstantUtf8;
+import org.apache.bcel.classfile.ElementValue;
 
 /**
  * @since 6.0

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ClassGen.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ClassGen.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ClassGen.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ClassGen.java Tue Jun  7 17:28:43 2016
@@ -15,24 +15,24 @@
  *  limitations under the License.
  *
  */
-package org.apache.commons.bcel6.generic;
+package org.apache.bcel.generic;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.commons.bcel6.Const;
-import org.apache.commons.bcel6.classfile.AccessFlags;
-import org.apache.commons.bcel6.classfile.AnnotationEntry;
-import org.apache.commons.bcel6.classfile.Annotations;
-import org.apache.commons.bcel6.classfile.Attribute;
-import org.apache.commons.bcel6.classfile.ConstantPool;
-import org.apache.commons.bcel6.classfile.Field;
-import org.apache.commons.bcel6.classfile.JavaClass;
-import org.apache.commons.bcel6.classfile.Method;
-import org.apache.commons.bcel6.classfile.RuntimeInvisibleAnnotations;
-import org.apache.commons.bcel6.classfile.RuntimeVisibleAnnotations;
-import org.apache.commons.bcel6.classfile.SourceFile;
-import org.apache.commons.bcel6.util.BCELComparator;
+import org.apache.bcel.Const;
+import org.apache.bcel.classfile.AccessFlags;
+import org.apache.bcel.classfile.AnnotationEntry;
+import org.apache.bcel.classfile.Annotations;
+import org.apache.bcel.classfile.Attribute;
+import org.apache.bcel.classfile.ConstantPool;
+import org.apache.bcel.classfile.Field;
+import org.apache.bcel.classfile.JavaClass;
+import org.apache.bcel.classfile.Method;
+import org.apache.bcel.classfile.RuntimeInvisibleAnnotations;
+import org.apache.bcel.classfile.RuntimeVisibleAnnotations;
+import org.apache.bcel.classfile.SourceFile;
+import org.apache.bcel.util.BCELComparator;
 
 /** 
  * Template class for building up a java class. May be initialized with an

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ClassGenException.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ClassGenException.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ClassGenException.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ClassGenException.java Tue Jun  7 17:28:43 2016
@@ -15,7 +15,7 @@
  *  limitations under the License.
  *
  */
-package org.apache.commons.bcel6.generic;
+package org.apache.bcel.generic;
 
 /** 
  * Thrown on internal errors. Extends RuntimeException so it hasn't to be declared

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ClassObserver.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ClassObserver.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ClassObserver.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ClassObserver.java Tue Jun  7 17:28:43 2016
@@ -15,7 +15,7 @@
  *  limitations under the License.
  *
  */
-package org.apache.commons.bcel6.generic;
+package org.apache.bcel.generic;
 
 /**
  * Implement this interface if you're interested in changes to a ClassGen object

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/CodeExceptionGen.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/CodeExceptionGen.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/CodeExceptionGen.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/CodeExceptionGen.java Tue Jun  7 17:28:43 2016
@@ -15,9 +15,9 @@
  *  limitations under the License.
  *
  */
-package org.apache.commons.bcel6.generic;
+package org.apache.bcel.generic;
 
-import org.apache.commons.bcel6.classfile.CodeException;
+import org.apache.bcel.classfile.CodeException;
 
 /** 
  * This class represents an exception handler, i.e., specifies the  region where

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/CompoundInstruction.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/CompoundInstruction.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/CompoundInstruction.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/CompoundInstruction.java Tue Jun  7 17:28:43 2016
@@ -15,7 +15,7 @@
  *  limitations under the License.
  *
  */
-package org.apache.commons.bcel6.generic;
+package org.apache.bcel.generic;
 
 /**
  * Wrapper class for `compound' operations, virtual instructions that

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ConstantPoolGen.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ConstantPoolGen.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ConstantPoolGen.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ConstantPoolGen.java Tue Jun  7 17:28:43 2016
@@ -15,27 +15,27 @@
  *  limitations under the License.
  *
  */
-package org.apache.commons.bcel6.generic;
+package org.apache.bcel.generic;
 
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.commons.bcel6.Const;
-import org.apache.commons.bcel6.classfile.Constant;
-import org.apache.commons.bcel6.classfile.ConstantCP;
-import org.apache.commons.bcel6.classfile.ConstantClass;
-import org.apache.commons.bcel6.classfile.ConstantDouble;
-import org.apache.commons.bcel6.classfile.ConstantFieldref;
-import org.apache.commons.bcel6.classfile.ConstantFloat;
-import org.apache.commons.bcel6.classfile.ConstantInteger;
-import org.apache.commons.bcel6.classfile.ConstantInterfaceMethodref;
-import org.apache.commons.bcel6.classfile.ConstantInvokeDynamic;
-import org.apache.commons.bcel6.classfile.ConstantLong;
-import org.apache.commons.bcel6.classfile.ConstantMethodref;
-import org.apache.commons.bcel6.classfile.ConstantNameAndType;
-import org.apache.commons.bcel6.classfile.ConstantPool;
-import org.apache.commons.bcel6.classfile.ConstantString;
-import org.apache.commons.bcel6.classfile.ConstantUtf8;
+import org.apache.bcel.Const;
+import org.apache.bcel.classfile.Constant;
+import org.apache.bcel.classfile.ConstantCP;
+import org.apache.bcel.classfile.ConstantClass;
+import org.apache.bcel.classfile.ConstantDouble;
+import org.apache.bcel.classfile.ConstantFieldref;
+import org.apache.bcel.classfile.ConstantFloat;
+import org.apache.bcel.classfile.ConstantInteger;
+import org.apache.bcel.classfile.ConstantInterfaceMethodref;
+import org.apache.bcel.classfile.ConstantInvokeDynamic;
+import org.apache.bcel.classfile.ConstantLong;
+import org.apache.bcel.classfile.ConstantMethodref;
+import org.apache.bcel.classfile.ConstantNameAndType;
+import org.apache.bcel.classfile.ConstantPool;
+import org.apache.bcel.classfile.ConstantString;
+import org.apache.bcel.classfile.ConstantUtf8;
 
 /** 
  * This class is used to build up a constant pool. The user adds
@@ -190,9 +190,9 @@ public class ConstantPoolGen {
                 // nothing to do
             } else if (c instanceof ConstantDouble) {
                 // nothing to do
-            } else if (c instanceof org.apache.commons.bcel6.classfile.ConstantMethodType) {
+            } else if (c instanceof org.apache.bcel.classfile.ConstantMethodType) {
                 // TODO should this be handled somehow?
-            } else if (c instanceof org.apache.commons.bcel6.classfile.ConstantMethodHandle) {
+            } else if (c instanceof org.apache.bcel.classfile.ConstantMethodHandle) {
                 // TODO should this be handled somehow?
             } else {
                 assert false : "Unexpected constant type: " + c.getClass().getName();

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ConstantPushInstruction.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ConstantPushInstruction.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ConstantPushInstruction.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ConstantPushInstruction.java Tue Jun  7 17:28:43 2016
@@ -15,7 +15,7 @@
  *  limitations under the License.
  *
  */
-package org.apache.commons.bcel6.generic;
+package org.apache.bcel.generic;
 
 /**
  * Denotes a push instruction that produces a literal on the stack

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ConversionInstruction.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ConversionInstruction.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ConversionInstruction.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ConversionInstruction.java Tue Jun  7 17:28:43 2016
@@ -15,9 +15,9 @@
  *  limitations under the License.
  *
  */
-package org.apache.commons.bcel6.generic;
+package org.apache.bcel.generic;
 
-import org.apache.commons.bcel6.Const;
+import org.apache.bcel.Const;
 
 /**
  * Super class for the x2y family of instructions.

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/D2F.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/D2F.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/D2F.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/D2F.java Tue Jun  7 17:28:43 2016
@@ -15,7 +15,7 @@
  *  limitations under the License.
  *
  */
-package org.apache.commons.bcel6.generic;
+package org.apache.bcel.generic;
 
 /** 
  * D2F - Convert double to float
@@ -28,7 +28,7 @@ public class D2F extends ConversionInstr
     /** Convert double to float
      */
     public D2F() {
-        super(org.apache.commons.bcel6.Const.D2F);
+        super(org.apache.bcel.Const.D2F);
     }
 
 

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/D2I.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/D2I.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/D2I.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/D2I.java Tue Jun  7 17:28:43 2016
@@ -15,7 +15,7 @@
  *  limitations under the License.
  *
  */
-package org.apache.commons.bcel6.generic;
+package org.apache.bcel.generic;
 
 /** 
  * D2I - Convert double to int
@@ -28,7 +28,7 @@ public class D2I extends ConversionInstr
     /** Convert double to int
      */
     public D2I() {
-        super(org.apache.commons.bcel6.Const.D2I);
+        super(org.apache.bcel.Const.D2I);
     }
 
 

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/D2L.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/D2L.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/D2L.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/D2L.java Tue Jun  7 17:28:43 2016
@@ -15,7 +15,7 @@
  *  limitations under the License.
  *
  */
-package org.apache.commons.bcel6.generic;
+package org.apache.bcel.generic;
 
 /** 
  * D2L - Convert double to long
@@ -28,7 +28,7 @@ public class D2L extends ConversionInstr
     /** Convert double to long
      */
     public D2L() {
-        super(org.apache.commons.bcel6.Const.D2L);
+        super(org.apache.bcel.Const.D2L);
     }
 
 

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/DADD.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/DADD.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/DADD.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/DADD.java Tue Jun  7 17:28:43 2016
@@ -15,7 +15,7 @@
  *  limitations under the License.
  *
  */
-package org.apache.commons.bcel6.generic;
+package org.apache.bcel.generic;
 
 /** 
  * DADD - Add doubles
@@ -29,7 +29,7 @@ public class DADD extends ArithmeticInst
     /** Add doubles
      */
     public DADD() {
-        super(org.apache.commons.bcel6.Const.DADD);
+        super(org.apache.bcel.Const.DADD);
     }
 
 

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/DALOAD.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/DALOAD.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/DALOAD.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/DALOAD.java Tue Jun  7 17:28:43 2016
@@ -15,7 +15,7 @@
  *  limitations under the License.
  *
  */
-package org.apache.commons.bcel6.generic;
+package org.apache.bcel.generic;
 
 /** 
  * DALOAD - Load double from array
@@ -28,7 +28,7 @@ public class DALOAD extends ArrayInstruc
     /** Load double from array
      */
     public DALOAD() {
-        super(org.apache.commons.bcel6.Const.DALOAD);
+        super(org.apache.bcel.Const.DALOAD);
     }
 
 

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/DASTORE.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/DASTORE.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/DASTORE.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/DASTORE.java Tue Jun  7 17:28:43 2016
@@ -15,7 +15,7 @@
  *  limitations under the License.
  *
  */
-package org.apache.commons.bcel6.generic;
+package org.apache.bcel.generic;
 
 /** 
  * DASTORE -  Store into double array
@@ -28,7 +28,7 @@ public class DASTORE extends ArrayInstru
     /** Store double into array
      */
     public DASTORE() {
-        super(org.apache.commons.bcel6.Const.DASTORE);
+        super(org.apache.bcel.Const.DASTORE);
     }
 
 

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/DCMPG.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/DCMPG.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/DCMPG.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/DCMPG.java Tue Jun  7 17:28:43 2016
@@ -15,7 +15,7 @@
  *  limitations under the License.
  *
  */
-package org.apache.commons.bcel6.generic;
+package org.apache.bcel.generic;
 
 /** 
  * DCMPG - Compare doubles: value1 &gt; value2
@@ -26,7 +26,7 @@ package org.apache.commons.bcel6.generic
 public class DCMPG extends Instruction implements TypedInstruction, StackProducer, StackConsumer {
 
     public DCMPG() {
-        super(org.apache.commons.bcel6.Const.DCMPG, (short) 1);
+        super(org.apache.bcel.Const.DCMPG, (short) 1);
     }
 
     /** @return Type.DOUBLE

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/DCMPL.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/DCMPL.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/DCMPL.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/DCMPL.java Tue Jun  7 17:28:43 2016
@@ -15,7 +15,7 @@
  *  limitations under the License.
  *
  */
-package org.apache.commons.bcel6.generic;
+package org.apache.bcel.generic;
 
 /** 
  * DCMPL - Compare doubles: value1 &lt; value2
@@ -26,7 +26,7 @@ package org.apache.commons.bcel6.generic
 public class DCMPL extends Instruction implements TypedInstruction, StackProducer, StackConsumer {
 
     public DCMPL() {
-        super(org.apache.commons.bcel6.Const.DCMPL, (short) 1);
+        super(org.apache.bcel.Const.DCMPL, (short) 1);
     }
 
     /** @return Type.DOUBLE

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/DCONST.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/DCONST.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/DCONST.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/DCONST.java Tue Jun  7 17:28:43 2016
@@ -15,7 +15,7 @@
  *  limitations under the License.
  *
  */
-package org.apache.commons.bcel6.generic;
+package org.apache.bcel.generic;
 
 /** 
  * DCONST - Push 0.0 or 1.0, other values cause an exception
@@ -38,11 +38,11 @@ public class DCONST extends Instruction
 
 
     public DCONST(final double f) {
-        super(org.apache.commons.bcel6.Const.DCONST_0, (short) 1);
+        super(org.apache.bcel.Const.DCONST_0, (short) 1);
         if (f == 0.0) {
-            super.setOpcode(org.apache.commons.bcel6.Const.DCONST_0);
+            super.setOpcode(org.apache.bcel.Const.DCONST_0);
         } else if (f == 1.0) {
-            super.setOpcode(org.apache.commons.bcel6.Const.DCONST_1);
+            super.setOpcode(org.apache.bcel.Const.DCONST_1);
         } else {
             throw new ClassGenException("DCONST can be used only for 0.0 and 1.0: " + f);
         }

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/DDIV.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/DDIV.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/DDIV.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/DDIV.java Tue Jun  7 17:28:43 2016
@@ -15,7 +15,7 @@
  *  limitations under the License.
  *
  */
-package org.apache.commons.bcel6.generic;
+package org.apache.bcel.generic;
 
 /** 
  * DDIV -  Divide doubles
@@ -29,7 +29,7 @@ public class DDIV extends ArithmeticInst
     /** Divide doubles
      */
     public DDIV() {
-        super(org.apache.commons.bcel6.Const.DDIV);
+        super(org.apache.bcel.Const.DDIV);
     }
 
 

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/DLOAD.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/DLOAD.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/DLOAD.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/DLOAD.java Tue Jun  7 17:28:43 2016
@@ -15,7 +15,7 @@
  *  limitations under the License.
  *
  */
-package org.apache.commons.bcel6.generic;
+package org.apache.bcel.generic;
 
 /** 
  * DLOAD - Load double from local variable
@@ -30,7 +30,7 @@ public class DLOAD extends LoadInstructi
      * Instruction.readInstruction(). Not to be used otherwise.
      */
     DLOAD() {
-        super(org.apache.commons.bcel6.Const.DLOAD, org.apache.commons.bcel6.Const.DLOAD_0);
+        super(org.apache.bcel.Const.DLOAD, org.apache.bcel.Const.DLOAD_0);
     }
 
 
@@ -38,7 +38,7 @@ public class DLOAD extends LoadInstructi
      * @param n index of local variable
      */
     public DLOAD(final int n) {
-        super(org.apache.commons.bcel6.Const.DLOAD, org.apache.commons.bcel6.Const.DLOAD_0, n);
+        super(org.apache.bcel.Const.DLOAD, org.apache.bcel.Const.DLOAD_0, n);
     }
 
 

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/DMUL.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/DMUL.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/DMUL.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/DMUL.java Tue Jun  7 17:28:43 2016
@@ -15,7 +15,7 @@
  *  limitations under the License.
  *
  */
-package org.apache.commons.bcel6.generic;
+package org.apache.bcel.generic;
 
 /** 
  * DMUL - Multiply doubles
@@ -29,7 +29,7 @@ public class DMUL extends ArithmeticInst
     /** Multiply doubles
      */
     public DMUL() {
-        super(org.apache.commons.bcel6.Const.DMUL);
+        super(org.apache.bcel.Const.DMUL);
     }
 
 

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/DNEG.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/DNEG.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/DNEG.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/DNEG.java Tue Jun  7 17:28:43 2016
@@ -15,7 +15,7 @@
  *  limitations under the License.
  *
  */
-package org.apache.commons.bcel6.generic;
+package org.apache.bcel.generic;
 
 /** 
  * DNEG - Negate double
@@ -26,7 +26,7 @@ package org.apache.commons.bcel6.generic
 public class DNEG extends ArithmeticInstruction {
 
     public DNEG() {
-        super(org.apache.commons.bcel6.Const.DNEG);
+        super(org.apache.bcel.Const.DNEG);
     }
 
 

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/DREM.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/DREM.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/DREM.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/DREM.java Tue Jun  7 17:28:43 2016
@@ -15,7 +15,7 @@
  *  limitations under the License.
  *
  */
-package org.apache.commons.bcel6.generic;
+package org.apache.bcel.generic;
 
 /** 
  * DREM - Remainder of doubles
@@ -29,7 +29,7 @@ public class DREM extends ArithmeticInst
     /** Remainder of doubles
      */
     public DREM() {
-        super(org.apache.commons.bcel6.Const.DREM);
+        super(org.apache.bcel.Const.DREM);
     }
 
 

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/DRETURN.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/DRETURN.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/DRETURN.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/DRETURN.java Tue Jun  7 17:28:43 2016
@@ -15,7 +15,7 @@
  *  limitations under the License.
  *
  */
-package org.apache.commons.bcel6.generic;
+package org.apache.bcel.generic;
 
 /** 
  * DRETURN -  Return double from method
@@ -28,7 +28,7 @@ public class DRETURN extends ReturnInstr
     /** Return double from method
      */
     public DRETURN() {
-        super(org.apache.commons.bcel6.Const.DRETURN);
+        super(org.apache.bcel.Const.DRETURN);
     }
 
 

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/DSTORE.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/DSTORE.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/DSTORE.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/DSTORE.java Tue Jun  7 17:28:43 2016
@@ -15,7 +15,7 @@
  *  limitations under the License.
  *
  */
-package org.apache.commons.bcel6.generic;
+package org.apache.bcel.generic;
 
 /** 
  * DSTORE - Store double into local variable
@@ -30,7 +30,7 @@ public class DSTORE extends StoreInstruc
      * Instruction.readInstruction(). Not to be used otherwise.
      */
     DSTORE() {
-        super(org.apache.commons.bcel6.Const.DSTORE, org.apache.commons.bcel6.Const.DSTORE_0);
+        super(org.apache.bcel.Const.DSTORE, org.apache.bcel.Const.DSTORE_0);
     }
 
 
@@ -38,7 +38,7 @@ public class DSTORE extends StoreInstruc
      * @param n index of local variable
      */
     public DSTORE(final int n) {
-        super(org.apache.commons.bcel6.Const.DSTORE, org.apache.commons.bcel6.Const.DSTORE_0, n);
+        super(org.apache.bcel.Const.DSTORE, org.apache.bcel.Const.DSTORE_0, n);
     }
 
 

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/DSUB.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/DSUB.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/DSUB.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/DSUB.java Tue Jun  7 17:28:43 2016
@@ -15,7 +15,7 @@
  *  limitations under the License.
  *
  */
-package org.apache.commons.bcel6.generic;
+package org.apache.bcel.generic;
 
 /** 
  * DSUB - Substract doubles
@@ -29,7 +29,7 @@ public class DSUB extends ArithmeticInst
     /** Substract doubles
      */
     public DSUB() {
-        super(org.apache.commons.bcel6.Const.DSUB);
+        super(org.apache.bcel.Const.DSUB);
     }
 
 

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/DUP.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/DUP.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/DUP.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/DUP.java Tue Jun  7 17:28:43 2016
@@ -15,7 +15,7 @@
  *  limitations under the License.
  *
  */
-package org.apache.commons.bcel6.generic;
+package org.apache.bcel.generic;
 
 /** 
  * DUP - Duplicate top operand stack word
@@ -26,7 +26,7 @@ package org.apache.commons.bcel6.generic
 public class DUP extends StackInstruction implements PushInstruction {
 
     public DUP() {
-        super(org.apache.commons.bcel6.Const.DUP);
+        super(org.apache.bcel.Const.DUP);
     }
 
 

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/DUP2.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/DUP2.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/DUP2.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/DUP2.java Tue Jun  7 17:28:43 2016
@@ -15,7 +15,7 @@
  *  limitations under the License.
  *
  */
-package org.apache.commons.bcel6.generic;
+package org.apache.bcel.generic;
 
 /** 
  * DUP2 - Duplicate two top operand stack words
@@ -26,7 +26,7 @@ package org.apache.commons.bcel6.generic
 public class DUP2 extends StackInstruction implements PushInstruction {
 
     public DUP2() {
-        super(org.apache.commons.bcel6.Const.DUP2);
+        super(org.apache.bcel.Const.DUP2);
     }
 
 

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/DUP2_X1.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/DUP2_X1.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/DUP2_X1.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/DUP2_X1.java Tue Jun  7 17:28:43 2016
@@ -15,7 +15,7 @@
  *  limitations under the License.
  *
  */
-package org.apache.commons.bcel6.generic;
+package org.apache.bcel.generic;
 
 /** 
  * DUP2_X1 - Duplicate two top operand stack words and put three down
@@ -26,7 +26,7 @@ package org.apache.commons.bcel6.generic
 public class DUP2_X1 extends StackInstruction {
 
     public DUP2_X1() {
-        super(org.apache.commons.bcel6.Const.DUP2_X1);
+        super(org.apache.bcel.Const.DUP2_X1);
     }
 
 

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/DUP2_X2.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/DUP2_X2.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/DUP2_X2.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/DUP2_X2.java Tue Jun  7 17:28:43 2016
@@ -15,7 +15,7 @@
  *  limitations under the License.
  *
  */
-package org.apache.commons.bcel6.generic;
+package org.apache.bcel.generic;
 
 /** 
  * DUP2_X2 - Duplicate two top operand stack words and put four down
@@ -26,7 +26,7 @@ package org.apache.commons.bcel6.generic
 public class DUP2_X2 extends StackInstruction {
 
     public DUP2_X2() {
-        super(org.apache.commons.bcel6.Const.DUP2_X2);
+        super(org.apache.bcel.Const.DUP2_X2);
     }
 
 

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/DUP_X1.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/DUP_X1.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/DUP_X1.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/DUP_X1.java Tue Jun  7 17:28:43 2016
@@ -15,7 +15,7 @@
  *  limitations under the License.
  *
  */
-package org.apache.commons.bcel6.generic;
+package org.apache.bcel.generic;
 
 /** 
  * DUP_X1 - Duplicate top operand stack word and put two down
@@ -26,7 +26,7 @@ package org.apache.commons.bcel6.generic
 public class DUP_X1 extends StackInstruction {
 
     public DUP_X1() {
-        super(org.apache.commons.bcel6.Const.DUP_X1);
+        super(org.apache.bcel.Const.DUP_X1);
     }
 
 

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/DUP_X2.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/DUP_X2.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/DUP_X2.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/DUP_X2.java Tue Jun  7 17:28:43 2016
@@ -15,7 +15,7 @@
  *  limitations under the License.
  *
  */
-package org.apache.commons.bcel6.generic;
+package org.apache.bcel.generic;
 
 /** 
  * DUP_X2 - Duplicate top operand stack word and put three down
@@ -26,7 +26,7 @@ package org.apache.commons.bcel6.generic
 public class DUP_X2 extends StackInstruction {
 
     public DUP_X2() {
-        super(org.apache.commons.bcel6.Const.DUP_X2);
+        super(org.apache.bcel.Const.DUP_X2);
     }
 
 

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ElementValueGen.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ElementValueGen.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ElementValueGen.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ElementValueGen.java Tue Jun  7 17:28:43 2016
@@ -15,19 +15,19 @@
  *  limitations under the License.
  *
  */
-package org.apache.commons.bcel6.generic;
+package org.apache.bcel.generic;
 
 import java.io.DataInput;
 import java.io.DataOutputStream;
 import java.io.IOException;
 
-import org.apache.commons.bcel6.classfile.AnnotationElementValue;
-import org.apache.commons.bcel6.classfile.AnnotationEntry;
-import org.apache.commons.bcel6.classfile.ArrayElementValue;
-import org.apache.commons.bcel6.classfile.ClassElementValue;
-import org.apache.commons.bcel6.classfile.ElementValue;
-import org.apache.commons.bcel6.classfile.EnumElementValue;
-import org.apache.commons.bcel6.classfile.SimpleElementValue;
+import org.apache.bcel.classfile.AnnotationElementValue;
+import org.apache.bcel.classfile.AnnotationEntry;
+import org.apache.bcel.classfile.ArrayElementValue;
+import org.apache.bcel.classfile.ClassElementValue;
+import org.apache.bcel.classfile.ElementValue;
+import org.apache.bcel.classfile.EnumElementValue;
+import org.apache.bcel.classfile.SimpleElementValue;
 
 /**
  * @since 6.0

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ElementValuePairGen.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ElementValuePairGen.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ElementValuePairGen.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ElementValuePairGen.java Tue Jun  7 17:28:43 2016
@@ -15,14 +15,14 @@
  *  limitations under the License.
  *
  */
-package org.apache.commons.bcel6.generic;
+package org.apache.bcel.generic;
 
 import java.io.DataOutputStream;
 import java.io.IOException;
 
-import org.apache.commons.bcel6.classfile.ConstantUtf8;
-import org.apache.commons.bcel6.classfile.ElementValue;
-import org.apache.commons.bcel6.classfile.ElementValuePair;
+import org.apache.bcel.classfile.ConstantUtf8;
+import org.apache.bcel.classfile.ElementValue;
+import org.apache.bcel.classfile.ElementValuePair;
 
 /**
  * @since 6.0

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/EmptyVisitor.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/EmptyVisitor.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/EmptyVisitor.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/EmptyVisitor.java Tue Jun  7 17:28:43 2016
@@ -15,7 +15,7 @@
  *  limitations under the License.
  *
  */
-package org.apache.commons.bcel6.generic;
+package org.apache.bcel.generic;
 
 /**
  * Supplies empty method bodies to be overridden by subclasses.

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/EnumElementValueGen.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/EnumElementValueGen.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/EnumElementValueGen.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/EnumElementValueGen.java Tue Jun  7 17:28:43 2016
@@ -15,14 +15,14 @@
  *  limitations under the License.
  *
  */
-package org.apache.commons.bcel6.generic;
+package org.apache.bcel.generic;
 
 import java.io.DataOutputStream;
 import java.io.IOException;
 
-import org.apache.commons.bcel6.classfile.ConstantUtf8;
-import org.apache.commons.bcel6.classfile.ElementValue;
-import org.apache.commons.bcel6.classfile.EnumElementValue;
+import org.apache.bcel.classfile.ConstantUtf8;
+import org.apache.bcel.classfile.ElementValue;
+import org.apache.bcel.classfile.EnumElementValue;
 
 /**
  * @since 6.0

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ExceptionThrower.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ExceptionThrower.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ExceptionThrower.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ExceptionThrower.java Tue Jun  7 17:28:43 2016
@@ -15,7 +15,7 @@
  *  limitations under the License.
  *
  */
-package org.apache.commons.bcel6.generic;
+package org.apache.bcel.generic;
 
 /**
  * Denote an instruction that may throw a run-time or a linking