This is an automated email from the ASF dual-hosted git repository. ggregory pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-bcel.git
commit 578d36494fea22e76cf829dd2a6ec1ab8b1c9b68 Author: Gary David Gregory (Code signing key) <[email protected]> AuthorDate: Fri Oct 28 14:56:38 2022 -0400 Use camel case --- src/main/java/org/apache/bcel/generic/INVOKEDYNAMIC.java | 4 ++-- src/main/java/org/apache/bcel/util/BCELifier.java | 2 +- .../java/org/apache/bcel/verifier/TransitiveHull.java | 6 +++--- .../java/org/apache/bcel/verifier/VerifierAppFrame.java | 8 ++++---- .../java/org/apache/bcel/verifier/VerifierFactory.java | 8 ++++++++ .../org/apache/bcel/verifier/statics/Pass1Verifier.java | 2 +- .../org/apache/bcel/verifier/statics/Pass2Verifier.java | 4 ++-- .../org/apache/bcel/verifier/statics/Pass3aVerifier.java | 16 ++++++++-------- .../java/org/apache/bcel/ElementValueGenTestCase.java | 4 ++-- .../org/apache/bcel/generic/AnnotationGenTestCase.java | 4 ++-- .../bcel/generic/GeneratingAnnotatedClassesTestCase.java | 4 ++-- .../apache/bcel/verifier/AbstractVerifierTestCase.java | 4 ++-- 12 files changed, 37 insertions(+), 29 deletions(-) diff --git a/src/main/java/org/apache/bcel/generic/INVOKEDYNAMIC.java b/src/main/java/org/apache/bcel/generic/INVOKEDYNAMIC.java index dd449301..dd935b79 100644 --- a/src/main/java/org/apache/bcel/generic/INVOKEDYNAMIC.java +++ b/src/main/java/org/apache/bcel/generic/INVOKEDYNAMIC.java @@ -79,9 +79,9 @@ public class INVOKEDYNAMIC extends InvokeInstruction { } /** - * Override the parent method because our classname is held elsewhere. + * Override the parent method because our class name is held elsewhere. * - * Note: Contrary to this method's name it does not return the classname of the invoke target; rather it returns the + * Note: Contrary to this method's name it does not return the class name of the invoke target; rather it returns the * name of the method that will be used to invoke the Lambda method generated by this invoke dynamic instruction. */ @Override diff --git a/src/main/java/org/apache/bcel/util/BCELifier.java b/src/main/java/org/apache/bcel/util/BCELifier.java index b59ca3eb..54072967 100644 --- a/src/main/java/org/apache/bcel/util/BCELifier.java +++ b/src/main/java/org/apache/bcel/util/BCELifier.java @@ -70,7 +70,7 @@ public class BCELifier extends org.apache.bcel.classfile.EmptyVisitor { */ public static void main(final String[] argv) throws Exception { if (argv.length != 1) { - System.out.println("Usage: BCELifier classname"); + System.out.println("Usage: BCELifier className"); System.out.println("\tThe class must exist on the classpath"); return; } diff --git a/src/main/java/org/apache/bcel/verifier/TransitiveHull.java b/src/main/java/org/apache/bcel/verifier/TransitiveHull.java index cd762ba3..ac8b120d 100644 --- a/src/main/java/org/apache/bcel/verifier/TransitiveHull.java +++ b/src/main/java/org/apache/bcel/verifier/TransitiveHull.java @@ -55,14 +55,14 @@ public class TransitiveHull implements VerifierFactoryObserver { /* Implementing VerifierFactoryObserver. */ @Override - public void update(final String classname) { + public void update(final String className) { System.gc(); // avoid swapping if possible. for (int i = 0; i < indent; i++) { System.out.print(" "); } - System.out.println(classname); + System.out.println(className); indent += 1; - final Verifier v = VerifierFactory.getVerifier(classname); + final Verifier v = VerifierFactory.getVerifier(className); VerificationResult vr; vr = v.doPass1(); if (vr != VerificationResult.VR_OK) { diff --git a/src/main/java/org/apache/bcel/verifier/VerifierAppFrame.java b/src/main/java/org/apache/bcel/verifier/VerifierAppFrame.java index 20aa2a32..764150ec 100644 --- a/src/main/java/org/apache/bcel/verifier/VerifierAppFrame.java +++ b/src/main/java/org/apache/bcel/verifier/VerifierAppFrame.java @@ -215,12 +215,12 @@ public class VerifierAppFrame extends JFrame { } void newFileMenuItem_actionPerformed(final ActionEvent e) { - final String classname = JOptionPane.showInputDialog("Please enter the fully qualified name of a class or interface to verify:"); - if (classname == null || classname.isEmpty()) { + final String className = JOptionPane.showInputDialog("Please enter the fully qualified name of a class or interface to verify:"); + if (className == null || className.isEmpty()) { return; } - VerifierFactory.getVerifier(classname); // let observers do the rest. - classNamesJList.setSelectedValue(classname, true); + VerifierFactory.getVerifier(className); // let observers do the rest. + classNamesJList.setSelectedValue(className, true); } synchronized void pass3aJList_valueChanged(final ListSelectionEvent e) { diff --git a/src/main/java/org/apache/bcel/verifier/VerifierFactory.java b/src/main/java/org/apache/bcel/verifier/VerifierFactory.java index 962a4533..3ebb2628 100644 --- a/src/main/java/org/apache/bcel/verifier/VerifierFactory.java +++ b/src/main/java/org/apache/bcel/verifier/VerifierFactory.java @@ -47,6 +47,14 @@ public class VerifierFactory { OBSVERVERS.add(o); } + /** + * Clears the factory. + */ + static void clear() { + MAP.clear(); + OBSVERVERS.clear(); + } + /** * Removes the VerifierFactoryObserver o from the list of observers. */ diff --git a/src/main/java/org/apache/bcel/verifier/statics/Pass1Verifier.java b/src/main/java/org/apache/bcel/verifier/statics/Pass1Verifier.java index c879fe30..d97e9df8 100644 --- a/src/main/java/org/apache/bcel/verifier/statics/Pass1Verifier.java +++ b/src/main/java/org/apache/bcel/verifier/statics/Pass1Verifier.java @@ -127,7 +127,7 @@ public final class Pass1Verifier extends PassVerifier { /* If we find more constraints to check, we should do this in an own method. */ // This should maybe caught by BCEL: In case of renamed .class files we get wrong // JavaClass objects here. - // This test should be much more complicated. It needs to take the classname, remove any portion at the + // This test should be much more complicated. It needs to take the class name, remove any portion at the // end that matches the file name and then see if the remainder matches anything on the class path. // Dumb test for now, see if the class name ends with the file name. if (jc != null && !myOwner.getClassName().equals(jc.getClassName()) && !jc.getClassName().endsWith(myOwner.getClassName())) { diff --git a/src/main/java/org/apache/bcel/verifier/statics/Pass2Verifier.java b/src/main/java/org/apache/bcel/verifier/statics/Pass2Verifier.java index 4762b9c3..b1f25747 100644 --- a/src/main/java/org/apache/bcel/verifier/statics/Pass2Verifier.java +++ b/src/main/java/org/apache/bcel/verifier/statics/Pass2Verifier.java @@ -1142,8 +1142,8 @@ public final class Pass2Verifier extends PassVerifier implements Constants { public void visitConstantClass(final ConstantClass obj) { final Constant c = cp.getConstant(obj.getNameIndex()); if (c instanceof ConstantUtf8) { // Ignore the case where it's not a ConstantUtf8 here, we'll find out later. - final String classname = ((ConstantUtf8) c).getBytes(); - if (classname.startsWith(jc.getClassName().replace('.', '/') + "$")) { + final String className = ((ConstantUtf8) c).getBytes(); + if (className.startsWith(jc.getClassName().replace('.', '/') + "$")) { hasInnerClass = true; } } diff --git a/src/main/java/org/apache/bcel/verifier/statics/Pass3aVerifier.java b/src/main/java/org/apache/bcel/verifier/statics/Pass3aVerifier.java index 401af247..34bf80fd 100644 --- a/src/main/java/org/apache/bcel/verifier/statics/Pass3aVerifier.java +++ b/src/main/java/org/apache/bcel/verifier/statics/Pass3aVerifier.java @@ -559,8 +559,8 @@ public final class Pass3aVerifier extends PassVerifier { // is therefore resolved/verified. // INVOKEINTERFACE is an InvokeInstruction, the argument and return types are resolved/verified, // too. So are the allowed method names. - final String classname = o.getClassName(constantPoolGen); - final JavaClass jc = Repository.lookupClass(classname); + final String className = o.getClassName(constantPoolGen); + final JavaClass jc = Repository.lookupClass(className); final Method m = getMethodRecursive(jc, o); if (m == null) { constraintViolated(o, "Referenced method '" + o.getMethodName(constantPoolGen) + "' with expected signature '" @@ -583,8 +583,8 @@ public final class Pass3aVerifier extends PassVerifier { // is therefore resolved/verified. // INVOKESPECIAL is an InvokeInstruction, the argument and return types are resolved/verified, // too. So are the allowed method names. - final String classname = o.getClassName(constantPoolGen); - final JavaClass jc = Repository.lookupClass(classname); + final String className = o.getClassName(constantPoolGen); + final JavaClass jc = Repository.lookupClass(className); final Method m = getMethodRecursive(jc, o); if (m == null) { constraintViolated(o, "Referenced method '" + o.getMethodName(constantPoolGen) + "' with expected signature '" @@ -637,8 +637,8 @@ public final class Pass3aVerifier extends PassVerifier { // is therefore resolved/verified. // INVOKESTATIC is an InvokeInstruction, the argument and return types are resolved/verified, // too. So are the allowed method names. - final String classname = o.getClassName(constantPoolGen); - final JavaClass jc = Repository.lookupClass(classname); + final String className = o.getClassName(constantPoolGen); + final JavaClass jc = Repository.lookupClass(className); final Method m = getMethodRecursive(jc, o); if (m == null) { constraintViolated(o, "Referenced method '" + o.getMethodName(constantPoolGen) + "' with expected signature '" @@ -661,8 +661,8 @@ public final class Pass3aVerifier extends PassVerifier { // is therefore resolved/verified. // INVOKEVIRTUAL is an InvokeInstruction, the argument and return types are resolved/verified, // too. So are the allowed method names. - final String classname = o.getClassName(constantPoolGen); - final JavaClass jc = Repository.lookupClass(classname); + final String className = o.getClassName(constantPoolGen); + final JavaClass jc = Repository.lookupClass(className); final Method m = getMethodRecursive(jc, o); if (m == null) { constraintViolated(o, "Referenced method '" + o.getMethodName(constantPoolGen) + "' with expected signature '" diff --git a/src/test/java/org/apache/bcel/ElementValueGenTestCase.java b/src/test/java/org/apache/bcel/ElementValueGenTestCase.java index d857a2aa..dbc7f1ab 100644 --- a/src/test/java/org/apache/bcel/ElementValueGenTestCase.java +++ b/src/test/java/org/apache/bcel/ElementValueGenTestCase.java @@ -51,8 +51,8 @@ public class ElementValueGenTestCase extends AbstractTestCase { assertEquals(beforeValue, afterValue, "Deserialization failed"); } - private ClassGen createClassGen(final String classname) { - return new ClassGen(classname, "java.lang.Object", "<generated>", Const.ACC_PUBLIC | Const.ACC_SUPER, null); + private ClassGen createClassGen(final String className) { + return new ClassGen(className, "java.lang.Object", "<generated>", Const.ACC_PUBLIC | Const.ACC_SUPER, null); } @Test diff --git a/src/test/java/org/apache/bcel/generic/AnnotationGenTestCase.java b/src/test/java/org/apache/bcel/generic/AnnotationGenTestCase.java index a97badac..09e770ca 100644 --- a/src/test/java/org/apache/bcel/generic/AnnotationGenTestCase.java +++ b/src/test/java/org/apache/bcel/generic/AnnotationGenTestCase.java @@ -61,8 +61,8 @@ public class AnnotationGenTestCase extends AbstractTestCase { } } - private ClassGen createClassGen(final String classname) { - return new ClassGen(classname, "java.lang.Object", "<generated>", Const.ACC_PUBLIC | Const.ACC_SUPER, null); + private ClassGen createClassGen(final String className) { + return new ClassGen(className, "java.lang.Object", "<generated>", Const.ACC_PUBLIC | Const.ACC_SUPER, null); } /** diff --git a/src/test/java/org/apache/bcel/generic/GeneratingAnnotatedClassesTestCase.java b/src/test/java/org/apache/bcel/generic/GeneratingAnnotatedClassesTestCase.java index 05cbbd73..a2d77982 100644 --- a/src/test/java/org/apache/bcel/generic/GeneratingAnnotatedClassesTestCase.java +++ b/src/test/java/org/apache/bcel/generic/GeneratingAnnotatedClassesTestCase.java @@ -250,8 +250,8 @@ public class GeneratingAnnotatedClassesTestCase extends AbstractTestCase { } // helper methods - private ClassGen createClassGen(final String classname) { - return new ClassGen(classname, "java.lang.Object", "<generated>", Const.ACC_PUBLIC | Const.ACC_SUPER, null); + private ClassGen createClassGen(final String className) { + return new ClassGen(className, "java.lang.Object", "<generated>", Const.ACC_PUBLIC | Const.ACC_SUPER, null); } public AnnotationEntryGen createCombinedAnnotation(final ConstantPoolGen cp) { diff --git a/src/test/java/org/apache/bcel/verifier/AbstractVerifierTestCase.java b/src/test/java/org/apache/bcel/verifier/AbstractVerifierTestCase.java index d3465784..f3fabb03 100644 --- a/src/test/java/org/apache/bcel/verifier/AbstractVerifierTestCase.java +++ b/src/test/java/org/apache/bcel/verifier/AbstractVerifierTestCase.java @@ -41,8 +41,8 @@ public abstract class AbstractVerifierTestCase { * @param message message displayed if assertion fails */ public void assertVerifyOK(final String className, final String message) throws ClassNotFoundException { - final String testClassname = TEST_PACKAGE + className; - assertTrue(doAllPasses(testClassname), message); + final String testClassName = TEST_PACKAGE + className; + assertTrue(doAllPasses(testClassName), message); } /**
