Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/BCELFactory.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/BCELFactory.java?rev=1747278&r1=1747277&r2=1747278&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/BCELFactory.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/BCELFactory.java Tue Jun 7 17:28:43 2016 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.commons.bcel6.util; +package org.apache.bcel.util; import java.io.PrintWriter; import java.util.ArrayList; @@ -24,37 +24,37 @@ import java.util.List; import java.util.Locale; import java.util.Map; -import org.apache.commons.bcel6.Const; -import org.apache.commons.bcel6.classfile.Utility; -import org.apache.commons.bcel6.generic.AllocationInstruction; -import org.apache.commons.bcel6.generic.ArrayInstruction; -import org.apache.commons.bcel6.generic.ArrayType; -import org.apache.commons.bcel6.generic.BranchHandle; -import org.apache.commons.bcel6.generic.BranchInstruction; -import org.apache.commons.bcel6.generic.CHECKCAST; -import org.apache.commons.bcel6.generic.CPInstruction; -import org.apache.commons.bcel6.generic.CodeExceptionGen; -import org.apache.commons.bcel6.generic.ConstantPoolGen; -import org.apache.commons.bcel6.generic.ConstantPushInstruction; -import org.apache.commons.bcel6.generic.EmptyVisitor; -import org.apache.commons.bcel6.generic.FieldInstruction; -import org.apache.commons.bcel6.generic.IINC; -import org.apache.commons.bcel6.generic.INSTANCEOF; -import org.apache.commons.bcel6.generic.Instruction; -import org.apache.commons.bcel6.generic.InstructionConst; -import org.apache.commons.bcel6.generic.InstructionHandle; -import org.apache.commons.bcel6.generic.InvokeInstruction; -import org.apache.commons.bcel6.generic.LDC; -import org.apache.commons.bcel6.generic.LDC2_W; -import org.apache.commons.bcel6.generic.LocalVariableInstruction; -import org.apache.commons.bcel6.generic.MULTIANEWARRAY; -import org.apache.commons.bcel6.generic.MethodGen; -import org.apache.commons.bcel6.generic.NEWARRAY; -import org.apache.commons.bcel6.generic.ObjectType; -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.generic.Type; +import org.apache.bcel.Const; +import org.apache.bcel.classfile.Utility; +import org.apache.bcel.generic.AllocationInstruction; +import org.apache.bcel.generic.ArrayInstruction; +import org.apache.bcel.generic.ArrayType; +import org.apache.bcel.generic.BranchHandle; +import org.apache.bcel.generic.BranchInstruction; +import org.apache.bcel.generic.CHECKCAST; +import org.apache.bcel.generic.CPInstruction; +import org.apache.bcel.generic.CodeExceptionGen; +import org.apache.bcel.generic.ConstantPoolGen; +import org.apache.bcel.generic.ConstantPushInstruction; +import org.apache.bcel.generic.EmptyVisitor; +import org.apache.bcel.generic.FieldInstruction; +import org.apache.bcel.generic.IINC; +import org.apache.bcel.generic.INSTANCEOF; +import org.apache.bcel.generic.Instruction; +import org.apache.bcel.generic.InstructionConst; +import org.apache.bcel.generic.InstructionHandle; +import org.apache.bcel.generic.InvokeInstruction; +import org.apache.bcel.generic.LDC; +import org.apache.bcel.generic.LDC2_W; +import org.apache.bcel.generic.LocalVariableInstruction; +import org.apache.bcel.generic.MULTIANEWARRAY; +import org.apache.bcel.generic.MethodGen; +import org.apache.bcel.generic.NEWARRAY; +import org.apache.bcel.generic.ObjectType; +import org.apache.bcel.generic.RET; +import org.apache.bcel.generic.ReturnInstruction; +import org.apache.bcel.generic.Select; +import org.apache.bcel.generic.Type; /** * Factory creates il.append() statements, and sets instruction targets.
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/BCELifier.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/BCELifier.java?rev=1747278&r1=1747277&r2=1747278&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/BCELifier.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/BCELifier.java Tue Jun 7 17:28:43 2016 @@ -15,25 +15,25 @@ * limitations under the License. * */ -package org.apache.commons.bcel6.util; +package org.apache.bcel.util; import java.io.IOException; import java.io.OutputStream; import java.io.PrintWriter; import java.util.Locale; -import org.apache.commons.bcel6.Const; -import org.apache.commons.bcel6.Repository; -import org.apache.commons.bcel6.classfile.ClassParser; -import org.apache.commons.bcel6.classfile.ConstantValue; -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.Utility; -import org.apache.commons.bcel6.generic.ArrayType; -import org.apache.commons.bcel6.generic.ConstantPoolGen; -import org.apache.commons.bcel6.generic.MethodGen; -import org.apache.commons.bcel6.generic.Type; +import org.apache.bcel.Const; +import org.apache.bcel.Repository; +import org.apache.bcel.classfile.ClassParser; +import org.apache.bcel.classfile.ConstantValue; +import org.apache.bcel.classfile.Field; +import org.apache.bcel.classfile.JavaClass; +import org.apache.bcel.classfile.Method; +import org.apache.bcel.classfile.Utility; +import org.apache.bcel.generic.ArrayType; +import org.apache.bcel.generic.ConstantPoolGen; +import org.apache.bcel.generic.MethodGen; +import org.apache.bcel.generic.Type; /** * This class takes a given JavaClass object and converts it to a @@ -44,7 +44,7 @@ import org.apache.commons.bcel6.generic. * * @version $Id$ */ -public class BCELifier extends org.apache.commons.bcel6.classfile.EmptyVisitor { +public class BCELifier extends org.apache.bcel.classfile.EmptyVisitor { /** * Enum corresponding to flag source. Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/ByteSequence.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/ByteSequence.java?rev=1747278&r1=1747277&r2=1747278&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/ByteSequence.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/ByteSequence.java Tue Jun 7 17:28:43 2016 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.commons.bcel6.util; +package org.apache.bcel.util; import java.io.ByteArrayInputStream; import java.io.DataInputStream; Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/Class2HTML.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/Class2HTML.java?rev=1747278&r1=1747277&r2=1747278&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/Class2HTML.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/Class2HTML.java Tue Jun 7 17:28:43 2016 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.commons.bcel6.util; +package org.apache.bcel.util; import java.io.File; import java.io.FileOutputStream; @@ -24,13 +24,13 @@ import java.io.PrintWriter; import java.util.HashSet; import java.util.Set; -import org.apache.commons.bcel6.Const; -import org.apache.commons.bcel6.classfile.Attribute; -import org.apache.commons.bcel6.classfile.ClassParser; -import org.apache.commons.bcel6.classfile.ConstantPool; -import org.apache.commons.bcel6.classfile.JavaClass; -import org.apache.commons.bcel6.classfile.Method; -import org.apache.commons.bcel6.classfile.Utility; +import org.apache.bcel.Const; +import org.apache.bcel.classfile.Attribute; +import org.apache.bcel.classfile.ClassParser; +import org.apache.bcel.classfile.ConstantPool; +import org.apache.bcel.classfile.JavaClass; +import org.apache.bcel.classfile.Method; +import org.apache.bcel.classfile.Utility; /** * Read class file(s) and convert them into HTML files. Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/ClassLoader.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/ClassLoader.java?rev=1747278&r1=1747277&r2=1747278&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/ClassLoader.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/ClassLoader.java Tue Jun 7 17:28:43 2016 @@ -15,19 +15,19 @@ * limitations under the License. * */ -package org.apache.commons.bcel6.util; +package org.apache.bcel.util; import java.io.ByteArrayInputStream; import java.io.IOException; import java.util.Hashtable; -import org.apache.commons.bcel6.Constants; -import org.apache.commons.bcel6.classfile.ClassParser; -import org.apache.commons.bcel6.classfile.ConstantClass; -import org.apache.commons.bcel6.classfile.ConstantPool; -import org.apache.commons.bcel6.classfile.ConstantUtf8; -import org.apache.commons.bcel6.classfile.JavaClass; -import org.apache.commons.bcel6.classfile.Utility; +import org.apache.bcel.Constants; +import org.apache.bcel.classfile.ClassParser; +import org.apache.bcel.classfile.ConstantClass; +import org.apache.bcel.classfile.ConstantPool; +import org.apache.bcel.classfile.ConstantUtf8; +import org.apache.bcel.classfile.JavaClass; +import org.apache.bcel.classfile.Utility; /** * <p>Drop in replacement for the standard class loader of the JVM. You can use it Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/ClassLoaderRepository.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/ClassLoaderRepository.java?rev=1747278&r1=1747277&r2=1747278&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/ClassLoaderRepository.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/ClassLoaderRepository.java Tue Jun 7 17:28:43 2016 @@ -15,15 +15,15 @@ * limitations under the License. * */ -package org.apache.commons.bcel6.util; +package org.apache.bcel.util; import java.io.IOException; import java.io.InputStream; import java.util.HashMap; import java.util.Map; -import org.apache.commons.bcel6.classfile.ClassParser; -import org.apache.commons.bcel6.classfile.JavaClass; +import org.apache.bcel.classfile.ClassParser; +import org.apache.bcel.classfile.JavaClass; /** * The repository maintains information about which classes have @@ -32,7 +32,7 @@ import org.apache.commons.bcel6.classfil * It loads its data from the ClassLoader implementation * passed into its constructor. * - * @see org.apache.commons.bcel6.Repository + * @see org.apache.bcel.Repository * * @version $Id$ */ Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/ClassPath.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/ClassPath.java?rev=1747278&r1=1747277&r2=1747278&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/ClassPath.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/ClassPath.java Tue Jun 7 17:28:43 2016 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.commons.bcel6.util; +package org.apache.bcel.util; import java.io.DataInputStream; import java.io.File; Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/ClassPathRepository.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/ClassPathRepository.java?rev=1747278&r1=1747277&r2=1747278&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/ClassPathRepository.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/ClassPathRepository.java Tue Jun 7 17:28:43 2016 @@ -15,21 +15,21 @@ * limitations under the License. * */ -package org.apache.commons.bcel6.util; +package org.apache.bcel.util; import java.io.IOException; import java.io.InputStream; import java.util.HashMap; import java.util.Map; -import org.apache.commons.bcel6.classfile.ClassParser; -import org.apache.commons.bcel6.classfile.JavaClass; +import org.apache.bcel.classfile.ClassParser; +import org.apache.bcel.classfile.JavaClass; /** * This repository is used in situations where a Class is created outside the realm of a ClassLoader. Classes are loaded from the file systems using the paths * specified in the given class path. By default, this is the value returned by ClassPath.getClassPath(). <br> * - * @see org.apache.commons.bcel6.Repository + * @see org.apache.bcel.Repository */ public class ClassPathRepository implements Repository { Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/ClassQueue.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/ClassQueue.java?rev=1747278&r1=1747277&r2=1747278&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/ClassQueue.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/ClassQueue.java Tue Jun 7 17:28:43 2016 @@ -15,11 +15,11 @@ * limitations under the License. * */ -package org.apache.commons.bcel6.util; +package org.apache.bcel.util; import java.util.LinkedList; -import org.apache.commons.bcel6.classfile.JavaClass; +import org.apache.bcel.classfile.JavaClass; /** * Utility class implementing a (typesafe) queue of JavaClass Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/ClassSet.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/ClassSet.java?rev=1747278&r1=1747277&r2=1747278&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/ClassSet.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/ClassSet.java Tue Jun 7 17:28:43 2016 @@ -15,13 +15,13 @@ * limitations under the License. * */ -package org.apache.commons.bcel6.util; +package org.apache.bcel.util; import java.util.Collection; import java.util.HashMap; import java.util.Map; -import org.apache.commons.bcel6.classfile.JavaClass; +import org.apache.bcel.classfile.JavaClass; /** * Utility class implementing a (typesafe) set of JavaClass objects. Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/ClassStack.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/ClassStack.java?rev=1747278&r1=1747277&r2=1747278&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/ClassStack.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/ClassStack.java Tue Jun 7 17:28:43 2016 @@ -15,11 +15,11 @@ * limitations under the License. * */ -package org.apache.commons.bcel6.util; +package org.apache.bcel.util; import java.util.Stack; -import org.apache.commons.bcel6.classfile.JavaClass; +import org.apache.bcel.classfile.JavaClass; /** * Utility class implementing a (typesafe) stack of JavaClass objects. Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/ClassVector.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/ClassVector.java?rev=1747278&r1=1747277&r2=1747278&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/ClassVector.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/ClassVector.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.util.ArrayList; import java.util.List; -import org.apache.commons.bcel6.classfile.JavaClass; +import org.apache.bcel.classfile.JavaClass; /** * Utility class implementing a (typesafe) collection of JavaClass Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/CodeHTML.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/CodeHTML.java?rev=1747278&r1=1747277&r2=1747278&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/CodeHTML.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/CodeHTML.java Tue Jun 7 17:28:43 2016 @@ -15,27 +15,27 @@ * limitations under the License. * */ -package org.apache.commons.bcel6.util; +package org.apache.bcel.util; import java.io.FileOutputStream; import java.io.IOException; import java.io.PrintWriter; import java.util.BitSet; -import org.apache.commons.bcel6.Const; -import org.apache.commons.bcel6.classfile.Attribute; -import org.apache.commons.bcel6.classfile.Code; -import org.apache.commons.bcel6.classfile.CodeException; -import org.apache.commons.bcel6.classfile.ConstantFieldref; -import org.apache.commons.bcel6.classfile.ConstantInterfaceMethodref; -import org.apache.commons.bcel6.classfile.ConstantInvokeDynamic; -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.LocalVariable; -import org.apache.commons.bcel6.classfile.LocalVariableTable; -import org.apache.commons.bcel6.classfile.Method; -import org.apache.commons.bcel6.classfile.Utility; +import org.apache.bcel.Const; +import org.apache.bcel.classfile.Attribute; +import org.apache.bcel.classfile.Code; +import org.apache.bcel.classfile.CodeException; +import org.apache.bcel.classfile.ConstantFieldref; +import org.apache.bcel.classfile.ConstantInterfaceMethodref; +import org.apache.bcel.classfile.ConstantInvokeDynamic; +import org.apache.bcel.classfile.ConstantMethodref; +import org.apache.bcel.classfile.ConstantNameAndType; +import org.apache.bcel.classfile.ConstantPool; +import org.apache.bcel.classfile.LocalVariable; +import org.apache.bcel.classfile.LocalVariableTable; +import org.apache.bcel.classfile.Method; +import org.apache.bcel.classfile.Utility; /** * Convert code into HTML file. Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/ConstantHTML.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/ConstantHTML.java?rev=1747278&r1=1747277&r2=1747278&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/ConstantHTML.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/ConstantHTML.java Tue Jun 7 17:28:43 2016 @@ -15,23 +15,23 @@ * limitations under the License. * */ -package org.apache.commons.bcel6.util; +package org.apache.bcel.util; import java.io.FileOutputStream; import java.io.IOException; import java.io.PrintWriter; -import org.apache.commons.bcel6.Const; -import org.apache.commons.bcel6.classfile.Constant; -import org.apache.commons.bcel6.classfile.ConstantClass; -import org.apache.commons.bcel6.classfile.ConstantFieldref; -import org.apache.commons.bcel6.classfile.ConstantInterfaceMethodref; -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.Method; -import org.apache.commons.bcel6.classfile.Utility; +import org.apache.bcel.Const; +import org.apache.bcel.classfile.Constant; +import org.apache.bcel.classfile.ConstantClass; +import org.apache.bcel.classfile.ConstantFieldref; +import org.apache.bcel.classfile.ConstantInterfaceMethodref; +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.Method; +import org.apache.bcel.classfile.Utility; /** * Convert constant pool into HTML file. Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/InstructionFinder.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/InstructionFinder.java?rev=1747278&r1=1747277&r2=1747278&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/InstructionFinder.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/InstructionFinder.java Tue Jun 7 17:28:43 2016 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.commons.bcel6.util; +package org.apache.bcel.util; import java.util.ArrayList; import java.util.HashMap; @@ -26,10 +26,10 @@ import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.commons.bcel6.Const; -import org.apache.commons.bcel6.generic.ClassGenException; -import org.apache.commons.bcel6.generic.InstructionHandle; -import org.apache.commons.bcel6.generic.InstructionList; +import org.apache.bcel.Const; +import org.apache.bcel.generic.ClassGenException; +import org.apache.bcel.generic.InstructionHandle; +import org.apache.bcel.generic.InstructionList; /** * InstructionFinder is a tool to search for given instructions patterns, i.e., Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/JavaWrapper.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/JavaWrapper.java?rev=1747278&r1=1747277&r2=1747278&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/JavaWrapper.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/JavaWrapper.java Tue Jun 7 17:28:43 2016 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.commons.bcel6.util; +package org.apache.bcel.util; import java.lang.reflect.Method; import java.lang.reflect.Modifier; @@ -26,10 +26,10 @@ import java.lang.reflect.Modifier; * for your own applications.<br> * Call this wrapper with: * - * <pre>java org.apache.commons.bcel6.util.JavaWrapper <real.class.name> [arguments]</pre> + * <pre>java org.apache.bcel.util.JavaWrapper <real.class.name> [arguments]</pre> * * <p>To use your own class loader you can set the "bcel.classloader" system property<p> - * <pre>java org.apache.commons.bcel6.util.JavaWrapper -Dbcel.classloader=foo.MyLoader <real.class.name> [arguments]</pre> + * <pre>java org.apache.bcel.util.JavaWrapper -Dbcel.classloader=foo.MyLoader <real.class.name> [arguments]</pre> * * @version $Id$ * @see ClassLoader Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/MemorySensitiveClassPathRepository.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/MemorySensitiveClassPathRepository.java?rev=1747278&r1=1747277&r2=1747278&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/MemorySensitiveClassPathRepository.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/MemorySensitiveClassPathRepository.java Tue Jun 7 17:28:43 2016 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.commons.bcel6.util; +package org.apache.bcel.util; import java.io.IOException; import java.io.InputStream; @@ -23,15 +23,15 @@ import java.lang.ref.SoftReference; import java.util.HashMap; import java.util.Map; -import org.apache.commons.bcel6.classfile.ClassParser; -import org.apache.commons.bcel6.classfile.JavaClass; +import org.apache.bcel.classfile.ClassParser; +import org.apache.bcel.classfile.JavaClass; /** * This repository is used in situations where a Class is created outside the realm of a ClassLoader. Classes are loaded from the file systems using the paths * specified in the given class path. By default, this is the value returned by ClassPath.getClassPath(). This repository holds onto classes with * SoftReferences, and will reload as needed, in cases where memory sizes are important.<br> * - * @see org.apache.commons.bcel6.Repository + * @see org.apache.bcel.Repository */ public class MemorySensitiveClassPathRepository implements Repository { Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/MethodHTML.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/MethodHTML.java?rev=1747278&r1=1747277&r2=1747278&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/MethodHTML.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/MethodHTML.java Tue Jun 7 17:28:43 2016 @@ -15,20 +15,20 @@ * limitations under the License. * */ -package org.apache.commons.bcel6.util; +package org.apache.bcel.util; import java.io.FileOutputStream; import java.io.IOException; import java.io.PrintWriter; -import org.apache.commons.bcel6.Const; -import org.apache.commons.bcel6.classfile.Attribute; -import org.apache.commons.bcel6.classfile.Code; -import org.apache.commons.bcel6.classfile.ConstantValue; -import org.apache.commons.bcel6.classfile.ExceptionTable; -import org.apache.commons.bcel6.classfile.Field; -import org.apache.commons.bcel6.classfile.Method; -import org.apache.commons.bcel6.classfile.Utility; +import org.apache.bcel.Const; +import org.apache.bcel.classfile.Attribute; +import org.apache.bcel.classfile.Code; +import org.apache.bcel.classfile.ConstantValue; +import org.apache.bcel.classfile.ExceptionTable; +import org.apache.bcel.classfile.Field; +import org.apache.bcel.classfile.Method; +import org.apache.bcel.classfile.Utility; /** * Convert methods and fields into HTML file. Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/Repository.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/Repository.java?rev=1747278&r1=1747277&r2=1747278&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/Repository.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/Repository.java Tue Jun 7 17:28:43 2016 @@ -15,16 +15,16 @@ * limitations under the License. * */ -package org.apache.commons.bcel6.util; +package org.apache.bcel.util; -import org.apache.commons.bcel6.classfile.JavaClass; +import org.apache.bcel.classfile.JavaClass; /** * Abstract definition of a class repository. Instances may be used * to load classes from different sources and may be used in the * Repository.setRepository method. * - * @see org.apache.commons.bcel6.Repository + * @see org.apache.bcel.Repository * @version $Id$ */ public interface Repository { Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/SyntheticRepository.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/SyntheticRepository.java?rev=1747278&r1=1747277&r2=1747278&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/SyntheticRepository.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/SyntheticRepository.java Tue Jun 7 17:28:43 2016 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.commons.bcel6.util; +package org.apache.bcel.util; import java.util.HashMap; import java.util.Map; @@ -26,7 +26,7 @@ import java.util.Map; * This repository uses a factory design, allowing it to maintain a collection of different classpaths, and as such It is designed to be used as a singleton per * classpath. * - * @see org.apache.commons.bcel6.Repository + * @see org.apache.bcel.Repository * * @version $Id$ */ Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/GraphicalVerifier.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/GraphicalVerifier.java?rev=1747278&r1=1747277&r2=1747278&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/GraphicalVerifier.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/GraphicalVerifier.java Tue Jun 7 17:28:43 2016 @@ -15,13 +15,13 @@ * limitations under the License. * */ -package org.apache.commons.bcel6.verifier; +package org.apache.bcel.verifier; import java.awt.Dimension; import java.awt.Toolkit; import javax.swing.UIManager; -import org.apache.commons.bcel6.generic.Type; +import org.apache.bcel.generic.Type; /** * A graphical user interface application demonstrating JustIce. Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/NativeVerifier.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/NativeVerifier.java?rev=1747278&r1=1747277&r2=1747278&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/NativeVerifier.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/NativeVerifier.java Tue Jun 7 17:28:43 2016 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.commons.bcel6.verifier; +package org.apache.bcel.verifier; /** * The NativeVerifier class implements a main(String[] args) method that's Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/PassVerifier.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/PassVerifier.java?rev=1747278&r1=1747277&r2=1747278&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/PassVerifier.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/PassVerifier.java Tue Jun 7 17:28:43 2016 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.commons.bcel6.verifier; +package org.apache.bcel.verifier; import java.util.ArrayList; import java.util.List; Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/TransitiveHull.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/TransitiveHull.java?rev=1747278&r1=1747277&r2=1747278&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/TransitiveHull.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/TransitiveHull.java Tue Jun 7 17:28:43 2016 @@ -15,10 +15,10 @@ * limitations under the License. * */ -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; /** * This class has a main method implementing a demonstration program Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/VerificationResult.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/VerificationResult.java?rev=1747278&r1=1747277&r2=1747278&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/VerificationResult.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/VerificationResult.java Tue Jun 7 17:28:43 2016 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.commons.bcel6.verifier; +package org.apache.bcel.verifier; /** * A VerificationResult is what a PassVerifier returns Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/Verifier.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/Verifier.java?rev=1747278&r1=1747277&r2=1747278&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/Verifier.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/Verifier.java Tue Jun 7 17:28:43 2016 @@ -15,18 +15,18 @@ * limitations under the License. * */ -package org.apache.commons.bcel6.verifier; +package org.apache.bcel.verifier; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import org.apache.commons.bcel6.classfile.JavaClass; -import org.apache.commons.bcel6.verifier.statics.Pass1Verifier; -import org.apache.commons.bcel6.verifier.statics.Pass2Verifier; -import org.apache.commons.bcel6.verifier.statics.Pass3aVerifier; -import org.apache.commons.bcel6.verifier.structurals.Pass3bVerifier; +import org.apache.bcel.classfile.JavaClass; +import org.apache.bcel.verifier.statics.Pass1Verifier; +import org.apache.bcel.verifier.statics.Pass2Verifier; +import org.apache.bcel.verifier.statics.Pass3aVerifier; +import org.apache.bcel.verifier.structurals.Pass3bVerifier; /** * A Verifier instance is there to verify a class file according to The Java Virtual @@ -163,7 +163,7 @@ public class Verifier { int meth = pv.getMethodNo(); for (String element : p3am) { messages.add("Pass 3a, method " + meth + " ('" - + org.apache.commons.bcel6.Repository.lookupClass(classname).getMethods()[meth] + + org.apache.bcel.Repository.lookupClass(classname).getMethods()[meth] + "'): " + element); } } @@ -172,7 +172,7 @@ public class Verifier { int meth = pv.getMethodNo(); for (String element : p3bm) { messages.add("Pass 3b, method " + meth + " ('" - + org.apache.commons.bcel6.Repository.lookupClass(classname).getMethods()[meth] + + org.apache.bcel.Repository.lookupClass(classname).getMethods()[meth] + "'): " + element); } } @@ -211,7 +211,7 @@ public class Verifier { vr = v.doPass2(); System.out.println("Pass 2:\n" + vr); if (vr == VerificationResult.VR_OK) { - JavaClass jc = org.apache.commons.bcel6.Repository.lookupClass(args[k]); + JavaClass jc = org.apache.bcel.Repository.lookupClass(args[k]); for (int i = 0; i < jc.getMethods().length; i++) { vr = v.doPass3a(i); System.out.println("Pass 3a, method number " + i + " ['" @@ -232,7 +232,7 @@ public class Verifier { System.out.println("\n"); // avoid swapping. v.flush(); - org.apache.commons.bcel6.Repository.clearCache(); + org.apache.bcel.Repository.clearCache(); System.gc(); } catch (ClassNotFoundException e) { e.printStackTrace(); Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/VerifierAppFrame.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/VerifierAppFrame.java?rev=1747278&r1=1747277&r2=1747278&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/VerifierAppFrame.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/VerifierAppFrame.java Tue Jun 7 17:28:43 2016 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.commons.bcel6.verifier; +package org.apache.bcel.verifier; import java.awt.AWTEvent; import java.awt.CardLayout; @@ -39,8 +39,8 @@ import javax.swing.JTextPane; import javax.swing.ListSelectionModel; import javax.swing.event.ListSelectionEvent; -import org.apache.commons.bcel6.Repository; -import org.apache.commons.bcel6.classfile.JavaClass; +import org.apache.bcel.Repository; +import org.apache.bcel.classfile.JavaClass; /** * This class implements a machine-generated frame for use with Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/VerifierFactory.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/VerifierFactory.java?rev=1747278&r1=1747277&r2=1747278&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/VerifierFactory.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/VerifierFactory.java Tue Jun 7 17:28:43 2016 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.commons.bcel6.verifier; +package org.apache.bcel.verifier; import java.util.HashMap; import java.util.List; Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/VerifierFactoryListModel.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/VerifierFactoryListModel.java?rev=1747278&r1=1747277&r2=1747278&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/VerifierFactoryListModel.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/VerifierFactoryListModel.java Tue Jun 7 17:28:43 2016 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.commons.bcel6.verifier; +package org.apache.bcel.verifier; import java.util.ArrayList; import java.util.List; Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/VerifierFactoryObserver.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/VerifierFactoryObserver.java?rev=1747278&r1=1747277&r2=1747278&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/VerifierFactoryObserver.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/VerifierFactoryObserver.java Tue Jun 7 17:28:43 2016 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.commons.bcel6.verifier; +package org.apache.bcel.verifier; /** * VerifierFactoryObserver instances are notified when new Verifier Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/VerifyDialog.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/VerifyDialog.java?rev=1747278&r1=1747277&r2=1747278&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/VerifyDialog.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/VerifyDialog.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.awt.Color; -import org.apache.commons.bcel6.Repository; -import org.apache.commons.bcel6.classfile.JavaClass; +import org.apache.bcel.Repository; +import org.apache.bcel.classfile.JavaClass; /** * A class for simple graphical class file verification. Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/exc/AssertionViolatedException.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/exc/AssertionViolatedException.java?rev=1747278&r1=1747277&r2=1747278&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/exc/AssertionViolatedException.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/exc/AssertionViolatedException.java Tue Jun 7 17:28:43 2016 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.commons.bcel6.verifier.exc; +package org.apache.bcel.verifier.exc; /** Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/exc/ClassConstraintException.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/exc/ClassConstraintException.java?rev=1747278&r1=1747277&r2=1747278&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/exc/ClassConstraintException.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/exc/ClassConstraintException.java Tue Jun 7 17:28:43 2016 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.commons.bcel6.verifier.exc; +package org.apache.bcel.verifier.exc; /** Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/exc/CodeConstraintException.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/exc/CodeConstraintException.java?rev=1747278&r1=1747277&r2=1747278&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/exc/CodeConstraintException.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/exc/CodeConstraintException.java Tue Jun 7 17:28:43 2016 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.commons.bcel6.verifier.exc; +package org.apache.bcel.verifier.exc; /** * Instances of this class are thrown by BCEL's class file verifier "JustIce" when Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/exc/InvalidMethodException.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/exc/InvalidMethodException.java?rev=1747278&r1=1747277&r2=1747278&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/exc/InvalidMethodException.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/exc/InvalidMethodException.java Tue Jun 7 17:28:43 2016 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.commons.bcel6.verifier.exc; +package org.apache.bcel.verifier.exc; /** * Instances of this class are thrown by BCEL's class file verifier "JustIce" Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/exc/LinkingConstraintException.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/exc/LinkingConstraintException.java?rev=1747278&r1=1747277&r2=1747278&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/exc/LinkingConstraintException.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/exc/LinkingConstraintException.java Tue Jun 7 17:28:43 2016 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.commons.bcel6.verifier.exc; +package org.apache.bcel.verifier.exc; /** * Instances of this class are thrown by BCEL's class file verifier "JustIce" when Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/exc/LoadingException.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/exc/LoadingException.java?rev=1747278&r1=1747277&r2=1747278&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/exc/LoadingException.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/exc/LoadingException.java Tue Jun 7 17:28:43 2016 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.commons.bcel6.verifier.exc; +package org.apache.bcel.verifier.exc; /** Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/exc/LocalVariableInfoInconsistentException.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/exc/LocalVariableInfoInconsistentException.java?rev=1747278&r1=1747277&r2=1747278&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/exc/LocalVariableInfoInconsistentException.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/exc/LocalVariableInfoInconsistentException.java Tue Jun 7 17:28:43 2016 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.commons.bcel6.verifier.exc; +package org.apache.bcel.verifier.exc; /** Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/exc/StaticCodeConstraintException.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/exc/StaticCodeConstraintException.java?rev=1747278&r1=1747277&r2=1747278&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/exc/StaticCodeConstraintException.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/exc/StaticCodeConstraintException.java Tue Jun 7 17:28:43 2016 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.commons.bcel6.verifier.exc; +package org.apache.bcel.verifier.exc; /** Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/exc/StaticCodeInstructionConstraintException.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/exc/StaticCodeInstructionConstraintException.java?rev=1747278&r1=1747277&r2=1747278&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/exc/StaticCodeInstructionConstraintException.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/exc/StaticCodeInstructionConstraintException.java Tue Jun 7 17:28:43 2016 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.commons.bcel6.verifier.exc; +package org.apache.bcel.verifier.exc; /** Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/exc/StaticCodeInstructionOperandConstraintException.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/exc/StaticCodeInstructionOperandConstraintException.java?rev=1747278&r1=1747277&r2=1747278&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/exc/StaticCodeInstructionOperandConstraintException.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/exc/StaticCodeInstructionOperandConstraintException.java Tue Jun 7 17:28:43 2016 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.commons.bcel6.verifier.exc; +package org.apache.bcel.verifier.exc; /** Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/exc/StructuralCodeConstraintException.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/exc/StructuralCodeConstraintException.java?rev=1747278&r1=1747277&r2=1747278&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/exc/StructuralCodeConstraintException.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/exc/StructuralCodeConstraintException.java Tue Jun 7 17:28:43 2016 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.commons.bcel6.verifier.exc; +package org.apache.bcel.verifier.exc; /** * Instances of this class are thrown by BCEL's class file verifier "JustIce" when Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/exc/Utility.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/exc/Utility.java?rev=1747278&r1=1747277&r2=1747278&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/exc/Utility.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/exc/Utility.java Tue Jun 7 17:28:43 2016 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.commons.bcel6.verifier.exc; +package org.apache.bcel.verifier.exc; import java.io.PrintWriter; Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/exc/VerificationException.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/exc/VerificationException.java?rev=1747278&r1=1747277&r2=1747278&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/exc/VerificationException.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/exc/VerificationException.java Tue Jun 7 17:28:43 2016 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.commons.bcel6.verifier.exc; +package org.apache.bcel.verifier.exc; /** Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/exc/VerifierConstraintViolatedException.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/exc/VerifierConstraintViolatedException.java?rev=1747278&r1=1747277&r2=1747278&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/exc/VerifierConstraintViolatedException.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/exc/VerifierConstraintViolatedException.java Tue Jun 7 17:28:43 2016 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.commons.bcel6.verifier.exc; +package org.apache.bcel.verifier.exc; /** Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/statics/DOUBLE_Upper.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/statics/DOUBLE_Upper.java?rev=1747278&r1=1747277&r2=1747278&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/statics/DOUBLE_Upper.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/statics/DOUBLE_Upper.java Tue Jun 7 17:28:43 2016 @@ -15,11 +15,11 @@ * limitations under the License. * */ -package org.apache.commons.bcel6.verifier.statics; +package org.apache.bcel.verifier.statics; -import org.apache.commons.bcel6.Const; -import org.apache.commons.bcel6.generic.Type; +import org.apache.bcel.Const; +import org.apache.bcel.generic.Type; /** * This class represents the upper half of a DOUBLE variable. Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/statics/IntList.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/statics/IntList.java?rev=1747278&r1=1747277&r2=1747278&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/statics/IntList.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/statics/IntList.java Tue Jun 7 17:28:43 2016 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.commons.bcel6.verifier.statics; +package org.apache.bcel.verifier.statics; import java.util.ArrayList; Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/statics/LONG_Upper.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/statics/LONG_Upper.java?rev=1747278&r1=1747277&r2=1747278&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/statics/LONG_Upper.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/statics/LONG_Upper.java Tue Jun 7 17:28:43 2016 @@ -15,11 +15,11 @@ * limitations under the License. * */ -package org.apache.commons.bcel6.verifier.statics; +package org.apache.bcel.verifier.statics; -import org.apache.commons.bcel6.Const; -import org.apache.commons.bcel6.generic.Type; +import org.apache.bcel.Const; +import org.apache.bcel.generic.Type; /** * This class represents the upper half of a LONG variable. Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/statics/LocalVariableInfo.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/statics/LocalVariableInfo.java?rev=1747278&r1=1747277&r2=1747278&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/statics/LocalVariableInfo.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/statics/LocalVariableInfo.java Tue Jun 7 17:28:43 2016 @@ -15,13 +15,13 @@ * limitations under the License. * */ -package org.apache.commons.bcel6.verifier.statics; +package org.apache.bcel.verifier.statics; import java.util.Hashtable; -import org.apache.commons.bcel6.generic.Type; -import org.apache.commons.bcel6.verifier.exc.LocalVariableInfoInconsistentException; +import org.apache.bcel.generic.Type; +import org.apache.bcel.verifier.exc.LocalVariableInfoInconsistentException; /** * A utility class holding the information about Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/statics/LocalVariablesInfo.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/statics/LocalVariablesInfo.java?rev=1747278&r1=1747277&r2=1747278&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/statics/LocalVariablesInfo.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/statics/LocalVariablesInfo.java Tue Jun 7 17:28:43 2016 @@ -15,12 +15,12 @@ * limitations under the License. * */ -package org.apache.commons.bcel6.verifier.statics; +package org.apache.bcel.verifier.statics; -import org.apache.commons.bcel6.generic.Type; -import org.apache.commons.bcel6.verifier.exc.AssertionViolatedException; -import org.apache.commons.bcel6.verifier.exc.LocalVariableInfoInconsistentException; +import org.apache.bcel.generic.Type; +import org.apache.bcel.verifier.exc.AssertionViolatedException; +import org.apache.bcel.verifier.exc.LocalVariableInfoInconsistentException; /** * A utility class holding the information about Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/statics/Pass1Verifier.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/statics/Pass1Verifier.java?rev=1747278&r1=1747277&r2=1747278&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/statics/Pass1Verifier.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/statics/Pass1Verifier.java Tue Jun 7 17:28:43 2016 @@ -15,17 +15,17 @@ * limitations under the License. * */ -package org.apache.commons.bcel6.verifier.statics; +package org.apache.bcel.verifier.statics; -import org.apache.commons.bcel6.Repository; -import org.apache.commons.bcel6.classfile.ClassFormatException; -import org.apache.commons.bcel6.classfile.JavaClass; -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.LoadingException; -import org.apache.commons.bcel6.verifier.exc.Utility; +import org.apache.bcel.Repository; +import org.apache.bcel.classfile.ClassFormatException; +import org.apache.bcel.classfile.JavaClass; +import org.apache.bcel.verifier.PassVerifier; +import org.apache.bcel.verifier.VerificationResult; +import org.apache.bcel.verifier.Verifier; +import org.apache.bcel.verifier.exc.LoadingException; +import org.apache.bcel.verifier.exc.Utility; /** * This PassVerifier verifies a class file according to pass 1 as @@ -140,8 +140,8 @@ public final class Pass1Verifier extends * (like the check for extra bytes at the end of the class file) are handy when actually using BCEL to repair a class file * (otherwise you would not be able to load it into BCEL).</P> * - * @see org.apache.commons.bcel6.Repository - * @see org.apache.commons.bcel6.Const#JVM_CLASSFILE_MAGIC + * @see org.apache.bcel.Repository + * @see org.apache.bcel.Const#JVM_CLASSFILE_MAGIC */ @Override public VerificationResult do_verify(){ Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/statics/Pass2Verifier.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/statics/Pass2Verifier.java?rev=1747278&r1=1747277&r2=1747278&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/statics/Pass2Verifier.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/statics/Pass2Verifier.java Tue Jun 7 17:28:43 2016 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.commons.bcel6.verifier.statics; +package org.apache.bcel.verifier.statics; import java.util.HashMap; @@ -25,53 +25,53 @@ import java.util.Locale; import java.util.Map; import java.util.Set; -import org.apache.commons.bcel6.Const; -import org.apache.commons.bcel6.Repository; -import org.apache.commons.bcel6.classfile.Attribute; -import org.apache.commons.bcel6.classfile.ClassFormatException; -import org.apache.commons.bcel6.classfile.Code; -import org.apache.commons.bcel6.classfile.CodeException; -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.ConstantInterfaceMethodref; -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.commons.bcel6.classfile.ConstantValue; -import org.apache.commons.bcel6.classfile.Deprecated; -import org.apache.commons.bcel6.classfile.DescendingVisitor; -import org.apache.commons.bcel6.classfile.EmptyVisitor; -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.Method; -import org.apache.commons.bcel6.classfile.Node; -import org.apache.commons.bcel6.classfile.SourceFile; -import org.apache.commons.bcel6.classfile.Synthetic; -import org.apache.commons.bcel6.classfile.Unknown; -import org.apache.commons.bcel6.generic.ArrayType; -import org.apache.commons.bcel6.generic.ObjectType; -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.VerifierFactory; -import org.apache.commons.bcel6.verifier.exc.AssertionViolatedException; -import org.apache.commons.bcel6.verifier.exc.ClassConstraintException; -import org.apache.commons.bcel6.verifier.exc.LocalVariableInfoInconsistentException; +import org.apache.bcel.Const; +import org.apache.bcel.Repository; +import org.apache.bcel.classfile.Attribute; +import org.apache.bcel.classfile.ClassFormatException; +import org.apache.bcel.classfile.Code; +import org.apache.bcel.classfile.CodeException; +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.ConstantInterfaceMethodref; +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; +import org.apache.bcel.classfile.ConstantValue; +import org.apache.bcel.classfile.Deprecated; +import org.apache.bcel.classfile.DescendingVisitor; +import org.apache.bcel.classfile.EmptyVisitor; +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.Method; +import org.apache.bcel.classfile.Node; +import org.apache.bcel.classfile.SourceFile; +import org.apache.bcel.classfile.Synthetic; +import org.apache.bcel.classfile.Unknown; +import org.apache.bcel.generic.ArrayType; +import org.apache.bcel.generic.ObjectType; +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.VerifierFactory; +import org.apache.bcel.verifier.exc.AssertionViolatedException; +import org.apache.bcel.verifier.exc.ClassConstraintException; +import org.apache.bcel.verifier.exc.LocalVariableInfoInconsistentException; /** * This PassVerifier verifies a class file according to @@ -314,7 +314,7 @@ public final class Pass2Verifier extends * * @see #constant_pool_entries_satisfy_static_constraints() */ - private final class CPESSC_Visitor extends org.apache.commons.bcel6.classfile.EmptyVisitor{ + private final class CPESSC_Visitor extends org.apache.bcel.classfile.EmptyVisitor{ private final Class<?> CONST_Class; /* private Class<?> CONST_Fieldref; @@ -1303,7 +1303,7 @@ public final class Pass2Verifier extends * pool must be valid.</B> * * @see #constant_pool_entries_satisfy_static_constraints() - * @see org.apache.commons.bcel6.classfile.ConstantCP + * @see org.apache.bcel.classfile.ConstantCP */ private final class FAMRAV_Visitor extends EmptyVisitor{ private final ConstantPool cp; // ==jc.getConstantPool() -- only here to save typing work. Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/statics/Pass3aVerifier.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/statics/Pass3aVerifier.java?rev=1747278&r1=1747277&r2=1747278&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/statics/Pass3aVerifier.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/statics/Pass3aVerifier.java Tue Jun 7 17:28:43 2016 @@ -15,90 +15,90 @@ * limitations under the License. * */ -package org.apache.commons.bcel6.verifier.statics; +package org.apache.bcel.verifier.statics; -import org.apache.commons.bcel6.Const; -import org.apache.commons.bcel6.Repository; -import org.apache.commons.bcel6.classfile.Attribute; -import org.apache.commons.bcel6.classfile.Code; -import org.apache.commons.bcel6.classfile.CodeException; -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.ConstantInterfaceMethodref; -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.ConstantString; -import org.apache.commons.bcel6.classfile.ConstantUtf8; -import org.apache.commons.bcel6.classfile.Field; -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.Method; -import org.apache.commons.bcel6.generic.ALOAD; -import org.apache.commons.bcel6.generic.ANEWARRAY; -import org.apache.commons.bcel6.generic.ASTORE; -import org.apache.commons.bcel6.generic.ATHROW; -import org.apache.commons.bcel6.generic.ArrayType; -import org.apache.commons.bcel6.generic.BREAKPOINT; -import org.apache.commons.bcel6.generic.CHECKCAST; -import org.apache.commons.bcel6.generic.ConstantPoolGen; -import org.apache.commons.bcel6.generic.DLOAD; -import org.apache.commons.bcel6.generic.DSTORE; -import org.apache.commons.bcel6.generic.FLOAD; -import org.apache.commons.bcel6.generic.FSTORE; -import org.apache.commons.bcel6.generic.FieldInstruction; -import org.apache.commons.bcel6.generic.GETSTATIC; -import org.apache.commons.bcel6.generic.GotoInstruction; -import org.apache.commons.bcel6.generic.IINC; -import org.apache.commons.bcel6.generic.ILOAD; -import org.apache.commons.bcel6.generic.IMPDEP1; -import org.apache.commons.bcel6.generic.IMPDEP2; -import org.apache.commons.bcel6.generic.INSTANCEOF; -import org.apache.commons.bcel6.generic.INVOKEDYNAMIC; -import org.apache.commons.bcel6.generic.INVOKEINTERFACE; -import org.apache.commons.bcel6.generic.INVOKESPECIAL; -import org.apache.commons.bcel6.generic.INVOKESTATIC; -import org.apache.commons.bcel6.generic.INVOKEVIRTUAL; -import org.apache.commons.bcel6.generic.ISTORE; -import org.apache.commons.bcel6.generic.Instruction; -import org.apache.commons.bcel6.generic.InstructionHandle; -import org.apache.commons.bcel6.generic.InstructionList; -import org.apache.commons.bcel6.generic.InvokeInstruction; -import org.apache.commons.bcel6.generic.JsrInstruction; -import org.apache.commons.bcel6.generic.LDC; -import org.apache.commons.bcel6.generic.LDC2_W; -import org.apache.commons.bcel6.generic.LLOAD; -import org.apache.commons.bcel6.generic.LOOKUPSWITCH; -import org.apache.commons.bcel6.generic.LSTORE; -import org.apache.commons.bcel6.generic.LoadClass; -import org.apache.commons.bcel6.generic.MULTIANEWARRAY; -import org.apache.commons.bcel6.generic.NEW; -import org.apache.commons.bcel6.generic.NEWARRAY; -import org.apache.commons.bcel6.generic.ObjectType; -import org.apache.commons.bcel6.generic.PUTSTATIC; -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.TABLESWITCH; -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.VerifierFactory; -import org.apache.commons.bcel6.verifier.exc.AssertionViolatedException; -import org.apache.commons.bcel6.verifier.exc.ClassConstraintException; -import org.apache.commons.bcel6.verifier.exc.InvalidMethodException; -import org.apache.commons.bcel6.verifier.exc.StaticCodeConstraintException; -import org.apache.commons.bcel6.verifier.exc.StaticCodeInstructionConstraintException; -import org.apache.commons.bcel6.verifier.exc.StaticCodeInstructionOperandConstraintException; +import org.apache.bcel.Const; +import org.apache.bcel.Repository; +import org.apache.bcel.classfile.Attribute; +import org.apache.bcel.classfile.Code; +import org.apache.bcel.classfile.CodeException; +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.ConstantInterfaceMethodref; +import org.apache.bcel.classfile.ConstantLong; +import org.apache.bcel.classfile.ConstantMethodref; +import org.apache.bcel.classfile.ConstantNameAndType; +import org.apache.bcel.classfile.ConstantString; +import org.apache.bcel.classfile.ConstantUtf8; +import org.apache.bcel.classfile.Field; +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.Method; +import org.apache.bcel.generic.ALOAD; +import org.apache.bcel.generic.ANEWARRAY; +import org.apache.bcel.generic.ASTORE; +import org.apache.bcel.generic.ATHROW; +import org.apache.bcel.generic.ArrayType; +import org.apache.bcel.generic.BREAKPOINT; +import org.apache.bcel.generic.CHECKCAST; +import org.apache.bcel.generic.ConstantPoolGen; +import org.apache.bcel.generic.DLOAD; +import org.apache.bcel.generic.DSTORE; +import org.apache.bcel.generic.FLOAD; +import org.apache.bcel.generic.FSTORE; +import org.apache.bcel.generic.FieldInstruction; +import org.apache.bcel.generic.GETSTATIC; +import org.apache.bcel.generic.GotoInstruction; +import org.apache.bcel.generic.IINC; +import org.apache.bcel.generic.ILOAD; +import org.apache.bcel.generic.IMPDEP1; +import org.apache.bcel.generic.IMPDEP2; +import org.apache.bcel.generic.INSTANCEOF; +import org.apache.bcel.generic.INVOKEDYNAMIC; +import org.apache.bcel.generic.INVOKEINTERFACE; +import org.apache.bcel.generic.INVOKESPECIAL; +import org.apache.bcel.generic.INVOKESTATIC; +import org.apache.bcel.generic.INVOKEVIRTUAL; +import org.apache.bcel.generic.ISTORE; +import org.apache.bcel.generic.Instruction; +import org.apache.bcel.generic.InstructionHandle; +import org.apache.bcel.generic.InstructionList; +import org.apache.bcel.generic.InvokeInstruction; +import org.apache.bcel.generic.JsrInstruction; +import org.apache.bcel.generic.LDC; +import org.apache.bcel.generic.LDC2_W; +import org.apache.bcel.generic.LLOAD; +import org.apache.bcel.generic.LOOKUPSWITCH; +import org.apache.bcel.generic.LSTORE; +import org.apache.bcel.generic.LoadClass; +import org.apache.bcel.generic.MULTIANEWARRAY; +import org.apache.bcel.generic.NEW; +import org.apache.bcel.generic.NEWARRAY; +import org.apache.bcel.generic.ObjectType; +import org.apache.bcel.generic.PUTSTATIC; +import org.apache.bcel.generic.RET; +import org.apache.bcel.generic.ReferenceType; +import org.apache.bcel.generic.ReturnInstruction; +import org.apache.bcel.generic.TABLESWITCH; +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.VerifierFactory; +import org.apache.bcel.verifier.exc.AssertionViolatedException; +import org.apache.bcel.verifier.exc.ClassConstraintException; +import org.apache.bcel.verifier.exc.InvalidMethodException; +import org.apache.bcel.verifier.exc.StaticCodeConstraintException; +import org.apache.bcel.verifier.exc.StaticCodeInstructionConstraintException; +import org.apache.bcel.verifier.exc.StaticCodeInstructionOperandConstraintException; /** * This PassVerifier verifies a class file according to @@ -470,7 +470,7 @@ public final class Pass3aVerifier extend * This visitor class does the actual checking for the instruction * operand's constraints. */ - private class InstOperandConstraintVisitor extends org.apache.commons.bcel6.generic.EmptyVisitor{ + private class InstOperandConstraintVisitor extends org.apache.bcel.generic.EmptyVisitor{ /** The ConstantPoolGen instance this Visitor operates on. */ private final ConstantPoolGen cpg; Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/statics/StringRepresentation.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/statics/StringRepresentation.java?rev=1747278&r1=1747277&r2=1747278&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/statics/StringRepresentation.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/statics/StringRepresentation.java Tue Jun 7 17:28:43 2016 @@ -15,55 +15,55 @@ * limitations under the License. * */ -package org.apache.commons.bcel6.verifier.statics; +package org.apache.bcel.verifier.statics; -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.Node; -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.verifier.exc.AssertionViolatedException; +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.Node; +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.verifier.exc.AssertionViolatedException; /** * BCEL's Node classes (those from the classfile API that <B>accept()</B> Visitor @@ -79,7 +79,7 @@ import org.apache.commons.bcel6.verifier * * @version $Id$ */ -public class StringRepresentation extends org.apache.commons.bcel6.classfile.EmptyVisitor { +public class StringRepresentation extends org.apache.bcel.classfile.EmptyVisitor { /** The string representation, created by a visitXXX() method, output by toString(). */ private String tostring; /** The node we ask for its string representation. Not really needed; only for debug output. */ Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/structurals/ControlFlowGraph.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/structurals/ControlFlowGraph.java?rev=1747278&r1=1747277&r2=1747278&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/structurals/ControlFlowGraph.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/structurals/ControlFlowGraph.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; @@ -23,18 +23,18 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.apache.commons.bcel6.generic.ATHROW; -import org.apache.commons.bcel6.generic.BranchInstruction; -import org.apache.commons.bcel6.generic.GotoInstruction; -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.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.ATHROW; +import org.apache.bcel.generic.BranchInstruction; +import org.apache.bcel.generic.GotoInstruction; +import org.apache.bcel.generic.Instruction; +import org.apache.bcel.generic.InstructionHandle; +import org.apache.bcel.generic.JsrInstruction; +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; /** * This class represents a control flow graph of a method. Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/structurals/ExceptionHandler.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/structurals/ExceptionHandler.java?rev=1747278&r1=1747277&r2=1747278&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/structurals/ExceptionHandler.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/structurals/ExceptionHandler.java Tue Jun 7 17:28:43 2016 @@ -15,11 +15,11 @@ * 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.commons.bcel6.generic.ObjectType; +import org.apache.bcel.generic.InstructionHandle; +import org.apache.bcel.generic.ObjectType; /** * This class represents an exception handler; that is, an ObjectType Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/structurals/ExceptionHandlers.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/structurals/ExceptionHandlers.java?rev=1747278&r1=1747277&r2=1747278&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/structurals/ExceptionHandlers.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/structurals/ExceptionHandlers.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.HashMap; @@ -23,9 +23,9 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; -import org.apache.commons.bcel6.generic.CodeExceptionGen; -import org.apache.commons.bcel6.generic.InstructionHandle; -import org.apache.commons.bcel6.generic.MethodGen; +import org.apache.bcel.generic.CodeExceptionGen; +import org.apache.bcel.generic.InstructionHandle; +import org.apache.bcel.generic.MethodGen; /** * This class allows easy access to ExceptionHandler objects. Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/structurals/ExecutionVisitor.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/structurals/ExecutionVisitor.java?rev=1747278&r1=1747277&r2=1747278&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/structurals/ExecutionVisitor.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/structurals/ExecutionVisitor.java Tue Jun 7 17:28:43 2016 @@ -15,19 +15,19 @@ * 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.classfile.Constant; -import org.apache.commons.bcel6.classfile.ConstantClass; -import org.apache.commons.bcel6.classfile.ConstantDouble; -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.bcel.Const; +import org.apache.bcel.classfile.Constant; +import org.apache.bcel.classfile.ConstantClass; +import org.apache.bcel.classfile.ConstantDouble; +import org.apache.bcel.classfile.ConstantFloat; +import org.apache.bcel.classfile.ConstantInteger; +import org.apache.bcel.classfile.ConstantLong; +import org.apache.bcel.classfile.ConstantString; // CHECKSTYLE:OFF (there are lots of references!) -import org.apache.commons.bcel6.generic.*; +import org.apache.bcel.generic.*; //CHECKSTYLE:ON /** Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/structurals/Frame.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/structurals/Frame.java?rev=1747278&r1=1747277&r2=1747278&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/structurals/Frame.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/structurals/Frame.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;
