commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ggreg...@apache.org
Subject svn commit: r1749597 [3/3] - in /commons/proper/bcel/trunk/src/main/java/org/apache/bcel: ./ generic/ util/
Date Tue, 21 Jun 2016 20:28:51 GMT
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/ExceptionConstants.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/ExceptionConstants.java?rev=1749597&r1=1749596&r2=1749597&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/ExceptionConstants.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/ExceptionConstants.java Tue Jun
21 20:28:51 2016
@@ -28,38 +28,38 @@ public interface ExceptionConstants {
 
     /** The mother of all exceptions
      */
-    public static final Class<Throwable> THROWABLE = Throwable.class;
+    Class<Throwable> THROWABLE = Throwable.class;
     /** Super class of any run-time exception
      */
-    public static final Class<RuntimeException> RUNTIME_EXCEPTION = RuntimeException.class;
+    Class<RuntimeException> RUNTIME_EXCEPTION = RuntimeException.class;
     /** Super class of any linking exception (aka Linkage Error)
      */
-    public static final Class<LinkageError> LINKING_EXCEPTION = LinkageError.class;
+    Class<LinkageError> LINKING_EXCEPTION = LinkageError.class;
     /** Linking Exceptions
      */
-    public static final Class<ClassCircularityError> CLASS_CIRCULARITY_ERROR = ClassCircularityError.class;
-    public static final Class<ClassFormatError> CLASS_FORMAT_ERROR = ClassFormatError.class;
-    public static final Class<ExceptionInInitializerError> EXCEPTION_IN_INITIALIZER_ERROR
= ExceptionInInitializerError.class;
-    public static final Class<IncompatibleClassChangeError> INCOMPATIBLE_CLASS_CHANGE_ERROR
= IncompatibleClassChangeError.class;
-    public static final Class<AbstractMethodError> ABSTRACT_METHOD_ERROR = AbstractMethodError.class;
-    public static final Class<IllegalAccessError> ILLEGAL_ACCESS_ERROR = IllegalAccessError.class;
-    public static final Class<InstantiationError> INSTANTIATION_ERROR = InstantiationError.class;
-    public static final Class<NoSuchFieldError> NO_SUCH_FIELD_ERROR = NoSuchFieldError.class;
-    public static final Class<NoSuchMethodError> NO_SUCH_METHOD_ERROR = NoSuchMethodError.class;
-    public static final Class<NoClassDefFoundError> NO_CLASS_DEF_FOUND_ERROR = NoClassDefFoundError.class;
-    public static final Class<UnsatisfiedLinkError> UNSATISFIED_LINK_ERROR = UnsatisfiedLinkError.class;
-    public static final Class<VerifyError> VERIFY_ERROR = VerifyError.class;
+    Class<ClassCircularityError> CLASS_CIRCULARITY_ERROR = ClassCircularityError.class;
+    Class<ClassFormatError> CLASS_FORMAT_ERROR = ClassFormatError.class;
+    Class<ExceptionInInitializerError> EXCEPTION_IN_INITIALIZER_ERROR = ExceptionInInitializerError.class;
+    Class<IncompatibleClassChangeError> INCOMPATIBLE_CLASS_CHANGE_ERROR = IncompatibleClassChangeError.class;
+    Class<AbstractMethodError> ABSTRACT_METHOD_ERROR = AbstractMethodError.class;
+    Class<IllegalAccessError> ILLEGAL_ACCESS_ERROR = IllegalAccessError.class;
+    Class<InstantiationError> INSTANTIATION_ERROR = InstantiationError.class;
+    Class<NoSuchFieldError> NO_SUCH_FIELD_ERROR = NoSuchFieldError.class;
+    Class<NoSuchMethodError> NO_SUCH_METHOD_ERROR = NoSuchMethodError.class;
+    Class<NoClassDefFoundError> NO_CLASS_DEF_FOUND_ERROR = NoClassDefFoundError.class;
+    Class<UnsatisfiedLinkError> UNSATISFIED_LINK_ERROR = UnsatisfiedLinkError.class;
+    Class<VerifyError> VERIFY_ERROR = VerifyError.class;
     /* UnsupportedClassVersionError is new in JDK 1.2 */
-//    public static final Class UnsupportedClassVersionError = UnsupportedClassVersionError.class;
+//    Class UnsupportedClassVersionError = UnsupportedClassVersionError.class;
     /** Run-Time Exceptions 
      */
-    public static final Class<NullPointerException> NULL_POINTER_EXCEPTION = NullPointerException.class;
-    public static final Class<ArrayIndexOutOfBoundsException> ARRAY_INDEX_OUT_OF_BOUNDS_EXCEPTION
+    Class<NullPointerException> NULL_POINTER_EXCEPTION = NullPointerException.class;
+    Class<ArrayIndexOutOfBoundsException> ARRAY_INDEX_OUT_OF_BOUNDS_EXCEPTION
                                                             = ArrayIndexOutOfBoundsException.class;
-    public static final Class<ArithmeticException> ARITHMETIC_EXCEPTION = ArithmeticException.class;
-    public static final Class<NegativeArraySizeException> NEGATIVE_ARRAY_SIZE_EXCEPTION
= NegativeArraySizeException.class;
-    public static final Class<ClassCastException> CLASS_CAST_EXCEPTION = ClassCastException.class;
-    public static final Class<IllegalMonitorStateException> ILLEGAL_MONITOR_STATE =
IllegalMonitorStateException.class;
+    Class<ArithmeticException> ARITHMETIC_EXCEPTION = ArithmeticException.class;
+    Class<NegativeArraySizeException> NEGATIVE_ARRAY_SIZE_EXCEPTION = NegativeArraySizeException.class;
+    Class<ClassCastException> CLASS_CAST_EXCEPTION = ClassCastException.class;
+    Class<IllegalMonitorStateException> ILLEGAL_MONITOR_STATE = IllegalMonitorStateException.class;
 
     /**
      * Pre-defined exception arrays according to chapters 5.1-5.4 of the Java Virtual
@@ -67,21 +67,21 @@ public interface ExceptionConstants {
      * @deprecated Do not use these arrays, use the static methods in the ExceptionConst
implementation class instead
      */
     @Deprecated
-    public static final Class<?>[] EXCS_CLASS_AND_INTERFACE_RESOLUTION = {
+    Class<?>[] EXCS_CLASS_AND_INTERFACE_RESOLUTION = {
             NO_CLASS_DEF_FOUND_ERROR, CLASS_FORMAT_ERROR, VERIFY_ERROR, ABSTRACT_METHOD_ERROR,
             EXCEPTION_IN_INITIALIZER_ERROR, ILLEGAL_ACCESS_ERROR
     }; // Chapter 5.1
     @Deprecated
-    public static final Class<?>[] EXCS_FIELD_AND_METHOD_RESOLUTION = {
+    Class<?>[] EXCS_FIELD_AND_METHOD_RESOLUTION = {
             NO_SUCH_FIELD_ERROR, ILLEGAL_ACCESS_ERROR, NO_SUCH_METHOD_ERROR
     }; // Chapter 5.2
     @Deprecated
-    public static final Class<?>[] EXCS_INTERFACE_METHOD_RESOLUTION = new Class[0];
// Chapter 5.3 (as below)
+    Class<?>[] EXCS_INTERFACE_METHOD_RESOLUTION = new Class[0]; // Chapter 5.3 (as
below)
     @Deprecated
-    public static final Class<?>[] EXCS_STRING_RESOLUTION = new Class[0];
+    Class<?>[] EXCS_STRING_RESOLUTION = new Class[0];
     // Chapter 5.4 (no errors but the ones that _always_ could happen! How stupid.)
     @Deprecated
-    public static final Class<?>[] EXCS_ARRAY_EXCEPTION = {
+    Class<?>[] EXCS_ARRAY_EXCEPTION = {
             NULL_POINTER_EXCEPTION, ARRAY_INDEX_OUT_OF_BOUNDS_EXCEPTION
     };
 

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/InstructionComparator.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/InstructionComparator.java?rev=1749597&r1=1749596&r2=1749597&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/InstructionComparator.java
(original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/InstructionComparator.java
Tue Jun 21 20:28:51 2016
@@ -31,7 +31,7 @@ package org.apache.bcel.generic;
  */
 public interface InstructionComparator {
 
-    public static final InstructionComparator DEFAULT = new InstructionComparator() {
+    InstructionComparator DEFAULT = new InstructionComparator() {
 
         @Override
         public boolean equals( final Instruction i1, final Instruction i2 ) {

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/InstructionConstants.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/InstructionConstants.java?rev=1749597&r1=1749596&r2=1749597&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/InstructionConstants.java
(original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/InstructionConstants.java
Tue Jun 21 20:28:51 2016
@@ -45,139 +45,139 @@ public interface InstructionConstants {
      * NOTE these are not currently immutable, because Instruction
      * has mutable protected fields opcode and length.
      */
-    public static final Instruction NOP = new NOP();
-    public static final Instruction ACONST_NULL = new ACONST_NULL();
-    public static final Instruction ICONST_M1 = new ICONST(-1);
-    public static final Instruction ICONST_0 = new ICONST(0);
-    public static final Instruction ICONST_1 = new ICONST(1);
-    public static final Instruction ICONST_2 = new ICONST(2);
-    public static final Instruction ICONST_3 = new ICONST(3);
-    public static final Instruction ICONST_4 = new ICONST(4);
-    public static final Instruction ICONST_5 = new ICONST(5);
-    public static final Instruction LCONST_0 = new LCONST(0);
-    public static final Instruction LCONST_1 = new LCONST(1);
-    public static final Instruction FCONST_0 = new FCONST(0);
-    public static final Instruction FCONST_1 = new FCONST(1);
-    public static final Instruction FCONST_2 = new FCONST(2);
-    public static final Instruction DCONST_0 = new DCONST(0);
-    public static final Instruction DCONST_1 = new DCONST(1);
-    public static final ArrayInstruction IALOAD = new IALOAD();
-    public static final ArrayInstruction LALOAD = new LALOAD();
-    public static final ArrayInstruction FALOAD = new FALOAD();
-    public static final ArrayInstruction DALOAD = new DALOAD();
-    public static final ArrayInstruction AALOAD = new AALOAD();
-    public static final ArrayInstruction BALOAD = new BALOAD();
-    public static final ArrayInstruction CALOAD = new CALOAD();
-    public static final ArrayInstruction SALOAD = new SALOAD();
-    public static final ArrayInstruction IASTORE = new IASTORE();
-    public static final ArrayInstruction LASTORE = new LASTORE();
-    public static final ArrayInstruction FASTORE = new FASTORE();
-    public static final ArrayInstruction DASTORE = new DASTORE();
-    public static final ArrayInstruction AASTORE = new AASTORE();
-    public static final ArrayInstruction BASTORE = new BASTORE();
-    public static final ArrayInstruction CASTORE = new CASTORE();
-    public static final ArrayInstruction SASTORE = new SASTORE();
-    public static final StackInstruction POP = new POP();
-    public static final StackInstruction POP2 = new POP2();
-    public static final StackInstruction DUP = new DUP();
-    public static final StackInstruction DUP_X1 = new DUP_X1();
-    public static final StackInstruction DUP_X2 = new DUP_X2();
-    public static final StackInstruction DUP2 = new DUP2();
-    public static final StackInstruction DUP2_X1 = new DUP2_X1();
-    public static final StackInstruction DUP2_X2 = new DUP2_X2();
-    public static final StackInstruction SWAP = new SWAP();
-    public static final ArithmeticInstruction IADD = new IADD();
-    public static final ArithmeticInstruction LADD = new LADD();
-    public static final ArithmeticInstruction FADD = new FADD();
-    public static final ArithmeticInstruction DADD = new DADD();
-    public static final ArithmeticInstruction ISUB = new ISUB();
-    public static final ArithmeticInstruction LSUB = new LSUB();
-    public static final ArithmeticInstruction FSUB = new FSUB();
-    public static final ArithmeticInstruction DSUB = new DSUB();
-    public static final ArithmeticInstruction IMUL = new IMUL();
-    public static final ArithmeticInstruction LMUL = new LMUL();
-    public static final ArithmeticInstruction FMUL = new FMUL();
-    public static final ArithmeticInstruction DMUL = new DMUL();
-    public static final ArithmeticInstruction IDIV = new IDIV();
-    public static final ArithmeticInstruction LDIV = new LDIV();
-    public static final ArithmeticInstruction FDIV = new FDIV();
-    public static final ArithmeticInstruction DDIV = new DDIV();
-    public static final ArithmeticInstruction IREM = new IREM();
-    public static final ArithmeticInstruction LREM = new LREM();
-    public static final ArithmeticInstruction FREM = new FREM();
-    public static final ArithmeticInstruction DREM = new DREM();
-    public static final ArithmeticInstruction INEG = new INEG();
-    public static final ArithmeticInstruction LNEG = new LNEG();
-    public static final ArithmeticInstruction FNEG = new FNEG();
-    public static final ArithmeticInstruction DNEG = new DNEG();
-    public static final ArithmeticInstruction ISHL = new ISHL();
-    public static final ArithmeticInstruction LSHL = new LSHL();
-    public static final ArithmeticInstruction ISHR = new ISHR();
-    public static final ArithmeticInstruction LSHR = new LSHR();
-    public static final ArithmeticInstruction IUSHR = new IUSHR();
-    public static final ArithmeticInstruction LUSHR = new LUSHR();
-    public static final ArithmeticInstruction IAND = new IAND();
-    public static final ArithmeticInstruction LAND = new LAND();
-    public static final ArithmeticInstruction IOR = new IOR();
-    public static final ArithmeticInstruction LOR = new LOR();
-    public static final ArithmeticInstruction IXOR = new IXOR();
-    public static final ArithmeticInstruction LXOR = new LXOR();
-    public static final ConversionInstruction I2L = new I2L();
-    public static final ConversionInstruction I2F = new I2F();
-    public static final ConversionInstruction I2D = new I2D();
-    public static final ConversionInstruction L2I = new L2I();
-    public static final ConversionInstruction L2F = new L2F();
-    public static final ConversionInstruction L2D = new L2D();
-    public static final ConversionInstruction F2I = new F2I();
-    public static final ConversionInstruction F2L = new F2L();
-    public static final ConversionInstruction F2D = new F2D();
-    public static final ConversionInstruction D2I = new D2I();
-    public static final ConversionInstruction D2L = new D2L();
-    public static final ConversionInstruction D2F = new D2F();
-    public static final ConversionInstruction I2B = new I2B();
-    public static final ConversionInstruction I2C = new I2C();
-    public static final ConversionInstruction I2S = new I2S();
-    public static final Instruction LCMP = new LCMP();
-    public static final Instruction FCMPL = new FCMPL();
-    public static final Instruction FCMPG = new FCMPG();
-    public static final Instruction DCMPL = new DCMPL();
-    public static final Instruction DCMPG = new DCMPG();
-    public static final ReturnInstruction IRETURN = new IRETURN();
-    public static final ReturnInstruction LRETURN = new LRETURN();
-    public static final ReturnInstruction FRETURN = new FRETURN();
-    public static final ReturnInstruction DRETURN = new DRETURN();
-    public static final ReturnInstruction ARETURN = new ARETURN();
-    public static final ReturnInstruction RETURN = new RETURN();
-    public static final Instruction ARRAYLENGTH = new ARRAYLENGTH();
-    public static final Instruction ATHROW = new ATHROW();
-    public static final Instruction MONITORENTER = new MONITORENTER();
-    public static final Instruction MONITOREXIT = new MONITOREXIT();
+    Instruction NOP = new NOP();
+    Instruction ACONST_NULL = new ACONST_NULL();
+    Instruction ICONST_M1 = new ICONST(-1);
+    Instruction ICONST_0 = new ICONST(0);
+    Instruction ICONST_1 = new ICONST(1);
+    Instruction ICONST_2 = new ICONST(2);
+    Instruction ICONST_3 = new ICONST(3);
+    Instruction ICONST_4 = new ICONST(4);
+    Instruction ICONST_5 = new ICONST(5);
+    Instruction LCONST_0 = new LCONST(0);
+    Instruction LCONST_1 = new LCONST(1);
+    Instruction FCONST_0 = new FCONST(0);
+    Instruction FCONST_1 = new FCONST(1);
+    Instruction FCONST_2 = new FCONST(2);
+    Instruction DCONST_0 = new DCONST(0);
+    Instruction DCONST_1 = new DCONST(1);
+    ArrayInstruction IALOAD = new IALOAD();
+    ArrayInstruction LALOAD = new LALOAD();
+    ArrayInstruction FALOAD = new FALOAD();
+    ArrayInstruction DALOAD = new DALOAD();
+    ArrayInstruction AALOAD = new AALOAD();
+    ArrayInstruction BALOAD = new BALOAD();
+    ArrayInstruction CALOAD = new CALOAD();
+    ArrayInstruction SALOAD = new SALOAD();
+    ArrayInstruction IASTORE = new IASTORE();
+    ArrayInstruction LASTORE = new LASTORE();
+    ArrayInstruction FASTORE = new FASTORE();
+    ArrayInstruction DASTORE = new DASTORE();
+    ArrayInstruction AASTORE = new AASTORE();
+    ArrayInstruction BASTORE = new BASTORE();
+    ArrayInstruction CASTORE = new CASTORE();
+    ArrayInstruction SASTORE = new SASTORE();
+    StackInstruction POP = new POP();
+    StackInstruction POP2 = new POP2();
+    StackInstruction DUP = new DUP();
+    StackInstruction DUP_X1 = new DUP_X1();
+    StackInstruction DUP_X2 = new DUP_X2();
+    StackInstruction DUP2 = new DUP2();
+    StackInstruction DUP2_X1 = new DUP2_X1();
+    StackInstruction DUP2_X2 = new DUP2_X2();
+    StackInstruction SWAP = new SWAP();
+    ArithmeticInstruction IADD = new IADD();
+    ArithmeticInstruction LADD = new LADD();
+    ArithmeticInstruction FADD = new FADD();
+    ArithmeticInstruction DADD = new DADD();
+    ArithmeticInstruction ISUB = new ISUB();
+    ArithmeticInstruction LSUB = new LSUB();
+    ArithmeticInstruction FSUB = new FSUB();
+    ArithmeticInstruction DSUB = new DSUB();
+    ArithmeticInstruction IMUL = new IMUL();
+    ArithmeticInstruction LMUL = new LMUL();
+    ArithmeticInstruction FMUL = new FMUL();
+    ArithmeticInstruction DMUL = new DMUL();
+    ArithmeticInstruction IDIV = new IDIV();
+    ArithmeticInstruction LDIV = new LDIV();
+    ArithmeticInstruction FDIV = new FDIV();
+    ArithmeticInstruction DDIV = new DDIV();
+    ArithmeticInstruction IREM = new IREM();
+    ArithmeticInstruction LREM = new LREM();
+    ArithmeticInstruction FREM = new FREM();
+    ArithmeticInstruction DREM = new DREM();
+    ArithmeticInstruction INEG = new INEG();
+    ArithmeticInstruction LNEG = new LNEG();
+    ArithmeticInstruction FNEG = new FNEG();
+    ArithmeticInstruction DNEG = new DNEG();
+    ArithmeticInstruction ISHL = new ISHL();
+    ArithmeticInstruction LSHL = new LSHL();
+    ArithmeticInstruction ISHR = new ISHR();
+    ArithmeticInstruction LSHR = new LSHR();
+    ArithmeticInstruction IUSHR = new IUSHR();
+    ArithmeticInstruction LUSHR = new LUSHR();
+    ArithmeticInstruction IAND = new IAND();
+    ArithmeticInstruction LAND = new LAND();
+    ArithmeticInstruction IOR = new IOR();
+    ArithmeticInstruction LOR = new LOR();
+    ArithmeticInstruction IXOR = new IXOR();
+    ArithmeticInstruction LXOR = new LXOR();
+    ConversionInstruction I2L = new I2L();
+    ConversionInstruction I2F = new I2F();
+    ConversionInstruction I2D = new I2D();
+    ConversionInstruction L2I = new L2I();
+    ConversionInstruction L2F = new L2F();
+    ConversionInstruction L2D = new L2D();
+    ConversionInstruction F2I = new F2I();
+    ConversionInstruction F2L = new F2L();
+    ConversionInstruction F2D = new F2D();
+    ConversionInstruction D2I = new D2I();
+    ConversionInstruction D2L = new D2L();
+    ConversionInstruction D2F = new D2F();
+    ConversionInstruction I2B = new I2B();
+    ConversionInstruction I2C = new I2C();
+    ConversionInstruction I2S = new I2S();
+    Instruction LCMP = new LCMP();
+    Instruction FCMPL = new FCMPL();
+    Instruction FCMPG = new FCMPG();
+    Instruction DCMPL = new DCMPL();
+    Instruction DCMPG = new DCMPG();
+    ReturnInstruction IRETURN = new IRETURN();
+    ReturnInstruction LRETURN = new LRETURN();
+    ReturnInstruction FRETURN = new FRETURN();
+    ReturnInstruction DRETURN = new DRETURN();
+    ReturnInstruction ARETURN = new ARETURN();
+    ReturnInstruction RETURN = new RETURN();
+    Instruction ARRAYLENGTH = new ARRAYLENGTH();
+    Instruction ATHROW = new ATHROW();
+    Instruction MONITORENTER = new MONITORENTER();
+    Instruction MONITOREXIT = new MONITOREXIT();
     /** You can use these constants in multiple places safely, if you can guarantee
      * that you will never alter their internal values, e.g. call setIndex().
      */
-    public static final LocalVariableInstruction THIS = new ALOAD(0);
-    public static final LocalVariableInstruction ALOAD_0 = THIS;
-    public static final LocalVariableInstruction ALOAD_1 = new ALOAD(1);
-    public static final LocalVariableInstruction ALOAD_2 = new ALOAD(2);
-    public static final LocalVariableInstruction ILOAD_0 = new ILOAD(0);
-    public static final LocalVariableInstruction ILOAD_1 = new ILOAD(1);
-    public static final LocalVariableInstruction ILOAD_2 = new ILOAD(2);
-    public static final LocalVariableInstruction ASTORE_0 = new ASTORE(0);
-    public static final LocalVariableInstruction ASTORE_1 = new ASTORE(1);
-    public static final LocalVariableInstruction ASTORE_2 = new ASTORE(2);
-    public static final LocalVariableInstruction ISTORE_0 = new ISTORE(0);
-    public static final LocalVariableInstruction ISTORE_1 = new ISTORE(1);
-    public static final LocalVariableInstruction ISTORE_2 = new ISTORE(2);
+    LocalVariableInstruction THIS = new ALOAD(0);
+    LocalVariableInstruction ALOAD_0 = THIS;
+    LocalVariableInstruction ALOAD_1 = new ALOAD(1);
+    LocalVariableInstruction ALOAD_2 = new ALOAD(2);
+    LocalVariableInstruction ILOAD_0 = new ILOAD(0);
+    LocalVariableInstruction ILOAD_1 = new ILOAD(1);
+    LocalVariableInstruction ILOAD_2 = new ILOAD(2);
+    LocalVariableInstruction ASTORE_0 = new ASTORE(0);
+    LocalVariableInstruction ASTORE_1 = new ASTORE(1);
+    LocalVariableInstruction ASTORE_2 = new ASTORE(2);
+    LocalVariableInstruction ISTORE_0 = new ISTORE(0);
+    LocalVariableInstruction ISTORE_1 = new ISTORE(1);
+    LocalVariableInstruction ISTORE_2 = new ISTORE(2);
     /** Get object via its opcode, for immutable instructions like
      * branch instructions entries are set to null.
      */
-    public static final Instruction[] INSTRUCTIONS = new Instruction[256];
+    Instruction[] INSTRUCTIONS = new Instruction[256];
     /** Interfaces may have no static initializers, so we simulate this
      * with an inner class.
      */
-    static final Clinit bla = new Clinit();
+    Clinit bla = new Clinit();
 
-    static class Clinit {
+    class Clinit {
 
         Clinit() {
             INSTRUCTIONS[Const.NOP] = NOP;

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LoadClass.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LoadClass.java?rev=1749597&r1=1749596&r2=1749597&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LoadClass.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LoadClass.java Tue Jun
21 20:28:51 2016
@@ -31,7 +31,7 @@ public interface LoadClass {
      * @return object type that may be loaded or null if a primitive is
      * referenced
      */
-    public ObjectType getLoadClassType( ConstantPoolGen cpg );
+    ObjectType getLoadClassType( ConstantPoolGen cpg );
 
 
     /**
@@ -46,5 +46,5 @@ public interface LoadClass {
      * an int[][].
      * @see #getLoadClassType(ConstantPoolGen)
      */
-    public Type getType( ConstantPoolGen cpg );
+    Type getType( ConstantPoolGen cpg );
 }

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=1749597&r1=1749596&r2=1749597&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 21
20:28:51 2016
@@ -370,28 +370,28 @@ public class ClassPath {
 
         /** @return input stream for class file.
          */
-        public abstract InputStream getInputStream() throws IOException;
+        InputStream getInputStream() throws IOException;
 
 
         /** @return canonical path to class file.
          */
-        public abstract String getPath();
+        String getPath();
 
 
         /** @return base path of found class, i.e. class is contained relative
          * to that path, which may either denote a directory, or zip file
          */
-        public abstract String getBase();
+        String getBase();
 
 
         /** @return modification time of class file.
          */
-        public abstract long getTime();
+        long getTime();
 
 
         /** @return size of class file.
          */
-        public abstract long getSize();
+        long getSize();
     }
 
     private static class Dir extends PathEntry {

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=1749597&r1=1749596&r2=1749597&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 21 20:28:51 2016
@@ -297,14 +297,14 @@ public class InstructionFinder {
      * check constraints that can not expressed with regular expressions.
      * 
      */
-    public static interface CodeConstraint {
+    public interface CodeConstraint {
 
         /**
          * @param match
          *          array of instructions matching the requested pattern
          * @return true if the matched area is really useful
          */
-        public boolean checkCode( InstructionHandle[] match );
+        boolean checkCode( InstructionHandle[] match );
     }
 
     // Initialize pattern map



Mime
View raw message