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 [6/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/verifier/structurals/GenericArray.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/structurals/GenericArray.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/structurals/GenericArray.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/structurals/GenericArray.java Tue Jun  7 17:28:43 2016
@@ -15,7 +15,7 @@
  *  limitations under the License.
  *
  */ 
-package org.apache.commons.bcel6.verifier.structurals;
+package org.apache.bcel.verifier.structurals;
 
 
 /**

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/structurals/InstConstraintVisitor.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/structurals/InstConstraintVisitor.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/structurals/InstConstraintVisitor.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/structurals/InstConstraintVisitor.java Tue Jun  7 17:28:43 2016
@@ -15,29 +15,29 @@
  *  limitations under the License.
  *
  */
-package org.apache.commons.bcel6.verifier.structurals;
+package org.apache.bcel.verifier.structurals;
 
 
-import org.apache.commons.bcel6.Const;
-import org.apache.commons.bcel6.Repository;
-import org.apache.commons.bcel6.classfile.Constant;
-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.ConstantLong;
-import org.apache.commons.bcel6.classfile.ConstantString;
-import org.apache.commons.bcel6.classfile.Field;
-import org.apache.commons.bcel6.classfile.JavaClass;
+import org.apache.bcel.Const;
+import org.apache.bcel.Repository;
+import org.apache.bcel.classfile.Constant;
+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.ConstantLong;
+import org.apache.bcel.classfile.ConstantString;
+import org.apache.bcel.classfile.Field;
+import org.apache.bcel.classfile.JavaClass;
 //CHECKSTYLE:OFF (there are lots of references!)
-import org.apache.commons.bcel6.generic.*;
+import org.apache.bcel.generic.*;
 //CHECKSTYLE:ON
-import org.apache.commons.bcel6.verifier.VerificationResult;
-import org.apache.commons.bcel6.verifier.Verifier;
-import org.apache.commons.bcel6.verifier.VerifierFactory;
-import org.apache.commons.bcel6.verifier.exc.AssertionViolatedException;
-import org.apache.commons.bcel6.verifier.exc.StructuralCodeConstraintException;
+import org.apache.bcel.verifier.VerificationResult;
+import org.apache.bcel.verifier.Verifier;
+import org.apache.bcel.verifier.VerifierFactory;
+import org.apache.bcel.verifier.exc.AssertionViolatedException;
+import org.apache.bcel.verifier.exc.StructuralCodeConstraintException;
 
 
 /**

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/structurals/InstructionContext.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/structurals/InstructionContext.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/structurals/InstructionContext.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/structurals/InstructionContext.java Tue Jun  7 17:28:43 2016
@@ -15,12 +15,12 @@
  *  limitations under the License.
  *
  */ 
-package org.apache.commons.bcel6.verifier.structurals;
+package org.apache.bcel.verifier.structurals;
 
 
 import java.util.ArrayList;
 
-import org.apache.commons.bcel6.generic.InstructionHandle;
+import org.apache.bcel.generic.InstructionHandle;
 
 /**
  * An InstructionContext offers convenient access

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/structurals/LocalVariables.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/structurals/LocalVariables.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/structurals/LocalVariables.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/structurals/LocalVariables.java Tue Jun  7 17:28:43 2016
@@ -15,13 +15,13 @@
  *  limitations under the License.
  *
  */ 
-package org.apache.commons.bcel6.verifier.structurals;
+package org.apache.bcel.verifier.structurals;
 
 
-import org.apache.commons.bcel6.generic.ReferenceType;
-import org.apache.commons.bcel6.generic.Type;
-import org.apache.commons.bcel6.verifier.exc.AssertionViolatedException;
-import org.apache.commons.bcel6.verifier.exc.StructuralCodeConstraintException;
+import org.apache.bcel.generic.ReferenceType;
+import org.apache.bcel.generic.Type;
+import org.apache.bcel.verifier.exc.AssertionViolatedException;
+import org.apache.bcel.verifier.exc.StructuralCodeConstraintException;
 
 /**
  * This class implements an array of local variables used for symbolic JVM
@@ -174,8 +174,8 @@ public class LocalVariables implements C
         else{
             if (! (locals[i].equals(lv.locals[i])) ){
 /*TODO
-                if ((locals[i] instanceof org.apache.commons.bcel6.generic.ReturnaddressType) &&
-                    (lv.locals[i] instanceof org.apache.commons.bcel6.generic.ReturnaddressType)){
+                if ((locals[i] instanceof org.apache.bcel.generic.ReturnaddressType) &&
+                    (lv.locals[i] instanceof org.apache.bcel.generic.ReturnaddressType)){
                     //System.err.println("merging "+locals[i]+" and "+lv.locals[i]);
                     throw new AssertionViolatedException("Merging different ReturnAddresses: '"+locals[i]+"' and '"+lv.locals[i]+"'.");
                 }

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/structurals/OperandStack.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/structurals/OperandStack.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/structurals/OperandStack.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/structurals/OperandStack.java Tue Jun  7 17:28:43 2016
@@ -15,16 +15,16 @@
  *  limitations under the License.
  *
  */ 
-package org.apache.commons.bcel6.verifier.structurals;
+package org.apache.bcel.verifier.structurals;
 
 
 import java.util.ArrayList;
 
-import org.apache.commons.bcel6.generic.ObjectType;
-import org.apache.commons.bcel6.generic.ReferenceType;
-import org.apache.commons.bcel6.generic.Type;
-import org.apache.commons.bcel6.verifier.exc.AssertionViolatedException;
-import org.apache.commons.bcel6.verifier.exc.StructuralCodeConstraintException;
+import org.apache.bcel.generic.ObjectType;
+import org.apache.bcel.generic.ReferenceType;
+import org.apache.bcel.generic.Type;
+import org.apache.bcel.verifier.exc.AssertionViolatedException;
+import org.apache.bcel.verifier.exc.StructuralCodeConstraintException;
 
 /**
  * This class implements a stack used for symbolic JVM stack simulation.

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/structurals/Pass3bVerifier.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/structurals/Pass3bVerifier.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/structurals/Pass3bVerifier.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/structurals/Pass3bVerifier.java Tue Jun  7 17:28:43 2016
@@ -15,7 +15,7 @@
  *  limitations under the License.
  *
  */
-package org.apache.commons.bcel6.verifier.structurals;
+package org.apache.bcel.verifier.structurals;
 
 
 import java.io.PrintWriter;
@@ -25,26 +25,26 @@ import java.util.List;
 import java.util.Random;
 import java.util.Vector;
 
-import org.apache.commons.bcel6.Const;
-import org.apache.commons.bcel6.Repository;
-import org.apache.commons.bcel6.classfile.JavaClass;
-import org.apache.commons.bcel6.classfile.Method;
-import org.apache.commons.bcel6.generic.ConstantPoolGen;
-import org.apache.commons.bcel6.generic.InstructionHandle;
-import org.apache.commons.bcel6.generic.JsrInstruction;
-import org.apache.commons.bcel6.generic.MethodGen;
-import org.apache.commons.bcel6.generic.ObjectType;
-import org.apache.commons.bcel6.generic.RET;
-import org.apache.commons.bcel6.generic.ReferenceType;
-import org.apache.commons.bcel6.generic.ReturnInstruction;
-import org.apache.commons.bcel6.generic.ReturnaddressType;
-import org.apache.commons.bcel6.generic.Type;
-import org.apache.commons.bcel6.verifier.PassVerifier;
-import org.apache.commons.bcel6.verifier.VerificationResult;
-import org.apache.commons.bcel6.verifier.Verifier;
-import org.apache.commons.bcel6.verifier.exc.AssertionViolatedException;
-import org.apache.commons.bcel6.verifier.exc.StructuralCodeConstraintException;
-import org.apache.commons.bcel6.verifier.exc.VerifierConstraintViolatedException;
+import org.apache.bcel.Const;
+import org.apache.bcel.Repository;
+import org.apache.bcel.classfile.JavaClass;
+import org.apache.bcel.classfile.Method;
+import org.apache.bcel.generic.ConstantPoolGen;
+import org.apache.bcel.generic.InstructionHandle;
+import org.apache.bcel.generic.JsrInstruction;
+import org.apache.bcel.generic.MethodGen;
+import org.apache.bcel.generic.ObjectType;
+import org.apache.bcel.generic.RET;
+import org.apache.bcel.generic.ReferenceType;
+import org.apache.bcel.generic.ReturnInstruction;
+import org.apache.bcel.generic.ReturnaddressType;
+import org.apache.bcel.generic.Type;
+import org.apache.bcel.verifier.PassVerifier;
+import org.apache.bcel.verifier.VerificationResult;
+import org.apache.bcel.verifier.Verifier;
+import org.apache.bcel.verifier.exc.AssertionViolatedException;
+import org.apache.bcel.verifier.exc.StructuralCodeConstraintException;
+import org.apache.bcel.verifier.exc.VerifierConstraintViolatedException;
 
 /**
  * This PassVerifier verifies a method of class file according to pass 3,
@@ -112,7 +112,7 @@ public final class Pass3bVerifier extend
     /**
      * This class should only be instantiated by a Verifier.
      *
-     * @see org.apache.commons.bcel6.verifier.Verifier
+     * @see org.apache.bcel.verifier.Verifier
      */
     public Pass3bVerifier(final Verifier owner, final int method_no){
         myOwner = owner;
@@ -306,8 +306,8 @@ public final class Pass3bVerifier extend
       * verifier-inferred types and the class file's debug information (LocalVariables
       * attributes) match [TODO].
       *
-      * @see org.apache.commons.bcel6.verifier.statics.LocalVariablesInfo
-      * @see org.apache.commons.bcel6.verifier.statics.Pass2Verifier#getLocalVariablesInfo(int)
+      * @see org.apache.bcel.verifier.statics.LocalVariablesInfo
+      * @see org.apache.bcel.verifier.statics.Pass2Verifier#getLocalVariablesInfo(int)
       */
     @Override
     public VerificationResult do_verify(){

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/structurals/Subroutine.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/structurals/Subroutine.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/structurals/Subroutine.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/structurals/Subroutine.java Tue Jun  7 17:28:43 2016
@@ -15,10 +15,10 @@
  *  limitations under the License.
  *
  */ 
-package org.apache.commons.bcel6.verifier.structurals;
+package org.apache.bcel.verifier.structurals;
 
 
-import org.apache.commons.bcel6.generic.InstructionHandle;
+import org.apache.bcel.generic.InstructionHandle;
 
 /**
  * This interface defines properties of JVM bytecode subroutines.

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/structurals/Subroutines.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/structurals/Subroutines.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/structurals/Subroutines.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/structurals/Subroutines.java Tue Jun  7 17:28:43 2016
@@ -15,7 +15,7 @@
  *  limitations under the License.
  *
  */ 
-package org.apache.commons.bcel6.verifier.structurals;
+package org.apache.bcel.verifier.structurals;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -24,22 +24,22 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.commons.bcel6.generic.ASTORE;
-import org.apache.commons.bcel6.generic.ATHROW;
-import org.apache.commons.bcel6.generic.BranchInstruction;
-import org.apache.commons.bcel6.generic.CodeExceptionGen;
-import org.apache.commons.bcel6.generic.GotoInstruction;
-import org.apache.commons.bcel6.generic.IndexedInstruction;
-import org.apache.commons.bcel6.generic.Instruction;
-import org.apache.commons.bcel6.generic.InstructionHandle;
-import org.apache.commons.bcel6.generic.JsrInstruction;
-import org.apache.commons.bcel6.generic.LocalVariableInstruction;
-import org.apache.commons.bcel6.generic.MethodGen;
-import org.apache.commons.bcel6.generic.RET;
-import org.apache.commons.bcel6.generic.ReturnInstruction;
-import org.apache.commons.bcel6.generic.Select;
-import org.apache.commons.bcel6.verifier.exc.AssertionViolatedException;
-import org.apache.commons.bcel6.verifier.exc.StructuralCodeConstraintException;
+import org.apache.bcel.generic.ASTORE;
+import org.apache.bcel.generic.ATHROW;
+import org.apache.bcel.generic.BranchInstruction;
+import org.apache.bcel.generic.CodeExceptionGen;
+import org.apache.bcel.generic.GotoInstruction;
+import org.apache.bcel.generic.IndexedInstruction;
+import org.apache.bcel.generic.Instruction;
+import org.apache.bcel.generic.InstructionHandle;
+import org.apache.bcel.generic.JsrInstruction;
+import org.apache.bcel.generic.LocalVariableInstruction;
+import org.apache.bcel.generic.MethodGen;
+import org.apache.bcel.generic.RET;
+import org.apache.bcel.generic.ReturnInstruction;
+import org.apache.bcel.generic.Select;
+import org.apache.bcel.verifier.exc.AssertionViolatedException;
+import org.apache.bcel.verifier.exc.StructuralCodeConstraintException;
 
 /**
  * Instances of this class contain information about the subroutines

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/structurals/UninitializedObjectType.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/structurals/UninitializedObjectType.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/structurals/UninitializedObjectType.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/structurals/UninitializedObjectType.java Tue Jun  7 17:28:43 2016
@@ -15,12 +15,12 @@
  *  limitations under the License.
  *
  */ 
-package org.apache.commons.bcel6.verifier.structurals;
+package org.apache.bcel.verifier.structurals;
 
 
-import org.apache.commons.bcel6.Const;
-import org.apache.commons.bcel6.generic.ObjectType;
-import org.apache.commons.bcel6.generic.ReferenceType;
+import org.apache.bcel.Const;
+import org.apache.bcel.generic.ObjectType;
+import org.apache.bcel.generic.ReferenceType;
 
 /**
  * This class represents an uninitialized object type; see The Java

Modified: commons/proper/bcel/trunk/src/test/java/org/apache/bcel/classfile/JDKClassDumpTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/test/java/org/apache/bcel/classfile/JDKClassDumpTestCase.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/test/java/org/apache/bcel/classfile/JDKClassDumpTestCase.java (original)
+++ commons/proper/bcel/trunk/src/test/java/org/apache/bcel/classfile/JDKClassDumpTestCase.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 static org.junit.Assert.assertEquals;
 

Modified: commons/proper/bcel/trunk/src/test/java/org/apache/bcel/classfile/UtilityTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/test/java/org/apache/bcel/classfile/UtilityTestCase.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/test/java/org/apache/bcel/classfile/UtilityTestCase.java (original)
+++ commons/proper/bcel/trunk/src/test/java/org/apache/bcel/classfile/UtilityTestCase.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 junit.framework.TestCase;
 

Modified: commons/proper/bcel/trunk/src/test/java/org/apache/bcel/data/AnnotatedFields.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/test/java/org/apache/bcel/data/AnnotatedFields.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/test/java/org/apache/bcel/data/AnnotatedFields.java (original)
+++ commons/proper/bcel/trunk/src/test/java/org/apache/bcel/data/AnnotatedFields.java Tue Jun  7 17:28:43 2016
@@ -16,7 +16,7 @@
  * 
  */
 
-package org.apache.commons.bcel6.data;
+package org.apache.bcel.data;
 
 public class AnnotatedFields {
   @SimpleAnnotation(id=1) int i;

Modified: commons/proper/bcel/trunk/src/test/java/org/apache/bcel/data/AnnotatedWithCombinedAnnotation.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/test/java/org/apache/bcel/data/AnnotatedWithCombinedAnnotation.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/test/java/org/apache/bcel/data/AnnotatedWithCombinedAnnotation.java (original)
+++ commons/proper/bcel/trunk/src/test/java/org/apache/bcel/data/AnnotatedWithCombinedAnnotation.java Tue Jun  7 17:28:43 2016
@@ -16,7 +16,7 @@
  *
  */
 
-package org.apache.commons.bcel6.data;
+package org.apache.bcel.data;
 
 @CombinedAnnotation( { @SimpleAnnotation(id = 4) })
 public class AnnotatedWithCombinedAnnotation

Modified: commons/proper/bcel/trunk/src/test/java/org/apache/bcel/data/AnnotatedWithEnumClass.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/test/java/org/apache/bcel/data/AnnotatedWithEnumClass.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/test/java/org/apache/bcel/data/AnnotatedWithEnumClass.java (original)
+++ commons/proper/bcel/trunk/src/test/java/org/apache/bcel/data/AnnotatedWithEnumClass.java Tue Jun  7 17:28:43 2016
@@ -16,7 +16,7 @@
  * 
  */
 
-package org.apache.commons.bcel6.data;
+package org.apache.bcel.data;
 
 @AnnotationEnumElement(enumval = SimpleEnum.Red)
 public class AnnotatedWithEnumClass

Modified: commons/proper/bcel/trunk/src/test/java/org/apache/bcel/data/AnnotationEnumElement.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/test/java/org/apache/bcel/data/AnnotationEnumElement.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/test/java/org/apache/bcel/data/AnnotationEnumElement.java (original)
+++ commons/proper/bcel/trunk/src/test/java/org/apache/bcel/data/AnnotationEnumElement.java Tue Jun  7 17:28:43 2016
@@ -16,7 +16,7 @@
  * 
  */
 
-package org.apache.commons.bcel6.data;
+package org.apache.bcel.data;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;

Modified: commons/proper/bcel/trunk/src/test/java/org/apache/bcel/data/AnonymousClassTest.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/test/java/org/apache/bcel/data/AnonymousClassTest.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/test/java/org/apache/bcel/data/AnonymousClassTest.java (original)
+++ commons/proper/bcel/trunk/src/test/java/org/apache/bcel/data/AnonymousClassTest.java Tue Jun  7 17:28:43 2016
@@ -16,7 +16,7 @@
  * 
  */
 
-package org.apache.commons.bcel6.data;
+package org.apache.bcel.data;
 
 public class AnonymousClassTest
 {

Modified: commons/proper/bcel/trunk/src/test/java/org/apache/bcel/data/AttributeTestClassEM01.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/test/java/org/apache/bcel/data/AttributeTestClassEM01.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/test/java/org/apache/bcel/data/AttributeTestClassEM01.java (original)
+++ commons/proper/bcel/trunk/src/test/java/org/apache/bcel/data/AttributeTestClassEM01.java Tue Jun  7 17:28:43 2016
@@ -16,7 +16,7 @@
  * 
  */
 
-package org.apache.commons.bcel6.data;
+package org.apache.bcel.data;
 
 public class AttributeTestClassEM01
 {

Modified: commons/proper/bcel/trunk/src/test/java/org/apache/bcel/data/AttributeTestClassEM02.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/test/java/org/apache/bcel/data/AttributeTestClassEM02.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/test/java/org/apache/bcel/data/AttributeTestClassEM02.java (original)
+++ commons/proper/bcel/trunk/src/test/java/org/apache/bcel/data/AttributeTestClassEM02.java Tue Jun  7 17:28:43 2016
@@ -16,7 +16,7 @@
  * 
  */
 
-package org.apache.commons.bcel6.data;
+package org.apache.bcel.data;
 
 public class AttributeTestClassEM02
 {

Modified: commons/proper/bcel/trunk/src/test/java/org/apache/bcel/data/CombinedAnnotation.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/test/java/org/apache/bcel/data/CombinedAnnotation.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/test/java/org/apache/bcel/data/CombinedAnnotation.java (original)
+++ commons/proper/bcel/trunk/src/test/java/org/apache/bcel/data/CombinedAnnotation.java Tue Jun  7 17:28:43 2016
@@ -16,7 +16,7 @@
  * 
  */
 
-package org.apache.commons.bcel6.data;
+package org.apache.bcel.data;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;

Modified: commons/proper/bcel/trunk/src/test/java/org/apache/bcel/data/ComplexAnnotatedClass.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/test/java/org/apache/bcel/data/ComplexAnnotatedClass.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/test/java/org/apache/bcel/data/ComplexAnnotatedClass.java (original)
+++ commons/proper/bcel/trunk/src/test/java/org/apache/bcel/data/ComplexAnnotatedClass.java Tue Jun  7 17:28:43 2016
@@ -16,7 +16,7 @@
  * 
  */
 
-package org.apache.commons.bcel6.data;
+package org.apache.bcel.data;
 
 @ComplexAnnotation(ival = 4, bval = 2, cval = '5', fval = 3.0f, dval = 33.4, zval = false, jval = 56, sval = 99)
 public class ComplexAnnotatedClass

Modified: commons/proper/bcel/trunk/src/test/java/org/apache/bcel/data/ComplexAnnotation.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/test/java/org/apache/bcel/data/ComplexAnnotation.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/test/java/org/apache/bcel/data/ComplexAnnotation.java (original)
+++ commons/proper/bcel/trunk/src/test/java/org/apache/bcel/data/ComplexAnnotation.java Tue Jun  7 17:28:43 2016
@@ -16,7 +16,7 @@
  * 
  */
 
-package org.apache.commons.bcel6.data;
+package org.apache.bcel.data;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;

Modified: commons/proper/bcel/trunk/src/test/java/org/apache/bcel/data/MarkedType.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/test/java/org/apache/bcel/data/MarkedType.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/test/java/org/apache/bcel/data/MarkedType.java (original)
+++ commons/proper/bcel/trunk/src/test/java/org/apache/bcel/data/MarkedType.java Tue Jun  7 17:28:43 2016
@@ -16,7 +16,7 @@
  * 
  */
 
-package org.apache.commons.bcel6.data;
+package org.apache.bcel.data;
 
 @MarkerAnnotationInvisible
 @MarkerAnnotation

Modified: commons/proper/bcel/trunk/src/test/java/org/apache/bcel/data/MarkerAnnotation.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/test/java/org/apache/bcel/data/MarkerAnnotation.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/test/java/org/apache/bcel/data/MarkerAnnotation.java (original)
+++ commons/proper/bcel/trunk/src/test/java/org/apache/bcel/data/MarkerAnnotation.java Tue Jun  7 17:28:43 2016
@@ -16,7 +16,7 @@
  * 
  */
 
-package org.apache.commons.bcel6.data;
+package org.apache.bcel.data;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;

Modified: commons/proper/bcel/trunk/src/test/java/org/apache/bcel/data/MarkerAnnotationInvisible.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/test/java/org/apache/bcel/data/MarkerAnnotationInvisible.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/test/java/org/apache/bcel/data/MarkerAnnotationInvisible.java (original)
+++ commons/proper/bcel/trunk/src/test/java/org/apache/bcel/data/MarkerAnnotationInvisible.java Tue Jun  7 17:28:43 2016
@@ -16,7 +16,7 @@
  * 
  */
 
-package org.apache.commons.bcel6.data;
+package org.apache.bcel.data;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;

Modified: commons/proper/bcel/trunk/src/test/java/org/apache/bcel/data/PLSETestClass.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/test/java/org/apache/bcel/data/PLSETestClass.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/test/java/org/apache/bcel/data/PLSETestClass.java (original)
+++ commons/proper/bcel/trunk/src/test/java/org/apache/bcel/data/PLSETestClass.java Tue Jun  7 17:28:43 2016
@@ -16,7 +16,7 @@
  * 
  */
 
-package org.apache.commons.bcel6.data;
+package org.apache.bcel.data;
 
 import java.util.ArrayList;
 

Modified: commons/proper/bcel/trunk/src/test/java/org/apache/bcel/data/SimpleAnnotatedClass.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/test/java/org/apache/bcel/data/SimpleAnnotatedClass.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/test/java/org/apache/bcel/data/SimpleAnnotatedClass.java (original)
+++ commons/proper/bcel/trunk/src/test/java/org/apache/bcel/data/SimpleAnnotatedClass.java Tue Jun  7 17:28:43 2016
@@ -16,7 +16,7 @@
  * 
  */
 
-package org.apache.commons.bcel6.data;
+package org.apache.bcel.data;
 
 @SimpleAnnotation(id = 4)
 public class SimpleAnnotatedClass

Modified: commons/proper/bcel/trunk/src/test/java/org/apache/bcel/data/SimpleAnnotation.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/test/java/org/apache/bcel/data/SimpleAnnotation.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/test/java/org/apache/bcel/data/SimpleAnnotation.java (original)
+++ commons/proper/bcel/trunk/src/test/java/org/apache/bcel/data/SimpleAnnotation.java Tue Jun  7 17:28:43 2016
@@ -16,7 +16,7 @@
  * 
  */
 
-package org.apache.commons.bcel6.data;
+package org.apache.bcel.data;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;

Modified: commons/proper/bcel/trunk/src/test/java/org/apache/bcel/data/SimpleClass.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/test/java/org/apache/bcel/data/SimpleClass.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/test/java/org/apache/bcel/data/SimpleClass.java (original)
+++ commons/proper/bcel/trunk/src/test/java/org/apache/bcel/data/SimpleClass.java Tue Jun  7 17:28:43 2016
@@ -16,7 +16,7 @@
  * 
  */
 
-package org.apache.commons.bcel6.data;
+package org.apache.bcel.data;
 
 public class SimpleClass
 {

Modified: commons/proper/bcel/trunk/src/test/java/org/apache/bcel/data/SimpleEnum.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/test/java/org/apache/bcel/data/SimpleEnum.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/test/java/org/apache/bcel/data/SimpleEnum.java (original)
+++ commons/proper/bcel/trunk/src/test/java/org/apache/bcel/data/SimpleEnum.java Tue Jun  7 17:28:43 2016
@@ -16,6 +16,6 @@
  * 
  */
 
-package org.apache.commons.bcel6.data;
+package org.apache.bcel.data;
 
 public enum SimpleEnum { Red,Orange,Yellow,Green,Blue,Indigo,Violet }

Modified: commons/proper/bcel/trunk/src/test/java/org/apache/bcel/generic/AnnotationGenTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/test/java/org/apache/bcel/generic/AnnotationGenTestCase.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/test/java/org/apache/bcel/generic/AnnotationGenTestCase.java (original)
+++ commons/proper/bcel/trunk/src/test/java/org/apache/bcel/generic/AnnotationGenTestCase.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;
@@ -25,12 +25,12 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.commons.bcel6.AbstractTestCase;
-import org.apache.commons.bcel6.Const;
-import org.apache.commons.bcel6.classfile.Annotations;
-import org.apache.commons.bcel6.classfile.Attribute;
-import org.apache.commons.bcel6.classfile.RuntimeInvisibleAnnotations;
-import org.apache.commons.bcel6.classfile.RuntimeVisibleAnnotations;
+import org.apache.bcel.AbstractTestCase;
+import org.apache.bcel.Const;
+import org.apache.bcel.classfile.Annotations;
+import org.apache.bcel.classfile.Attribute;
+import org.apache.bcel.classfile.RuntimeInvisibleAnnotations;
+import org.apache.bcel.classfile.RuntimeVisibleAnnotations;
 
 public class AnnotationGenTestCase extends AbstractTestCase
 {

Modified: commons/proper/bcel/trunk/src/test/java/org/apache/bcel/generic/BranchHandleTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/test/java/org/apache/bcel/generic/BranchHandleTestCase.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/test/java/org/apache/bcel/generic/BranchHandleTestCase.java (original)
+++ commons/proper/bcel/trunk/src/test/java/org/apache/bcel/generic/BranchHandleTestCase.java Tue Jun  7 17:28:43 2016
@@ -1,4 +1,4 @@
-package org.apache.commons.bcel6.generic;
+package org.apache.bcel.generic;
 
 import org.junit.Assert;
 import org.junit.Test;

Modified: commons/proper/bcel/trunk/src/test/java/org/apache/bcel/generic/FieldAnnotationsTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/test/java/org/apache/bcel/generic/FieldAnnotationsTestCase.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/test/java/org/apache/bcel/generic/FieldAnnotationsTestCase.java (original)
+++ commons/proper/bcel/trunk/src/test/java/org/apache/bcel/generic/FieldAnnotationsTestCase.java Tue Jun  7 17:28:43 2016
@@ -16,17 +16,17 @@
  * 
  */
 
-package org.apache.commons.bcel6.generic;
+package org.apache.bcel.generic;
 
 import java.io.File;
 import java.io.IOException;
 
-import org.apache.commons.bcel6.AbstractTestCase;
-import org.apache.commons.bcel6.classfile.AnnotationEntry;
-import org.apache.commons.bcel6.classfile.ElementValuePair;
-import org.apache.commons.bcel6.classfile.Field;
-import org.apache.commons.bcel6.classfile.JavaClass;
-import org.apache.commons.bcel6.util.SyntheticRepository;
+import org.apache.bcel.AbstractTestCase;
+import org.apache.bcel.classfile.AnnotationEntry;
+import org.apache.bcel.classfile.ElementValuePair;
+import org.apache.bcel.classfile.Field;
+import org.apache.bcel.classfile.JavaClass;
+import org.apache.bcel.util.SyntheticRepository;
 
 public class FieldAnnotationsTestCase extends AbstractTestCase
 {

Modified: commons/proper/bcel/trunk/src/test/java/org/apache/bcel/generic/GeneratingAnnotatedClassesTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/test/java/org/apache/bcel/generic/GeneratingAnnotatedClassesTestCase.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/test/java/org/apache/bcel/generic/GeneratingAnnotatedClassesTestCase.java (original)
+++ commons/proper/bcel/trunk/src/test/java/org/apache/bcel/generic/GeneratingAnnotatedClassesTestCase.java Tue Jun  7 17:28:43 2016
@@ -15,23 +15,23 @@
  * limitations under the License.
  *
  */
-package org.apache.commons.bcel6.generic;
+package org.apache.bcel.generic;
 
 import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.commons.bcel6.AbstractTestCase;
-import org.apache.commons.bcel6.Const;
-import org.apache.commons.bcel6.classfile.AnnotationEntry;
-import org.apache.commons.bcel6.classfile.ArrayElementValue;
-import org.apache.commons.bcel6.classfile.ElementValue;
-import org.apache.commons.bcel6.classfile.ElementValuePair;
-import org.apache.commons.bcel6.classfile.JavaClass;
-import org.apache.commons.bcel6.classfile.Method;
-import org.apache.commons.bcel6.classfile.ParameterAnnotationEntry;
-import org.apache.commons.bcel6.classfile.SimpleElementValue;
-import org.apache.commons.bcel6.util.SyntheticRepository;
+import org.apache.bcel.AbstractTestCase;
+import org.apache.bcel.Const;
+import org.apache.bcel.classfile.AnnotationEntry;
+import org.apache.bcel.classfile.ArrayElementValue;
+import org.apache.bcel.classfile.ElementValue;
+import org.apache.bcel.classfile.ElementValuePair;
+import org.apache.bcel.classfile.JavaClass;
+import org.apache.bcel.classfile.Method;
+import org.apache.bcel.classfile.ParameterAnnotationEntry;
+import org.apache.bcel.classfile.SimpleElementValue;
+import org.apache.bcel.util.SyntheticRepository;
 
 /**
  * The program that some of the tests generate looks like this:

Modified: commons/proper/bcel/trunk/src/test/java/org/apache/bcel/generic/InstructionHandleTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/test/java/org/apache/bcel/generic/InstructionHandleTestCase.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/test/java/org/apache/bcel/generic/InstructionHandleTestCase.java (original)
+++ commons/proper/bcel/trunk/src/test/java/org/apache/bcel/generic/InstructionHandleTestCase.java Tue Jun  7 17:28:43 2016
@@ -1,4 +1,4 @@
-package org.apache.commons.bcel6.generic;
+package org.apache.bcel.generic;
 
 import org.junit.Assert;
 import org.junit.Test;

Modified: commons/proper/bcel/trunk/src/test/java/org/apache/bcel/generic/JDKGenericDumpTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/test/java/org/apache/bcel/generic/JDKGenericDumpTestCase.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/test/java/org/apache/bcel/generic/JDKGenericDumpTestCase.java (original)
+++ commons/proper/bcel/trunk/src/test/java/org/apache/bcel/generic/JDKGenericDumpTestCase.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 static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.fail;
@@ -27,10 +27,10 @@ import java.util.Enumeration;
 import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
 
-import org.apache.commons.bcel6.classfile.ClassParser;
-import org.apache.commons.bcel6.classfile.Code;
-import org.apache.commons.bcel6.classfile.JavaClass;
-import org.apache.commons.bcel6.classfile.Method;
+import org.apache.bcel.classfile.ClassParser;
+import org.apache.bcel.classfile.Code;
+import org.apache.bcel.classfile.JavaClass;
+import org.apache.bcel.classfile.Method;
 import org.junit.Test;
 
 /**

Modified: commons/proper/bcel/trunk/src/test/java/org/apache/bcel/generic/MethodGenTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/test/java/org/apache/bcel/generic/MethodGenTestCase.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/test/java/org/apache/bcel/generic/MethodGenTestCase.java (original)
+++ commons/proper/bcel/trunk/src/test/java/org/apache/bcel/generic/MethodGenTestCase.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.util.Arrays;
 
-import org.apache.commons.bcel6.Repository;
-import org.apache.commons.bcel6.classfile.JavaClass;
-import org.apache.commons.bcel6.classfile.Method;
+import org.apache.bcel.Repository;
+import org.apache.bcel.classfile.JavaClass;
+import org.apache.bcel.classfile.Method;
 
 import junit.framework.TestCase;
 

Modified: commons/proper/bcel/trunk/src/test/java/org/apache/bcel/util/BCELifierTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/test/java/org/apache/bcel/util/BCELifierTestCase.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/test/java/org/apache/bcel/util/BCELifierTestCase.java (original)
+++ commons/proper/bcel/trunk/src/test/java/org/apache/bcel/util/BCELifierTestCase.java Tue Jun  7 17:28:43 2016
@@ -1,4 +1,4 @@
-package org.apache.commons.bcel6.util;
+package org.apache.bcel.util;
 
 import static org.junit.Assert.*;
 
@@ -8,7 +8,7 @@ import java.io.File;
 import java.io.FileOutputStream;
 import java.io.InputStream;
 import java.io.OutputStream;
-import org.apache.commons.bcel6.classfile.JavaClass;
+import org.apache.bcel.classfile.JavaClass;
 import org.junit.Test;
 
 

Modified: commons/proper/bcel/trunk/src/test/java/org/apache/bcel/util/Class2HTMLTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/test/java/org/apache/bcel/util/Class2HTMLTestCase.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/test/java/org/apache/bcel/util/Class2HTMLTestCase.java (original)
+++ commons/proper/bcel/trunk/src/test/java/org/apache/bcel/util/Class2HTMLTestCase.java Tue Jun  7 17:28:43 2016
@@ -15,12 +15,12 @@
  * limitations under the License.
  */
 
-package org.apache.commons.bcel6.util;
+package org.apache.bcel.util;
 
 import java.io.File;
 import java.io.FileInputStream;
 
-import org.apache.commons.bcel6.classfile.ClassParser;
+import org.apache.bcel.classfile.ClassParser;
 import org.junit.Assert;
 
 import junit.framework.TestCase;

Modified: commons/proper/bcel/trunk/src/test/java/org/apache/bcel/util/InstructionFinderTest.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/test/java/org/apache/bcel/util/InstructionFinderTest.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/test/java/org/apache/bcel/util/InstructionFinderTest.java (original)
+++ commons/proper/bcel/trunk/src/test/java/org/apache/bcel/util/InstructionFinderTest.java Tue Jun  7 17:28:43 2016
@@ -16,16 +16,16 @@
  * 
  */
 
-package org.apache.commons.bcel6.util;
+package org.apache.bcel.util;
 
 import java.util.Iterator;
 
-import org.apache.commons.bcel6.AbstractTestCase;
-import org.apache.commons.bcel6.generic.IADD;
-import org.apache.commons.bcel6.generic.ILOAD;
-import org.apache.commons.bcel6.generic.ISTORE;
-import org.apache.commons.bcel6.generic.InstructionHandle;
-import org.apache.commons.bcel6.generic.InstructionList;
+import org.apache.bcel.AbstractTestCase;
+import org.apache.bcel.generic.IADD;
+import org.apache.bcel.generic.ILOAD;
+import org.apache.bcel.generic.ISTORE;
+import org.apache.bcel.generic.InstructionHandle;
+import org.apache.bcel.generic.InstructionList;
 
 public class InstructionFinderTest extends AbstractTestCase {
 

Modified: commons/proper/bcel/trunk/src/test/java/org/apache/bcel/verifier/AbstractVerifierTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/test/java/org/apache/bcel/verifier/AbstractVerifierTestCase.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/test/java/org/apache/bcel/verifier/AbstractVerifierTestCase.java (original)
+++ commons/proper/bcel/trunk/src/test/java/org/apache/bcel/verifier/AbstractVerifierTestCase.java Tue Jun  7 17:28:43 2016
@@ -16,10 +16,10 @@
  * 
  */
 
-package org.apache.commons.bcel6.verifier;
+package org.apache.bcel.verifier;
 
-import org.apache.commons.bcel6.Repository;
-import org.apache.commons.bcel6.classfile.JavaClass;
+import org.apache.bcel.Repository;
+import org.apache.bcel.classfile.JavaClass;
 
 import junit.framework.TestCase;
 

Modified: commons/proper/bcel/trunk/src/test/java/org/apache/bcel/verifier/VerifierArrayAccessTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/test/java/org/apache/bcel/verifier/VerifierArrayAccessTestCase.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/test/java/org/apache/bcel/verifier/VerifierArrayAccessTestCase.java (original)
+++ commons/proper/bcel/trunk/src/test/java/org/apache/bcel/verifier/VerifierArrayAccessTestCase.java Tue Jun  7 17:28:43 2016
@@ -16,13 +16,13 @@
  * 
  */
 
-package org.apache.commons.bcel6.verifier;
+package org.apache.bcel.verifier;
 
 import java.io.IOException;
 
-import org.apache.commons.bcel6.verifier.tests.TestArrayAccess02Creator;
-import org.apache.commons.bcel6.verifier.tests.TestArrayAccess03Creator;
-import org.apache.commons.bcel6.verifier.tests.TestArrayAccess04Creator;
+import org.apache.bcel.verifier.tests.TestArrayAccess02Creator;
+import org.apache.bcel.verifier.tests.TestArrayAccess03Creator;
+import org.apache.bcel.verifier.tests.TestArrayAccess04Creator;
 
 public class VerifierArrayAccessTestCase extends AbstractVerifierTestCase {
     

Modified: commons/proper/bcel/trunk/src/test/java/org/apache/bcel/verifier/VerifierInvokeTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/test/java/org/apache/bcel/verifier/VerifierInvokeTestCase.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/test/java/org/apache/bcel/verifier/VerifierInvokeTestCase.java (original)
+++ commons/proper/bcel/trunk/src/test/java/org/apache/bcel/verifier/VerifierInvokeTestCase.java Tue Jun  7 17:28:43 2016
@@ -16,7 +16,7 @@
  * 
  */
 
-package org.apache.commons.bcel6.verifier;
+package org.apache.bcel.verifier;
 
 
 public class VerifierInvokeTestCase extends AbstractVerifierTestCase {

Modified: commons/proper/bcel/trunk/src/test/java/org/apache/bcel/verifier/VerifierReturnTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/test/java/org/apache/bcel/verifier/VerifierReturnTestCase.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/test/java/org/apache/bcel/verifier/VerifierReturnTestCase.java (original)
+++ commons/proper/bcel/trunk/src/test/java/org/apache/bcel/verifier/VerifierReturnTestCase.java Tue Jun  7 17:28:43 2016
@@ -15,12 +15,12 @@
  * limitations under the License.
  */
 
-package org.apache.commons.bcel6.verifier;
+package org.apache.bcel.verifier;
 
 import java.io.IOException;
 
-import org.apache.commons.bcel6.verifier.tests.TestReturn01Creator;
-import org.apache.commons.bcel6.verifier.tests.TestReturn03Creator;
+import org.apache.bcel.verifier.tests.TestReturn01Creator;
+import org.apache.bcel.verifier.tests.TestReturn03Creator;
 
 public class VerifierReturnTestCase extends AbstractVerifierTestCase {
 

Modified: commons/proper/bcel/trunk/src/test/java/org/apache/bcel/verifier/VerifierTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/test/java/org/apache/bcel/verifier/VerifierTestCase.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/test/java/org/apache/bcel/verifier/VerifierTestCase.java (original)
+++ commons/proper/bcel/trunk/src/test/java/org/apache/bcel/verifier/VerifierTestCase.java Tue Jun  7 17:28:43 2016
@@ -16,7 +16,7 @@
  * 
  */
 
-package org.apache.commons.bcel6.verifier;
+package org.apache.bcel.verifier;
 
 import java.util.Collection;
 

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

Modified: commons/proper/bcel/trunk/src/test/java/org/apache/bcel/verifier/tests/TestArrayAccess01.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/test/java/org/apache/bcel/verifier/tests/TestArrayAccess01.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/test/java/org/apache/bcel/verifier/tests/TestArrayAccess01.java (original)
+++ commons/proper/bcel/trunk/src/test/java/org/apache/bcel/verifier/tests/TestArrayAccess01.java Tue Jun  7 17:28:43 2016
@@ -15,7 +15,7 @@
  * limitations under the License.
  * 
  */
-package org.apache.commons.bcel6.verifier.tests;
+package org.apache.bcel.verifier.tests;
 
 
 public class TestArrayAccess01 extends XTestArray01{

Modified: commons/proper/bcel/trunk/src/test/java/org/apache/bcel/verifier/tests/TestArrayAccess02Creator.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/test/java/org/apache/bcel/verifier/tests/TestArrayAccess02Creator.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/test/java/org/apache/bcel/verifier/tests/TestArrayAccess02Creator.java (original)
+++ commons/proper/bcel/trunk/src/test/java/org/apache/bcel/verifier/tests/TestArrayAccess02Creator.java Tue Jun  7 17:28:43 2016
@@ -15,22 +15,22 @@
  * limitations under the License.
  * 
  */
-package org.apache.commons.bcel6.verifier.tests;
+package org.apache.bcel.verifier.tests;
 
 import java.io.IOException;
 import java.io.OutputStream;
 
-import org.apache.commons.bcel6.Const;
-import org.apache.commons.bcel6.generic.ClassGen;
-import org.apache.commons.bcel6.generic.ConstantPoolGen;
-import org.apache.commons.bcel6.generic.InstructionConst;
-import org.apache.commons.bcel6.generic.InstructionFactory;
-import org.apache.commons.bcel6.generic.InstructionHandle;
-import org.apache.commons.bcel6.generic.InstructionList;
-import org.apache.commons.bcel6.generic.MethodGen;
-import org.apache.commons.bcel6.generic.ObjectType;
-import org.apache.commons.bcel6.generic.PUSH;
-import org.apache.commons.bcel6.generic.Type;
+import org.apache.bcel.Const;
+import org.apache.bcel.generic.ClassGen;
+import org.apache.bcel.generic.ConstantPoolGen;
+import org.apache.bcel.generic.InstructionConst;
+import org.apache.bcel.generic.InstructionFactory;
+import org.apache.bcel.generic.InstructionHandle;
+import org.apache.bcel.generic.InstructionList;
+import org.apache.bcel.generic.MethodGen;
+import org.apache.bcel.generic.ObjectType;
+import org.apache.bcel.generic.PUSH;
+import org.apache.bcel.generic.Type;
 import org.junit.Assert;
 
 public class TestArrayAccess02Creator extends TestCreator {

Modified: commons/proper/bcel/trunk/src/test/java/org/apache/bcel/verifier/tests/TestArrayAccess03Creator.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/test/java/org/apache/bcel/verifier/tests/TestArrayAccess03Creator.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/test/java/org/apache/bcel/verifier/tests/TestArrayAccess03Creator.java (original)
+++ commons/proper/bcel/trunk/src/test/java/org/apache/bcel/verifier/tests/TestArrayAccess03Creator.java Tue Jun  7 17:28:43 2016
@@ -15,22 +15,22 @@
  * limitations under the License.
  * 
  */
-package org.apache.commons.bcel6.verifier.tests;
+package org.apache.bcel.verifier.tests;
 
 import java.io.IOException;
 import java.io.OutputStream;
 
-import org.apache.commons.bcel6.Const;
-import org.apache.commons.bcel6.generic.ClassGen;
-import org.apache.commons.bcel6.generic.ConstantPoolGen;
-import org.apache.commons.bcel6.generic.InstructionConst;
-import org.apache.commons.bcel6.generic.InstructionFactory;
-import org.apache.commons.bcel6.generic.InstructionHandle;
-import org.apache.commons.bcel6.generic.InstructionList;
-import org.apache.commons.bcel6.generic.MethodGen;
-import org.apache.commons.bcel6.generic.ObjectType;
-import org.apache.commons.bcel6.generic.PUSH;
-import org.apache.commons.bcel6.generic.Type;
+import org.apache.bcel.Const;
+import org.apache.bcel.generic.ClassGen;
+import org.apache.bcel.generic.ConstantPoolGen;
+import org.apache.bcel.generic.InstructionConst;
+import org.apache.bcel.generic.InstructionFactory;
+import org.apache.bcel.generic.InstructionHandle;
+import org.apache.bcel.generic.InstructionList;
+import org.apache.bcel.generic.MethodGen;
+import org.apache.bcel.generic.ObjectType;
+import org.apache.bcel.generic.PUSH;
+import org.apache.bcel.generic.Type;
 import org.junit.Assert;
 
 public class TestArrayAccess03Creator extends TestCreator {

Modified: commons/proper/bcel/trunk/src/test/java/org/apache/bcel/verifier/tests/TestArrayAccess04Creator.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/test/java/org/apache/bcel/verifier/tests/TestArrayAccess04Creator.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/test/java/org/apache/bcel/verifier/tests/TestArrayAccess04Creator.java (original)
+++ commons/proper/bcel/trunk/src/test/java/org/apache/bcel/verifier/tests/TestArrayAccess04Creator.java Tue Jun  7 17:28:43 2016
@@ -16,21 +16,21 @@
  * 
  */
 
-package org.apache.commons.bcel6.verifier.tests;
+package org.apache.bcel.verifier.tests;
 
 import java.io.IOException;
 import java.io.OutputStream;
 
-import org.apache.commons.bcel6.Const;
-import org.apache.commons.bcel6.generic.ClassGen;
-import org.apache.commons.bcel6.generic.ConstantPoolGen;
-import org.apache.commons.bcel6.generic.InstructionConst;
-import org.apache.commons.bcel6.generic.InstructionFactory;
-import org.apache.commons.bcel6.generic.InstructionHandle;
-import org.apache.commons.bcel6.generic.InstructionList;
-import org.apache.commons.bcel6.generic.MethodGen;
-import org.apache.commons.bcel6.generic.PUSH;
-import org.apache.commons.bcel6.generic.Type;
+import org.apache.bcel.Const;
+import org.apache.bcel.generic.ClassGen;
+import org.apache.bcel.generic.ConstantPoolGen;
+import org.apache.bcel.generic.InstructionConst;
+import org.apache.bcel.generic.InstructionFactory;
+import org.apache.bcel.generic.InstructionHandle;
+import org.apache.bcel.generic.InstructionList;
+import org.apache.bcel.generic.MethodGen;
+import org.apache.bcel.generic.PUSH;
+import org.apache.bcel.generic.Type;
 import org.junit.Assert;
 
 public class TestArrayAccess04Creator extends TestCreator {

Modified: commons/proper/bcel/trunk/src/test/java/org/apache/bcel/verifier/tests/TestCreator.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/test/java/org/apache/bcel/verifier/tests/TestCreator.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/test/java/org/apache/bcel/verifier/tests/TestCreator.java (original)
+++ commons/proper/bcel/trunk/src/test/java/org/apache/bcel/verifier/tests/TestCreator.java Tue Jun  7 17:28:43 2016
@@ -1,4 +1,4 @@
-package org.apache.commons.bcel6.verifier.tests;
+package org.apache.bcel.verifier.tests;
 
 import java.io.File;
 import java.io.FileOutputStream;

Modified: commons/proper/bcel/trunk/src/test/java/org/apache/bcel/verifier/tests/TestLegalInvokeInterface01.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/test/java/org/apache/bcel/verifier/tests/TestLegalInvokeInterface01.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/test/java/org/apache/bcel/verifier/tests/TestLegalInvokeInterface01.java (original)
+++ commons/proper/bcel/trunk/src/test/java/org/apache/bcel/verifier/tests/TestLegalInvokeInterface01.java Tue Jun  7 17:28:43 2016
@@ -15,7 +15,7 @@
  * limitations under the License.
  * 
  */
-package org.apache.commons.bcel6.verifier.tests;
+package org.apache.bcel.verifier.tests;
 
 public class TestLegalInvokeInterface01{
 

Modified: commons/proper/bcel/trunk/src/test/java/org/apache/bcel/verifier/tests/TestLegalInvokeSpecial01.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/test/java/org/apache/bcel/verifier/tests/TestLegalInvokeSpecial01.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/test/java/org/apache/bcel/verifier/tests/TestLegalInvokeSpecial01.java (original)
+++ commons/proper/bcel/trunk/src/test/java/org/apache/bcel/verifier/tests/TestLegalInvokeSpecial01.java Tue Jun  7 17:28:43 2016
@@ -15,7 +15,7 @@
  * limitations under the License.
  * 
  */
-package org.apache.commons.bcel6.verifier.tests;
+package org.apache.bcel.verifier.tests;
 
 public class TestLegalInvokeSpecial01{
 

Modified: commons/proper/bcel/trunk/src/test/java/org/apache/bcel/verifier/tests/TestLegalInvokeSpecial02.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/test/java/org/apache/bcel/verifier/tests/TestLegalInvokeSpecial02.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/test/java/org/apache/bcel/verifier/tests/TestLegalInvokeSpecial02.java (original)
+++ commons/proper/bcel/trunk/src/test/java/org/apache/bcel/verifier/tests/TestLegalInvokeSpecial02.java Tue Jun  7 17:28:43 2016
@@ -15,7 +15,7 @@
  * limitations under the License.
  * 
  */
-package org.apache.commons.bcel6.verifier.tests;
+package org.apache.bcel.verifier.tests;
 
 public abstract class TestLegalInvokeSpecial02 implements Runnable{
 

Modified: commons/proper/bcel/trunk/src/test/java/org/apache/bcel/verifier/tests/TestLegalInvokeStatic01.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/test/java/org/apache/bcel/verifier/tests/TestLegalInvokeStatic01.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/test/java/org/apache/bcel/verifier/tests/TestLegalInvokeStatic01.java (original)
+++ commons/proper/bcel/trunk/src/test/java/org/apache/bcel/verifier/tests/TestLegalInvokeStatic01.java Tue Jun  7 17:28:43 2016
@@ -15,7 +15,7 @@
  * limitations under the License.
  * 
  */
-package org.apache.commons.bcel6.verifier.tests;
+package org.apache.bcel.verifier.tests;
 
 public class TestLegalInvokeStatic01 extends Thread{
 

Modified: commons/proper/bcel/trunk/src/test/java/org/apache/bcel/verifier/tests/TestLegalInvokeVirtual01.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/test/java/org/apache/bcel/verifier/tests/TestLegalInvokeVirtual01.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/test/java/org/apache/bcel/verifier/tests/TestLegalInvokeVirtual01.java (original)
+++ commons/proper/bcel/trunk/src/test/java/org/apache/bcel/verifier/tests/TestLegalInvokeVirtual01.java Tue Jun  7 17:28:43 2016
@@ -15,7 +15,7 @@
  * limitations under the License.
  * 
  */
-package org.apache.commons.bcel6.verifier.tests;
+package org.apache.bcel.verifier.tests;
 
 public class TestLegalInvokeVirtual01 {
 

Modified: commons/proper/bcel/trunk/src/test/java/org/apache/bcel/verifier/tests/TestLegalInvokeVirtual02.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/test/java/org/apache/bcel/verifier/tests/TestLegalInvokeVirtual02.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/test/java/org/apache/bcel/verifier/tests/TestLegalInvokeVirtual02.java (original)
+++ commons/proper/bcel/trunk/src/test/java/org/apache/bcel/verifier/tests/TestLegalInvokeVirtual02.java Tue Jun  7 17:28:43 2016
@@ -15,7 +15,7 @@
  * limitations under the License.
  * 
  */
-package org.apache.commons.bcel6.verifier.tests;
+package org.apache.bcel.verifier.tests;
 
 public abstract class TestLegalInvokeVirtual02 implements Runnable{
 

Modified: commons/proper/bcel/trunk/src/test/java/org/apache/bcel/verifier/tests/TestReturn01Creator.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/test/java/org/apache/bcel/verifier/tests/TestReturn01Creator.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/test/java/org/apache/bcel/verifier/tests/TestReturn01Creator.java (original)
+++ commons/proper/bcel/trunk/src/test/java/org/apache/bcel/verifier/tests/TestReturn01Creator.java Tue Jun  7 17:28:43 2016
@@ -15,20 +15,20 @@
  * limitations under the License.
  * 
  */
-package org.apache.commons.bcel6.verifier.tests;
+package org.apache.bcel.verifier.tests;
 
 import java.io.IOException;
 import java.io.OutputStream;
 
-import org.apache.commons.bcel6.Const;
-import org.apache.commons.bcel6.generic.ClassGen;
-import org.apache.commons.bcel6.generic.ConstantPoolGen;
-import org.apache.commons.bcel6.generic.InstructionConst;
-import org.apache.commons.bcel6.generic.InstructionFactory;
-import org.apache.commons.bcel6.generic.InstructionHandle;
-import org.apache.commons.bcel6.generic.InstructionList;
-import org.apache.commons.bcel6.generic.MethodGen;
-import org.apache.commons.bcel6.generic.Type;
+import org.apache.bcel.Const;
+import org.apache.bcel.generic.ClassGen;
+import org.apache.bcel.generic.ConstantPoolGen;
+import org.apache.bcel.generic.InstructionConst;
+import org.apache.bcel.generic.InstructionFactory;
+import org.apache.bcel.generic.InstructionHandle;
+import org.apache.bcel.generic.InstructionList;
+import org.apache.bcel.generic.MethodGen;
+import org.apache.bcel.generic.Type;
 import org.junit.Assert;
 
 public class TestReturn01Creator extends TestCreator {

Modified: commons/proper/bcel/trunk/src/test/java/org/apache/bcel/verifier/tests/TestReturn02.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/test/java/org/apache/bcel/verifier/tests/TestReturn02.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/test/java/org/apache/bcel/verifier/tests/TestReturn02.java (original)
+++ commons/proper/bcel/trunk/src/test/java/org/apache/bcel/verifier/tests/TestReturn02.java Tue Jun  7 17:28:43 2016
@@ -15,7 +15,7 @@
  * limitations under the License.
  * 
  */
-package org.apache.commons.bcel6.verifier.tests;
+package org.apache.bcel.verifier.tests;
 
 public class TestReturn02 {
 

Modified: commons/proper/bcel/trunk/src/test/java/org/apache/bcel/verifier/tests/TestReturn03Creator.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/test/java/org/apache/bcel/verifier/tests/TestReturn03Creator.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/test/java/org/apache/bcel/verifier/tests/TestReturn03Creator.java (original)
+++ commons/proper/bcel/trunk/src/test/java/org/apache/bcel/verifier/tests/TestReturn03Creator.java Tue Jun  7 17:28:43 2016
@@ -15,20 +15,20 @@
  * limitations under the License.
  * 
  */
-package org.apache.commons.bcel6.verifier.tests;
+package org.apache.bcel.verifier.tests;
 
 import java.io.IOException;
 import java.io.OutputStream;
 
-import org.apache.commons.bcel6.Const;
-import org.apache.commons.bcel6.generic.ClassGen;
-import org.apache.commons.bcel6.generic.ConstantPoolGen;
-import org.apache.commons.bcel6.generic.InstructionConst;
-import org.apache.commons.bcel6.generic.InstructionFactory;
-import org.apache.commons.bcel6.generic.InstructionHandle;
-import org.apache.commons.bcel6.generic.InstructionList;
-import org.apache.commons.bcel6.generic.MethodGen;
-import org.apache.commons.bcel6.generic.Type;
+import org.apache.bcel.Const;
+import org.apache.bcel.generic.ClassGen;
+import org.apache.bcel.generic.ConstantPoolGen;
+import org.apache.bcel.generic.InstructionConst;
+import org.apache.bcel.generic.InstructionFactory;
+import org.apache.bcel.generic.InstructionHandle;
+import org.apache.bcel.generic.InstructionList;
+import org.apache.bcel.generic.MethodGen;
+import org.apache.bcel.generic.Type;
 import org.junit.Assert;
 
 public class TestReturn03Creator extends TestCreator {

Modified: commons/proper/bcel/trunk/src/test/java/org/apache/bcel/visitors/CounterVisitor.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/test/java/org/apache/bcel/visitors/CounterVisitor.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/test/java/org/apache/bcel/visitors/CounterVisitor.java (original)
+++ commons/proper/bcel/trunk/src/test/java/org/apache/bcel/visitors/CounterVisitor.java Tue Jun  7 17:28:43 2016
@@ -16,53 +16,53 @@
  * 
  */
 
-package org.apache.commons.bcel6.visitors;
+package org.apache.bcel.visitors;
 
-import org.apache.commons.bcel6.classfile.AnnotationDefault;
-import org.apache.commons.bcel6.classfile.AnnotationEntry;
-import org.apache.commons.bcel6.classfile.Annotations;
-import org.apache.commons.bcel6.classfile.BootstrapMethods;
-import org.apache.commons.bcel6.classfile.Code;
-import org.apache.commons.bcel6.classfile.CodeException;
-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.ConstantMethodHandle;
-import org.apache.commons.bcel6.classfile.ConstantMethodType;
-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.commons.bcel6.classfile.ConstantValue;
-import org.apache.commons.bcel6.classfile.Deprecated;
-import org.apache.commons.bcel6.classfile.EnclosingMethod;
-import org.apache.commons.bcel6.classfile.ExceptionTable;
-import org.apache.commons.bcel6.classfile.Field;
-import org.apache.commons.bcel6.classfile.InnerClass;
-import org.apache.commons.bcel6.classfile.InnerClasses;
-import org.apache.commons.bcel6.classfile.JavaClass;
-import org.apache.commons.bcel6.classfile.LineNumber;
-import org.apache.commons.bcel6.classfile.LineNumberTable;
-import org.apache.commons.bcel6.classfile.LocalVariable;
-import org.apache.commons.bcel6.classfile.LocalVariableTable;
-import org.apache.commons.bcel6.classfile.LocalVariableTypeTable;
-import org.apache.commons.bcel6.classfile.Method;
-import org.apache.commons.bcel6.classfile.MethodParameters;
-import org.apache.commons.bcel6.classfile.ParameterAnnotationEntry;
-import org.apache.commons.bcel6.classfile.ParameterAnnotations;
-import org.apache.commons.bcel6.classfile.Signature;
-import org.apache.commons.bcel6.classfile.SourceFile;
-import org.apache.commons.bcel6.classfile.StackMap;
-import org.apache.commons.bcel6.classfile.StackMapEntry;
-import org.apache.commons.bcel6.classfile.Synthetic;
-import org.apache.commons.bcel6.classfile.Unknown;
-import org.apache.commons.bcel6.classfile.Visitor;
+import org.apache.bcel.classfile.AnnotationDefault;
+import org.apache.bcel.classfile.AnnotationEntry;
+import org.apache.bcel.classfile.Annotations;
+import org.apache.bcel.classfile.BootstrapMethods;
+import org.apache.bcel.classfile.Code;
+import org.apache.bcel.classfile.CodeException;
+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.ConstantMethodHandle;
+import org.apache.bcel.classfile.ConstantMethodType;
+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;
+import org.apache.bcel.classfile.ConstantValue;
+import org.apache.bcel.classfile.Deprecated;
+import org.apache.bcel.classfile.EnclosingMethod;
+import org.apache.bcel.classfile.ExceptionTable;
+import org.apache.bcel.classfile.Field;
+import org.apache.bcel.classfile.InnerClass;
+import org.apache.bcel.classfile.InnerClasses;
+import org.apache.bcel.classfile.JavaClass;
+import org.apache.bcel.classfile.LineNumber;
+import org.apache.bcel.classfile.LineNumberTable;
+import org.apache.bcel.classfile.LocalVariable;
+import org.apache.bcel.classfile.LocalVariableTable;
+import org.apache.bcel.classfile.LocalVariableTypeTable;
+import org.apache.bcel.classfile.Method;
+import org.apache.bcel.classfile.MethodParameters;
+import org.apache.bcel.classfile.ParameterAnnotationEntry;
+import org.apache.bcel.classfile.ParameterAnnotations;
+import org.apache.bcel.classfile.Signature;
+import org.apache.bcel.classfile.SourceFile;
+import org.apache.bcel.classfile.StackMap;
+import org.apache.bcel.classfile.StackMapEntry;
+import org.apache.bcel.classfile.Synthetic;
+import org.apache.bcel.classfile.Unknown;
+import org.apache.bcel.classfile.Visitor;
 
 public class CounterVisitor implements Visitor
 {