Revert changes introduced in BCEL-222 (rev 1694911).

In particular this means that the package coordinates have been changed
back from
  org.apache.commons.bcel6
to
  org.apache.bcel

Furthermore the maven coordinates have been changes back from
  org.apache.commons:commons-bcel6:6.0-SNAPSHOT
to
  org.apache.bcel:bcel:6.0-SNAPSHOT



git-svn-id: https://svn.apache.org/repos/asf/commons/proper/bcel/trunk@1747273 13f79535-47bb-0310-9956-ffa450edef68

65 files changed, 74 insertions, 74 deletions

diff --git a/src/test/java/org/apache/commons/bcel6/AbstractCounterVisitorTestCase.java b/src/test/java/org/apache/bcel/AbstractCounterVisitorTestCase.java
index a8f8625b..ea3c99ca 100644
--- a/src/test/java/org/apache/commons/bcel6/AbstractCounterVisitorTestCase.java
+++ b/src/test/java/org/apache/bcel/AbstractCounterVisitorTestCase.java
@@ -16,11 +16,11 @@
  * 
  */
 
-package org.apache.commons.bcel6;
+package org.apache.bcel;
 
-import org.apache.commons.bcel6.classfile.DescendingVisitor;
-import org.apache.commons.bcel6.classfile.JavaClass;
-import org.apache.commons.bcel6.visitors.CounterVisitor;
+import org.apache.bcel.classfile.DescendingVisitor;
+import org.apache.bcel.classfile.JavaClass;
+import org.apache.bcel.visitors.CounterVisitor;
 
 public abstract class AbstractCounterVisitorTestCase extends AbstractTestCase
 {
diff --git a/src/test/java/org/apache/commons/bcel6/AbstractTestCase.java b/src/test/java/org/apache/bcel/AbstractTestCase.java
index dbb80256..a7e59cca 100644
--- a/src/test/java/org/apache/commons/bcel6/AbstractTestCase.java
+++ b/src/test/java/org/apache/bcel/AbstractTestCase.java
@@ -16,24 +16,24 @@
  * 
  */
 
-package org.apache.commons.bcel6;
+package org.apache.bcel;
 
 import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.commons.bcel6.classfile.AnnotationEntry;
-import org.apache.commons.bcel6.classfile.Attribute;
-import org.apache.commons.bcel6.classfile.JavaClass;
-import org.apache.commons.bcel6.classfile.Method;
-import org.apache.commons.bcel6.generic.AnnotationEntryGen;
-import org.apache.commons.bcel6.generic.ConstantPoolGen;
-import org.apache.commons.bcel6.generic.ElementValueGen;
-import org.apache.commons.bcel6.generic.ElementValuePairGen;
-import org.apache.commons.bcel6.generic.ObjectType;
-import org.apache.commons.bcel6.generic.SimpleElementValueGen;
-import org.apache.commons.bcel6.util.ClassPath;
-import org.apache.commons.bcel6.util.SyntheticRepository;
+import org.apache.bcel.classfile.AnnotationEntry;
+import org.apache.bcel.classfile.Attribute;
+import org.apache.bcel.classfile.JavaClass;
+import org.apache.bcel.classfile.Method;
+import org.apache.bcel.generic.AnnotationEntryGen;
+import org.apache.bcel.generic.ConstantPoolGen;
+import org.apache.bcel.generic.ElementValueGen;
+import org.apache.bcel.generic.ElementValuePairGen;
+import org.apache.bcel.generic.ObjectType;
+import org.apache.bcel.generic.SimpleElementValueGen;
+import org.apache.bcel.util.ClassPath;
+import org.apache.bcel.util.SyntheticRepository;
 
 import junit.framework.TestCase;
 
diff --git a/src/test/java/org/apache/commons/bcel6/AnnotationAccessFlagTestCase.java b/src/test/java/org/apache/bcel/AnnotationAccessFlagTestCase.java
index eac7f95c..c0409a28 100644
--- a/src/test/java/org/apache/commons/bcel6/AnnotationAccessFlagTestCase.java
+++ b/src/test/java/org/apache/bcel/AnnotationAccessFlagTestCase.java
@@ -16,9 +16,9 @@
  * 
  */
 
-package org.apache.commons.bcel6;
+package org.apache.bcel;
 
-import org.apache.commons.bcel6.classfile.JavaClass;
+import org.apache.bcel.classfile.JavaClass;
 
 public class AnnotationAccessFlagTestCase extends AbstractTestCase
 {
diff --git a/src/test/java/org/apache/commons/bcel6/AnnotationDefaultAttributeTestCase.java b/src/test/java/org/apache/bcel/AnnotationDefaultAttributeTestCase.java
index 592e0f21..6afe6794 100644
--- a/src/test/java/org/apache/commons/bcel6/AnnotationDefaultAttributeTestCase.java
+++ b/src/test/java/org/apache/bcel/AnnotationDefaultAttributeTestCase.java
@@ -16,13 +16,13 @@
  * 
  */
 
-package org.apache.commons.bcel6;
+package org.apache.bcel;
 
-import org.apache.commons.bcel6.classfile.AnnotationDefault;
-import org.apache.commons.bcel6.classfile.ElementValue;
-import org.apache.commons.bcel6.classfile.JavaClass;
-import org.apache.commons.bcel6.classfile.Method;
-import org.apache.commons.bcel6.classfile.SimpleElementValue;
+import org.apache.bcel.classfile.AnnotationDefault;
+import org.apache.bcel.classfile.ElementValue;
+import org.apache.bcel.classfile.JavaClass;
+import org.apache.bcel.classfile.Method;
+import org.apache.bcel.classfile.SimpleElementValue;
 
 public class AnnotationDefaultAttributeTestCase extends AbstractTestCase
 {
diff --git a/src/test/java/org/apache/commons/bcel6/AnonymousClassTestCase.java b/src/test/java/org/apache/bcel/AnonymousClassTestCase.java
index fcbd66b3..6506d63d 100644
--- a/src/test/java/org/apache/commons/bcel6/AnonymousClassTestCase.java
+++ b/src/test/java/org/apache/bcel/AnonymousClassTestCase.java
@@ -16,9 +16,9 @@
  * 
  */
 
-package org.apache.commons.bcel6;
+package org.apache.bcel;
 
-import org.apache.commons.bcel6.classfile.JavaClass;
+import org.apache.bcel.classfile.JavaClass;
 
 public class AnonymousClassTestCase extends AbstractTestCase
 {
diff --git a/src/test/java/org/apache/commons/bcel6/BCELBenchmark.java b/src/test/java/org/apache/bcel/BCELBenchmark.java
index 34589fbe..ad48cee6 100644
--- a/src/test/java/org/apache/commons/bcel6/BCELBenchmark.java
+++ b/src/test/java/org/apache/bcel/BCELBenchmark.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.bcel6;
+package org.apache.bcel;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
@@ -23,12 +23,12 @@ import java.util.concurrent.TimeUnit;
 import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
 
-import org.apache.commons.bcel6.classfile.ClassParser;
-import org.apache.commons.bcel6.classfile.JavaClass;
-import org.apache.commons.bcel6.classfile.Method;
-import org.apache.commons.bcel6.generic.ClassGen;
-import org.apache.commons.bcel6.generic.InstructionList;
-import org.apache.commons.bcel6.generic.MethodGen;
+import org.apache.bcel.classfile.ClassParser;
+import org.apache.bcel.classfile.JavaClass;
+import org.apache.bcel.classfile.Method;
+import org.apache.bcel.generic.ClassGen;
+import org.apache.bcel.generic.InstructionList;
+import org.apache.bcel.generic.MethodGen;
 import org.apache.commons.collections4.Predicate;
 import org.apache.commons.collections4.iterators.EnumerationIterator;
 import org.apache.commons.collections4.iterators.FilterIterator;
diff --git a/src/test/java/org/apache/commons/bcel6/CounterVisitorTestCase.java b/src/test/java/org/apache/bcel/CounterVisitorTestCase.java
index 31db773a..83284183 100644
--- a/src/test/java/org/apache/commons/bcel6/CounterVisitorTestCase.java
+++ b/src/test/java/org/apache/bcel/CounterVisitorTestCase.java
@@ -16,9 +16,9 @@
  * 
  */
 
-package org.apache.commons.bcel6;
+package org.apache.bcel;
 
-import org.apache.commons.bcel6.classfile.JavaClass;
+import org.apache.bcel.classfile.JavaClass;
 
 public class CounterVisitorTestCase extends AbstractCounterVisitorTestCase
 {
diff --git a/src/test/java/org/apache/commons/bcel6/ElementValueGenTestCase.java b/src/test/java/org/apache/bcel/ElementValueGenTestCase.java
index 1e8db56d..ac2d88b6 100644
--- a/src/test/java/org/apache/commons/bcel6/ElementValueGenTestCase.java
+++ b/src/test/java/org/apache/bcel/ElementValueGenTestCase.java
@@ -16,7 +16,7 @@
  * 
  */
 
-package org.apache.commons.bcel6;
+package org.apache.bcel;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -24,13 +24,13 @@ import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 
-import org.apache.commons.bcel6.generic.ClassElementValueGen;
-import org.apache.commons.bcel6.generic.ClassGen;
-import org.apache.commons.bcel6.generic.ConstantPoolGen;
-import org.apache.commons.bcel6.generic.ElementValueGen;
-import org.apache.commons.bcel6.generic.EnumElementValueGen;
-import org.apache.commons.bcel6.generic.ObjectType;
-import org.apache.commons.bcel6.generic.SimpleElementValueGen;
+import org.apache.bcel.generic.ClassElementValueGen;
+import org.apache.bcel.generic.ClassGen;
+import org.apache.bcel.generic.ConstantPoolGen;
+import org.apache.bcel.generic.ElementValueGen;
+import org.apache.bcel.generic.EnumElementValueGen;
+import org.apache.bcel.generic.ObjectType;
+import org.apache.bcel.generic.SimpleElementValueGen;
 
 public class ElementValueGenTestCase extends AbstractTestCase
 {
diff --git a/src/test/java/org/apache/commons/bcel6/EnclosingMethodAttributeTestCase.java b/src/test/java/org/apache/bcel/EnclosingMethodAttributeTestCase.java
index c6ed1f57..80f0c36b 100644
--- a/src/test/java/org/apache/commons/bcel6/EnclosingMethodAttributeTestCase.java
+++ b/src/test/java/org/apache/bcel/EnclosingMethodAttributeTestCase.java
@@ -16,16 +16,16 @@
  *
  */
 
-package org.apache.commons.bcel6;
+package org.apache.bcel;
 
 import java.io.File;
 import java.io.IOException;
 
-import org.apache.commons.bcel6.classfile.Attribute;
-import org.apache.commons.bcel6.classfile.ConstantPool;
-import org.apache.commons.bcel6.classfile.EnclosingMethod;
-import org.apache.commons.bcel6.classfile.JavaClass;
-import org.apache.commons.bcel6.util.SyntheticRepository;
+import org.apache.bcel.classfile.Attribute;
+import org.apache.bcel.classfile.ConstantPool;
+import org.apache.bcel.classfile.EnclosingMethod;
+import org.apache.bcel.classfile.JavaClass;
+import org.apache.bcel.util.SyntheticRepository;
 import org.junit.Assert;
 
 public class EnclosingMethodAttributeTestCase extends AbstractTestCase
diff --git a/src/test/java/org/apache/commons/bcel6/EnumAccessFlagTestCase.java b/src/test/java/org/apache/bcel/EnumAccessFlagTestCase.java
index 035dcb50..fc624bb7 100644
--- a/src/test/java/org/apache/commons/bcel6/EnumAccessFlagTestCase.java
+++ b/src/test/java/org/apache/bcel/EnumAccessFlagTestCase.java
@@ -16,9 +16,9 @@
  * 
  */
 
-package org.apache.commons.bcel6;
+package org.apache.bcel;
 
-import org.apache.commons.bcel6.classfile.JavaClass;
+import org.apache.bcel.classfile.JavaClass;
 
 public class EnumAccessFlagTestCase extends AbstractTestCase
 {
diff --git a/src/test/java/org/apache/commons/bcel6/InstructionFinderTestCase.java b/src/test/java/org/apache/bcel/InstructionFinderTestCase.java
index ad3cb955..6feb1911 100644
--- a/src/test/java/org/apache/commons/bcel6/InstructionFinderTestCase.java
+++ b/src/test/java/org/apache/bcel/InstructionFinderTestCase.java
@@ -15,15 +15,15 @@
  * limitations under the License.
  * 
  */
-package org.apache.commons.bcel6;
+package org.apache.bcel;
 
 import java.util.Iterator;
 
-import org.apache.commons.bcel6.classfile.JavaClass;
-import org.apache.commons.bcel6.classfile.Method;
-import org.apache.commons.bcel6.generic.InstructionHandle;
-import org.apache.commons.bcel6.generic.InstructionList;
-import org.apache.commons.bcel6.util.InstructionFinder;
+import org.apache.bcel.classfile.JavaClass;
+import org.apache.bcel.classfile.Method;
+import org.apache.bcel.generic.InstructionHandle;
+import org.apache.bcel.generic.InstructionList;
+import org.apache.bcel.util.InstructionFinder;
 
 public class InstructionFinderTestCase extends AbstractTestCase
 {
diff --git a/src/test/java/org/apache/commons/bcel6/NanoTimer.java b/src/test/java/org/apache/bcel/NanoTimer.java
index 83f4edea..c6e57a02 100644
--- a/src/test/java/org/apache/commons/bcel6/NanoTimer.java
+++ b/src/test/java/org/apache/bcel/NanoTimer.java
@@ -16,7 +16,7 @@
  * 
  */
 
-package org.apache.commons.bcel6;
+package org.apache.bcel;
 
 public class NanoTimer {
 
diff --git a/src/test/java/org/apache/commons/bcel6/PLSETestCase.java b/src/test/java/org/apache/bcel/PLSETestCase.java
index f4dd1a3c..f30a5feb 100644
--- a/src/test/java/org/apache/commons/bcel6/PLSETestCase.java
+++ b/src/test/java/org/apache/bcel/PLSETestCase.java
@@ -16,15 +16,15 @@
  * 
  */
 
-package org.apache.commons.bcel6;
+package org.apache.bcel;
 
-import org.apache.commons.bcel6.classfile.JavaClass;
-import org.apache.commons.bcel6.classfile.LocalVariableTable;
-import org.apache.commons.bcel6.classfile.Method;
-import org.apache.commons.bcel6.generic.ClassGen;
-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.classfile.JavaClass;
+import org.apache.bcel.classfile.LocalVariableTable;
+import org.apache.bcel.classfile.Method;
+import org.apache.bcel.generic.ClassGen;
+import org.apache.bcel.generic.ConstantPoolGen;
+import org.apache.bcel.generic.MethodGen;
+import org.apache.bcel.generic.Type;
 
 public class PLSETestCase extends AbstractTestCase
 {
diff --git a/src/test/java/org/apache/commons/bcel6/PerformanceTest.java b/src/test/java/org/apache/bcel/PerformanceTest.java
index ea99266c..abd4f8ae 100644
--- a/src/test/java/org/apache/commons/bcel6/PerformanceTest.java
+++ b/src/test/java/org/apache/bcel/PerformanceTest.java
@@ -16,7 +16,7 @@
  * 
  */
 
-package org.apache.commons.bcel6;
+package org.apache.bcel;
 
 import java.io.ByteArrayInputStream;
 import java.io.File;
@@ -27,12 +27,12 @@ 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.JavaClass;
-import org.apache.commons.bcel6.classfile.Method;
-import org.apache.commons.bcel6.generic.ClassGen;
-import org.apache.commons.bcel6.generic.InstructionList;
-import org.apache.commons.bcel6.generic.MethodGen;
+import org.apache.bcel.classfile.ClassParser;
+import org.apache.bcel.classfile.JavaClass;
+import org.apache.bcel.classfile.Method;
+import org.apache.bcel.generic.ClassGen;
+import org.apache.bcel.generic.InstructionList;
+import org.apache.bcel.generic.MethodGen;
 import org.junit.Assert;
 
 import junit.framework.TestCase;
diff --git a/src/test/java/org/apache/commons/bcel6/classfile/JDKClassDumpTestCase.java b/src/test/java/org/apache/bcel/classfile/JDKClassDumpTestCase.java
index 277b4bd9..277b4bd9 100644
--- a/src/test/java/org/apache/commons/bcel6/classfile/JDKClassDumpTestCase.java
+++ b/src/test/java/org/apache/bcel/classfile/JDKClassDumpTestCase.java
diff --git a/src/test/java/org/apache/commons/bcel6/classfile/UtilityTestCase.java b/src/test/java/org/apache/bcel/classfile/UtilityTestCase.java
index 6a0394ac..6a0394ac 100644
--- a/src/test/java/org/apache/commons/bcel6/classfile/UtilityTestCase.java
+++ b/src/test/java/org/apache/bcel/classfile/UtilityTestCase.java
diff --git a/src/test/java/org/apache/commons/bcel6/data/AnnotatedFields.java b/src/test/java/org/apache/bcel/data/AnnotatedFields.java
index d8391a0d..d8391a0d 100644
--- a/src/test/java/org/apache/commons/bcel6/data/AnnotatedFields.java
+++ b/src/test/java/org/apache/bcel/data/AnnotatedFields.java
diff --git a/src/test/java/org/apache/commons/bcel6/data/AnnotatedWithCombinedAnnotation.java b/src/test/java/org/apache/bcel/data/AnnotatedWithCombinedAnnotation.java
index e514ad0b..e514ad0b 100644
--- a/src/test/java/org/apache/commons/bcel6/data/AnnotatedWithCombinedAnnotation.java
+++ b/src/test/java/org/apache/bcel/data/AnnotatedWithCombinedAnnotation.java
diff --git a/src/test/java/org/apache/commons/bcel6/data/AnnotatedWithEnumClass.java b/src/test/java/org/apache/bcel/data/AnnotatedWithEnumClass.java
index 8aad494a..8aad494a 100644
--- a/src/test/java/org/apache/commons/bcel6/data/AnnotatedWithEnumClass.java
+++ b/src/test/java/org/apache/bcel/data/AnnotatedWithEnumClass.java
diff --git a/src/test/java/org/apache/commons/bcel6/data/AnnotationEnumElement.java b/src/test/java/org/apache/bcel/data/AnnotationEnumElement.java
index 63b333d5..63b333d5 100644
--- a/src/test/java/org/apache/commons/bcel6/data/AnnotationEnumElement.java
+++ b/src/test/java/org/apache/bcel/data/AnnotationEnumElement.java
diff --git a/src/test/java/org/apache/commons/bcel6/data/AnonymousClassTest.java b/src/test/java/org/apache/bcel/data/AnonymousClassTest.java
index 070451f7..070451f7 100644
--- a/src/test/java/org/apache/commons/bcel6/data/AnonymousClassTest.java
+++ b/src/test/java/org/apache/bcel/data/AnonymousClassTest.java
diff --git a/src/test/java/org/apache/commons/bcel6/data/AttributeTestClassEM01.java b/src/test/java/org/apache/bcel/data/AttributeTestClassEM01.java
index c4ea20b2..c4ea20b2 100644
--- a/src/test/java/org/apache/commons/bcel6/data/AttributeTestClassEM01.java
+++ b/src/test/java/org/apache/bcel/data/AttributeTestClassEM01.java
diff --git a/src/test/java/org/apache/commons/bcel6/data/AttributeTestClassEM02.java b/src/test/java/org/apache/bcel/data/AttributeTestClassEM02.java
index 16c85eaa..16c85eaa 100644
--- a/src/test/java/org/apache/commons/bcel6/data/AttributeTestClassEM02.java
+++ b/src/test/java/org/apache/bcel/data/AttributeTestClassEM02.java
diff --git a/src/test/java/org/apache/commons/bcel6/data/CombinedAnnotation.java b/src/test/java/org/apache/bcel/data/CombinedAnnotation.java
index efcbeb71..efcbeb71 100644
--- a/src/test/java/org/apache/commons/bcel6/data/CombinedAnnotation.java
+++ b/src/test/java/org/apache/bcel/data/CombinedAnnotation.java
diff --git a/src/test/java/org/apache/commons/bcel6/data/ComplexAnnotatedClass.java b/src/test/java/org/apache/bcel/data/ComplexAnnotatedClass.java
index 51748c51..51748c51 100644
--- a/src/test/java/org/apache/commons/bcel6/data/ComplexAnnotatedClass.java
+++ b/src/test/java/org/apache/bcel/data/ComplexAnnotatedClass.java
diff --git a/src/test/java/org/apache/commons/bcel6/data/ComplexAnnotation.java b/src/test/java/org/apache/bcel/data/ComplexAnnotation.java
index 39f0be45..39f0be45 100644
--- a/src/test/java/org/apache/commons/bcel6/data/ComplexAnnotation.java
+++ b/src/test/java/org/apache/bcel/data/ComplexAnnotation.java
diff --git a/src/test/java/org/apache/commons/bcel6/data/MarkedType.java b/src/test/java/org/apache/bcel/data/MarkedType.java
index 56f97df2..56f97df2 100644
--- a/src/test/java/org/apache/commons/bcel6/data/MarkedType.java
+++ b/src/test/java/org/apache/bcel/data/MarkedType.java
diff --git a/src/test/java/org/apache/commons/bcel6/data/MarkerAnnotation.java b/src/test/java/org/apache/bcel/data/MarkerAnnotation.java
index 714a0a98..714a0a98 100644
--- a/src/test/java/org/apache/commons/bcel6/data/MarkerAnnotation.java
+++ b/src/test/java/org/apache/bcel/data/MarkerAnnotation.java
diff --git a/src/test/java/org/apache/commons/bcel6/data/MarkerAnnotationInvisible.java b/src/test/java/org/apache/bcel/data/MarkerAnnotationInvisible.java
index 20563b6b..20563b6b 100644
--- a/src/test/java/org/apache/commons/bcel6/data/MarkerAnnotationInvisible.java
+++ b/src/test/java/org/apache/bcel/data/MarkerAnnotationInvisible.java
diff --git a/src/test/java/org/apache/commons/bcel6/data/PLSETestClass.java b/src/test/java/org/apache/bcel/data/PLSETestClass.java
index 6a1cf31d..6a1cf31d 100644
--- a/src/test/java/org/apache/commons/bcel6/data/PLSETestClass.java
+++ b/src/test/java/org/apache/bcel/data/PLSETestClass.java
diff --git a/src/test/java/org/apache/commons/bcel6/data/SimpleAnnotatedClass.java b/src/test/java/org/apache/bcel/data/SimpleAnnotatedClass.java
index 37831da4..37831da4 100644
--- a/src/test/java/org/apache/commons/bcel6/data/SimpleAnnotatedClass.java
+++ b/src/test/java/org/apache/bcel/data/SimpleAnnotatedClass.java
diff --git a/src/test/java/org/apache/commons/bcel6/data/SimpleAnnotation.java b/src/test/java/org/apache/bcel/data/SimpleAnnotation.java
index 4b4140fc..4b4140fc 100644
--- a/src/test/java/org/apache/commons/bcel6/data/SimpleAnnotation.java
+++ b/src/test/java/org/apache/bcel/data/SimpleAnnotation.java
diff --git a/src/test/java/org/apache/commons/bcel6/data/SimpleClass.java b/src/test/java/org/apache/bcel/data/SimpleClass.java
index 9fa9ac01..9fa9ac01 100644
--- a/src/test/java/org/apache/commons/bcel6/data/SimpleClass.java
+++ b/src/test/java/org/apache/bcel/data/SimpleClass.java
diff --git a/src/test/java/org/apache/commons/bcel6/data/SimpleEnum.java b/src/test/java/org/apache/bcel/data/SimpleEnum.java
index 743de36a..743de36a 100644
--- a/src/test/java/org/apache/commons/bcel6/data/SimpleEnum.java
+++ b/src/test/java/org/apache/bcel/data/SimpleEnum.java
diff --git a/src/test/java/org/apache/commons/bcel6/generic/AnnotationGenTestCase.java b/src/test/java/org/apache/bcel/generic/AnnotationGenTestCase.java
index 0bebb801..0bebb801 100644
--- a/src/test/java/org/apache/commons/bcel6/generic/AnnotationGenTestCase.java
+++ b/src/test/java/org/apache/bcel/generic/AnnotationGenTestCase.java
diff --git a/src/test/java/org/apache/commons/bcel6/generic/BranchHandleTestCase.java b/src/test/java/org/apache/bcel/generic/BranchHandleTestCase.java
index 7c4f8f72..7c4f8f72 100644
--- a/src/test/java/org/apache/commons/bcel6/generic/BranchHandleTestCase.java
+++ b/src/test/java/org/apache/bcel/generic/BranchHandleTestCase.java
diff --git a/src/test/java/org/apache/commons/bcel6/generic/FieldAnnotationsTestCase.java b/src/test/java/org/apache/bcel/generic/FieldAnnotationsTestCase.java
index 306ecb2b..306ecb2b 100644
--- a/src/test/java/org/apache/commons/bcel6/generic/FieldAnnotationsTestCase.java
+++ b/src/test/java/org/apache/bcel/generic/FieldAnnotationsTestCase.java
diff --git a/src/test/java/org/apache/commons/bcel6/generic/GeneratingAnnotatedClassesTestCase.java b/src/test/java/org/apache/bcel/generic/GeneratingAnnotatedClassesTestCase.java
index b63700d2..b63700d2 100644
--- a/src/test/java/org/apache/commons/bcel6/generic/GeneratingAnnotatedClassesTestCase.java
+++ b/src/test/java/org/apache/bcel/generic/GeneratingAnnotatedClassesTestCase.java
diff --git a/src/test/java/org/apache/commons/bcel6/generic/InstructionHandleTestCase.java b/src/test/java/org/apache/bcel/generic/InstructionHandleTestCase.java
index ab9d786c..ab9d786c 100644
--- a/src/test/java/org/apache/commons/bcel6/generic/InstructionHandleTestCase.java
+++ b/src/test/java/org/apache/bcel/generic/InstructionHandleTestCase.java
diff --git a/src/test/java/org/apache/commons/bcel6/generic/JDKGenericDumpTestCase.java b/src/test/java/org/apache/bcel/generic/JDKGenericDumpTestCase.java
index 34e1caf2..34e1caf2 100644
--- a/src/test/java/org/apache/commons/bcel6/generic/JDKGenericDumpTestCase.java
+++ b/src/test/java/org/apache/bcel/generic/JDKGenericDumpTestCase.java
diff --git a/src/test/java/org/apache/commons/bcel6/generic/MethodGenTestCase.java b/src/test/java/org/apache/bcel/generic/MethodGenTestCase.java
index d432d127..d432d127 100644
--- a/src/test/java/org/apache/commons/bcel6/generic/MethodGenTestCase.java
+++ b/src/test/java/org/apache/bcel/generic/MethodGenTestCase.java
diff --git a/src/test/java/org/apache/commons/bcel6/util/BCELifierTestCase.java b/src/test/java/org/apache/bcel/util/BCELifierTestCase.java
index b42b94e9..b42b94e9 100644
--- a/src/test/java/org/apache/commons/bcel6/util/BCELifierTestCase.java
+++ b/src/test/java/org/apache/bcel/util/BCELifierTestCase.java
diff --git a/src/test/java/org/apache/commons/bcel6/util/Class2HTMLTestCase.java b/src/test/java/org/apache/bcel/util/Class2HTMLTestCase.java
index be468a32..be468a32 100644
--- a/src/test/java/org/apache/commons/bcel6/util/Class2HTMLTestCase.java
+++ b/src/test/java/org/apache/bcel/util/Class2HTMLTestCase.java
diff --git a/src/test/java/org/apache/commons/bcel6/util/InstructionFinderTest.java b/src/test/java/org/apache/bcel/util/InstructionFinderTest.java
index 7701e841..7701e841 100644
--- a/src/test/java/org/apache/commons/bcel6/util/InstructionFinderTest.java
+++ b/src/test/java/org/apache/bcel/util/InstructionFinderTest.java
diff --git a/src/test/java/org/apache/commons/bcel6/verifier/AbstractVerifierTestCase.java b/src/test/java/org/apache/bcel/verifier/AbstractVerifierTestCase.java
index b773e8ba..b773e8ba 100644
--- a/src/test/java/org/apache/commons/bcel6/verifier/AbstractVerifierTestCase.java
+++ b/src/test/java/org/apache/bcel/verifier/AbstractVerifierTestCase.java
diff --git a/src/test/java/org/apache/commons/bcel6/verifier/VerifierArrayAccessTestCase.java b/src/test/java/org/apache/bcel/verifier/VerifierArrayAccessTestCase.java
index 7408e87f..7408e87f 100644
--- a/src/test/java/org/apache/commons/bcel6/verifier/VerifierArrayAccessTestCase.java
+++ b/src/test/java/org/apache/bcel/verifier/VerifierArrayAccessTestCase.java
diff --git a/src/test/java/org/apache/commons/bcel6/verifier/VerifierInvokeTestCase.java b/src/test/java/org/apache/bcel/verifier/VerifierInvokeTestCase.java
index 6a01a902..6a01a902 100644
--- a/src/test/java/org/apache/commons/bcel6/verifier/VerifierInvokeTestCase.java
+++ b/src/test/java/org/apache/bcel/verifier/VerifierInvokeTestCase.java
diff --git a/src/test/java/org/apache/commons/bcel6/verifier/VerifierReturnTestCase.java b/src/test/java/org/apache/bcel/verifier/VerifierReturnTestCase.java
index dd6554d4..dd6554d4 100644
--- a/src/test/java/org/apache/commons/bcel6/verifier/VerifierReturnTestCase.java
+++ b/src/test/java/org/apache/bcel/verifier/VerifierReturnTestCase.java
diff --git a/src/test/java/org/apache/commons/bcel6/verifier/VerifierTestCase.java b/src/test/java/org/apache/bcel/verifier/VerifierTestCase.java
index 38ea8df5..38ea8df5 100644
--- a/src/test/java/org/apache/commons/bcel6/verifier/VerifierTestCase.java
+++ b/src/test/java/org/apache/bcel/verifier/VerifierTestCase.java
diff --git a/src/test/java/org/apache/commons/bcel6/verifier/tests/TestArray01.java b/src/test/java/org/apache/bcel/verifier/tests/TestArray01.java
index e97aa1c8..e97aa1c8 100644
--- a/src/test/java/org/apache/commons/bcel6/verifier/tests/TestArray01.java
+++ b/src/test/java/org/apache/bcel/verifier/tests/TestArray01.java
diff --git a/src/test/java/org/apache/commons/bcel6/verifier/tests/TestArrayAccess01.java b/src/test/java/org/apache/bcel/verifier/tests/TestArrayAccess01.java
index 7815c194..7815c194 100644
--- a/src/test/java/org/apache/commons/bcel6/verifier/tests/TestArrayAccess01.java
+++ b/src/test/java/org/apache/bcel/verifier/tests/TestArrayAccess01.java
diff --git a/src/test/java/org/apache/commons/bcel6/verifier/tests/TestArrayAccess02Creator.java b/src/test/java/org/apache/bcel/verifier/tests/TestArrayAccess02Creator.java
index 5442121b..5442121b 100644
--- a/src/test/java/org/apache/commons/bcel6/verifier/tests/TestArrayAccess02Creator.java
+++ b/src/test/java/org/apache/bcel/verifier/tests/TestArrayAccess02Creator.java
diff --git a/src/test/java/org/apache/commons/bcel6/verifier/tests/TestArrayAccess03Creator.java b/src/test/java/org/apache/bcel/verifier/tests/TestArrayAccess03Creator.java
index d9cae0b8..d9cae0b8 100644
--- a/src/test/java/org/apache/commons/bcel6/verifier/tests/TestArrayAccess03Creator.java
+++ b/src/test/java/org/apache/bcel/verifier/tests/TestArrayAccess03Creator.java
diff --git a/src/test/java/org/apache/commons/bcel6/verifier/tests/TestArrayAccess04Creator.java b/src/test/java/org/apache/bcel/verifier/tests/TestArrayAccess04Creator.java
index d4c2bf8b..d4c2bf8b 100644
--- a/src/test/java/org/apache/commons/bcel6/verifier/tests/TestArrayAccess04Creator.java
+++ b/src/test/java/org/apache/bcel/verifier/tests/TestArrayAccess04Creator.java
diff --git a/src/test/java/org/apache/commons/bcel6/verifier/tests/TestCreator.java b/src/test/java/org/apache/bcel/verifier/tests/TestCreator.java
index 1ae14722..1ae14722 100644
--- a/src/test/java/org/apache/commons/bcel6/verifier/tests/TestCreator.java
+++ b/src/test/java/org/apache/bcel/verifier/tests/TestCreator.java
diff --git a/src/test/java/org/apache/commons/bcel6/verifier/tests/TestLegalInvokeInterface01.java b/src/test/java/org/apache/bcel/verifier/tests/TestLegalInvokeInterface01.java
index 784ab213..784ab213 100755
--- a/src/test/java/org/apache/commons/bcel6/verifier/tests/TestLegalInvokeInterface01.java
+++ b/src/test/java/org/apache/bcel/verifier/tests/TestLegalInvokeInterface01.java
diff --git a/src/test/java/org/apache/commons/bcel6/verifier/tests/TestLegalInvokeSpecial01.java b/src/test/java/org/apache/bcel/verifier/tests/TestLegalInvokeSpecial01.java
index df428a75..df428a75 100755
--- a/src/test/java/org/apache/commons/bcel6/verifier/tests/TestLegalInvokeSpecial01.java
+++ b/src/test/java/org/apache/bcel/verifier/tests/TestLegalInvokeSpecial01.java
diff --git a/src/test/java/org/apache/commons/bcel6/verifier/tests/TestLegalInvokeSpecial02.java b/src/test/java/org/apache/bcel/verifier/tests/TestLegalInvokeSpecial02.java
index 346f762a..346f762a 100755
--- a/src/test/java/org/apache/commons/bcel6/verifier/tests/TestLegalInvokeSpecial02.java
+++ b/src/test/java/org/apache/bcel/verifier/tests/TestLegalInvokeSpecial02.java
diff --git a/src/test/java/org/apache/commons/bcel6/verifier/tests/TestLegalInvokeStatic01.java b/src/test/java/org/apache/bcel/verifier/tests/TestLegalInvokeStatic01.java
index 927d8867..927d8867 100755
--- a/src/test/java/org/apache/commons/bcel6/verifier/tests/TestLegalInvokeStatic01.java
+++ b/src/test/java/org/apache/bcel/verifier/tests/TestLegalInvokeStatic01.java
diff --git a/src/test/java/org/apache/commons/bcel6/verifier/tests/TestLegalInvokeVirtual01.java b/src/test/java/org/apache/bcel/verifier/tests/TestLegalInvokeVirtual01.java
index a94066e2..a94066e2 100755
--- a/src/test/java/org/apache/commons/bcel6/verifier/tests/TestLegalInvokeVirtual01.java
+++ b/src/test/java/org/apache/bcel/verifier/tests/TestLegalInvokeVirtual01.java
diff --git a/src/test/java/org/apache/commons/bcel6/verifier/tests/TestLegalInvokeVirtual02.java b/src/test/java/org/apache/bcel/verifier/tests/TestLegalInvokeVirtual02.java
index b5a579ba..b5a579ba 100755
--- a/src/test/java/org/apache/commons/bcel6/verifier/tests/TestLegalInvokeVirtual02.java
+++ b/src/test/java/org/apache/bcel/verifier/tests/TestLegalInvokeVirtual02.java
diff --git a/src/test/java/org/apache/commons/bcel6/verifier/tests/TestReturn01Creator.java b/src/test/java/org/apache/bcel/verifier/tests/TestReturn01Creator.java
index a2764d6e..a2764d6e 100644
--- a/src/test/java/org/apache/commons/bcel6/verifier/tests/TestReturn01Creator.java
+++ b/src/test/java/org/apache/bcel/verifier/tests/TestReturn01Creator.java
diff --git a/src/test/java/org/apache/commons/bcel6/verifier/tests/TestReturn02.java b/src/test/java/org/apache/bcel/verifier/tests/TestReturn02.java
index 0e44e3bd..0e44e3bd 100644
--- a/src/test/java/org/apache/commons/bcel6/verifier/tests/TestReturn02.java
+++ b/src/test/java/org/apache/bcel/verifier/tests/TestReturn02.java
diff --git a/src/test/java/org/apache/commons/bcel6/verifier/tests/TestReturn03Creator.java b/src/test/java/org/apache/bcel/verifier/tests/TestReturn03Creator.java
index 7e500d19..7e500d19 100644
--- a/src/test/java/org/apache/commons/bcel6/verifier/tests/TestReturn03Creator.java
+++ b/src/test/java/org/apache/bcel/verifier/tests/TestReturn03Creator.java
diff --git a/src/test/java/org/apache/commons/bcel6/visitors/CounterVisitor.java b/src/test/java/org/apache/bcel/visitors/CounterVisitor.java
index cd578538..cd578538 100644
--- a/src/test/java/org/apache/commons/bcel6/visitors/CounterVisitor.java
+++ b/src/test/java/org/apache/bcel/visitors/CounterVisitor.java