Author: sebb
Date: Thu Sep 10 23:31:58 2015
New Revision: 1702350
URL: http://svn.apache.org/r1702350
Log:
Gradually working towards restoring binary compatibility
Revert ExceptionConstants back to interface
Added:
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/ExceptionConst.java
(with props)
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/ExceptionConstants.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ANEWARRAY.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ArrayInstruction.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/CHECKCAST.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/GETFIELD.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/GETSTATIC.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/INSTANCEOF.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/INVOKEDYNAMIC.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/INVOKEINTERFACE.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/INVOKESPECIAL.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/INVOKESTATIC.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/INVOKEVIRTUAL.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LDC.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/MULTIANEWARRAY.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/NEW.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/PUTFIELD.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/PUTSTATIC.java
Added:
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/ExceptionConst.java
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/ExceptionConst.java?rev=1702350&view=auto
==============================================================================
---
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/ExceptionConst.java
(added)
+++
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/ExceptionConst.java
Thu Sep 10 23:31:58 2015
@@ -0,0 +1,70 @@
+package org.apache.commons.bcel6;
+
+public abstract class ExceptionConst implements ExceptionConstants {
+
+ /**
+ * Pre-defined exception arrays according to chapters 5.1-5.4 of the Java
Virtual
+ * Machine Specification
+ */
+ private static final 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
+ private static final Class<?>[] EXCS_FIELD_AND_METHOD_RESOLUTION = {
+ NO_SUCH_FIELD_ERROR, ILLEGAL_ACCESS_ERROR, NO_SUCH_METHOD_ERROR
+ }; // Chapter 5.2
+ private static final Class<?>[] EXCS_INTERFACE_METHOD_RESOLUTION = new
Class[0]; // Chapter 5.3 (as below)
+ private static final Class<?>[] EXCS_STRING_RESOLUTION = new Class[0];
+ // Chapter 5.4 (no errors but the ones that _always_ could happen! How
stupid.)
+ private static final Class<?>[] EXCS_ARRAY_EXCEPTION = {
+ NULL_POINTER_EXCEPTION, ARRAY_INDEX_OUT_OF_BOUNDS_EXCEPTION
+ };
+
+ /**
+ * Enum corresponding to the various Exception Class arrays,
+ * used by {@link ExceptionConstants#createExceptions(EXCS, Class...)}
+ */
+ public enum EXCS {
+ EXCS_CLASS_AND_INTERFACE_RESOLUTION,
+ EXCS_FIELD_AND_METHOD_RESOLUTION,
+ EXCS_INTERFACE_METHOD_RESOLUTION,
+ EXCS_STRING_RESOLUTION,
+ EXCS_ARRAY_EXCEPTION,
+ };
+
+ // helper method to merge exception class arrays
+ private static Class<?>[] mergeExceptions(Class<?>[] input, Class<?> ...
extraClasses) {
+ int extraLen = extraClasses == null ? 0 : extraClasses.length;
+ Class<?>[] excs = new Class<?>[input.length + extraLen];
+ System.arraycopy(input, 0, excs, 0, input.length);
+ if (extraLen > 0) {
+ System.arraycopy(extraClasses, 0, excs, input.length, extraLen);
+ }
+ return excs;
+ }
+
+ /**
+ * Creates a copy of the specified Exception Class array combined with any
additional Exception classes.
+ * @param type the basic array type
+ * @param extraClasses additional classes, if any
+ * @return the merged array
+ */
+ public static Class<?>[] createExceptions(EXCS type, Class<?> ...
extraClasses) {
+ switch (type) {
+ case EXCS_CLASS_AND_INTERFACE_RESOLUTION:
+ return mergeExceptions(EXCS_CLASS_AND_INTERFACE_RESOLUTION,
extraClasses);
+ case EXCS_ARRAY_EXCEPTION:
+ return mergeExceptions(EXCS_ARRAY_EXCEPTION, extraClasses);
+ case EXCS_FIELD_AND_METHOD_RESOLUTION:
+ return mergeExceptions(EXCS_FIELD_AND_METHOD_RESOLUTION,
extraClasses);
+ case EXCS_INTERFACE_METHOD_RESOLUTION:
+ return mergeExceptions(EXCS_INTERFACE_METHOD_RESOLUTION,
extraClasses);
+ case EXCS_STRING_RESOLUTION:
+ return mergeExceptions(EXCS_STRING_RESOLUTION, extraClasses);
+ default:
+ throw new AssertionError("Cannot happen; unexpected enum value: "
+ type);
+ }
+ }
+
+
+}
Propchange:
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/ExceptionConst.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/ExceptionConstants.java
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/ExceptionConstants.java?rev=1702350&r1=1702349&r2=1702350&view=diff
==============================================================================
---
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/ExceptionConstants.java
(original)
+++
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/ExceptionConstants.java
Thu Sep 10 23:31:58 2015
@@ -22,7 +22,7 @@ package org.apache.commons.bcel6;
*
* @version $Id$
*/
-public final class ExceptionConstants {
+public interface ExceptionConstants {
/** The mother of all exceptions
*/
@@ -61,68 +61,26 @@ public final class ExceptionConstants {
/**
* Pre-defined exception arrays according to chapters 5.1-5.4 of the Java
Virtual
- * Machine Specification
+ * Machine Specification
+ * @deprecated Do not use these arrays, use the static methods in the
ExceptionConst implementation class instead
*/
- private static final Class<?>[] EXCS_CLASS_AND_INTERFACE_RESOLUTION = {
+ @Deprecated
+ public static final 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
- private static final Class<?>[] EXCS_FIELD_AND_METHOD_RESOLUTION = {
+ @Deprecated
+ public static final Class<?>[] EXCS_FIELD_AND_METHOD_RESOLUTION = {
NO_SUCH_FIELD_ERROR, ILLEGAL_ACCESS_ERROR, NO_SUCH_METHOD_ERROR
}; // Chapter 5.2
- private static final Class<?>[] EXCS_INTERFACE_METHOD_RESOLUTION = new
Class[0]; // Chapter 5.3 (as below)
- private static final Class<?>[] EXCS_STRING_RESOLUTION = new Class[0];
+ @Deprecated
+ public static final Class<?>[] EXCS_INTERFACE_METHOD_RESOLUTION = new
Class[0]; // Chapter 5.3 (as below)
+ @Deprecated
+ public static final Class<?>[] EXCS_STRING_RESOLUTION = new Class[0];
// Chapter 5.4 (no errors but the ones that _always_ could happen! How
stupid.)
- private static final Class<?>[] EXCS_ARRAY_EXCEPTION = {
+ @Deprecated
+ public static final Class<?>[] EXCS_ARRAY_EXCEPTION = {
NULL_POINTER_EXCEPTION, ARRAY_INDEX_OUT_OF_BOUNDS_EXCEPTION
};
- /**
- * Enum corresponding to the various Exception Class arrays,
- * used by {@link ExceptionConstants#createExceptions(EXCS, Class...)}
- */
- public enum EXCS {
- EXCS_CLASS_AND_INTERFACE_RESOLUTION,
- EXCS_FIELD_AND_METHOD_RESOLUTION,
- EXCS_INTERFACE_METHOD_RESOLUTION,
- EXCS_STRING_RESOLUTION,
- EXCS_ARRAY_EXCEPTION,
- };
-
- private ExceptionConstants() { } // not instantiable
-
- // helper method to merge exception class arrays
- private static Class<?>[] mergeExceptions(Class<?>[] input, Class<?> ...
extraClasses) {
- int extraLen = extraClasses == null ? 0 : extraClasses.length;
- Class<?>[] excs = new Class<?>[input.length + extraLen];
- System.arraycopy(input, 0, excs, 0, input.length);
- if (extraLen > 0) {
- System.arraycopy(extraClasses, 0, excs, input.length, extraLen);
- }
- return excs;
- }
-
- /**
- * Creates a copy of the specified Exception Class array combined with any
additional Exception classes.
- * @param type the basic array type
- * @param extraClasses additional classes, if any
- * @return the merged array
- */
- public static Class<?>[] createExceptions(EXCS type, Class<?> ...
extraClasses) {
- switch (type) {
- case EXCS_CLASS_AND_INTERFACE_RESOLUTION:
- return mergeExceptions(EXCS_CLASS_AND_INTERFACE_RESOLUTION,
extraClasses);
- case EXCS_ARRAY_EXCEPTION:
- return mergeExceptions(EXCS_ARRAY_EXCEPTION, extraClasses);
- case EXCS_FIELD_AND_METHOD_RESOLUTION:
- return mergeExceptions(EXCS_FIELD_AND_METHOD_RESOLUTION,
extraClasses);
- case EXCS_INTERFACE_METHOD_RESOLUTION:
- return mergeExceptions(EXCS_INTERFACE_METHOD_RESOLUTION,
extraClasses);
- case EXCS_STRING_RESOLUTION:
- return mergeExceptions(EXCS_STRING_RESOLUTION, extraClasses);
- default:
- throw new AssertionError("Cannot happen; unexpected enum value: "
+ type);
- }
- }
-
}
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ANEWARRAY.java
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ANEWARRAY.java?rev=1702350&r1=1702349&r2=1702350&view=diff
==============================================================================
---
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ANEWARRAY.java
(original)
+++
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ANEWARRAY.java
Thu Sep 10 23:31:58 2015
@@ -17,7 +17,7 @@
*/
package org.apache.commons.bcel6.generic;
-import org.apache.commons.bcel6.ExceptionConstants;
+import org.apache.commons.bcel6.ExceptionConst;
/**
* ANEWARRAY - Create new array of references
@@ -43,8 +43,8 @@ public class ANEWARRAY extends CPInstruc
@Override
public Class<?>[] getExceptions() {
- return
ExceptionConstants.createExceptions(ExceptionConstants.EXCS.EXCS_CLASS_AND_INTERFACE_RESOLUTION,
- ExceptionConstants.NEGATIVE_ARRAY_SIZE_EXCEPTION);
+ return
ExceptionConst.createExceptions(ExceptionConst.EXCS.EXCS_CLASS_AND_INTERFACE_RESOLUTION,
+ ExceptionConst.NEGATIVE_ARRAY_SIZE_EXCEPTION);
}
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ArrayInstruction.java
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ArrayInstruction.java?rev=1702350&r1=1702349&r2=1702350&view=diff
==============================================================================
---
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ArrayInstruction.java
(original)
+++
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ArrayInstruction.java
Thu Sep 10 23:31:58 2015
@@ -17,7 +17,7 @@
*/
package org.apache.commons.bcel6.generic;
-import org.apache.commons.bcel6.ExceptionConstants;
+import org.apache.commons.bcel6.ExceptionConst;
/**
* Super class for instructions dealing with array access such as IALOAD.
@@ -45,7 +45,7 @@ public abstract class ArrayInstruction e
@Override
public Class<?>[] getExceptions() {
- return
ExceptionConstants.createExceptions(ExceptionConstants.EXCS.EXCS_ARRAY_EXCEPTION);
+ return
ExceptionConst.createExceptions(ExceptionConst.EXCS.EXCS_ARRAY_EXCEPTION);
}
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/CHECKCAST.java
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/CHECKCAST.java?rev=1702350&r1=1702349&r2=1702350&view=diff
==============================================================================
---
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/CHECKCAST.java
(original)
+++
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/CHECKCAST.java
Thu Sep 10 23:31:58 2015
@@ -17,7 +17,7 @@
*/
package org.apache.commons.bcel6.generic;
-import org.apache.commons.bcel6.ExceptionConstants;
+import org.apache.commons.bcel6.ExceptionConst;
/**
* CHECKCAST - Check whether object is of given type
@@ -48,8 +48,8 @@ public class CHECKCAST extends CPInstruc
*/
@Override
public Class<?>[] getExceptions() {
- return
ExceptionConstants.createExceptions(ExceptionConstants.EXCS.EXCS_CLASS_AND_INTERFACE_RESOLUTION,
- ExceptionConstants.CLASS_CAST_EXCEPTION);
+ return
ExceptionConst.createExceptions(ExceptionConst.EXCS.EXCS_CLASS_AND_INTERFACE_RESOLUTION,
+ ExceptionConst.CLASS_CAST_EXCEPTION);
}
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/GETFIELD.java
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/GETFIELD.java?rev=1702350&r1=1702349&r2=1702350&view=diff
==============================================================================
---
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/GETFIELD.java
(original)
+++
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/GETFIELD.java
Thu Sep 10 23:31:58 2015
@@ -18,7 +18,7 @@
package org.apache.commons.bcel6.generic;
import org.apache.commons.bcel6.Constants;
-import org.apache.commons.bcel6.ExceptionConstants;
+import org.apache.commons.bcel6.ExceptionConst;
/**
* GETFIELD - Fetch field from object
@@ -52,9 +52,9 @@ public class GETFIELD extends FieldInstr
@Override
public Class<?>[] getExceptions() {
- return
ExceptionConstants.createExceptions(ExceptionConstants.EXCS.EXCS_FIELD_AND_METHOD_RESOLUTION,
- ExceptionConstants.NULL_POINTER_EXCEPTION,
- ExceptionConstants.INCOMPATIBLE_CLASS_CHANGE_ERROR);
+ return
ExceptionConst.createExceptions(ExceptionConst.EXCS.EXCS_FIELD_AND_METHOD_RESOLUTION,
+ ExceptionConst.NULL_POINTER_EXCEPTION,
+ ExceptionConst.INCOMPATIBLE_CLASS_CHANGE_ERROR);
}
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/GETSTATIC.java
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/GETSTATIC.java?rev=1702350&r1=1702349&r2=1702350&view=diff
==============================================================================
---
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/GETSTATIC.java
(original)
+++
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/GETSTATIC.java
Thu Sep 10 23:31:58 2015
@@ -18,7 +18,7 @@
package org.apache.commons.bcel6.generic;
import org.apache.commons.bcel6.Constants;
-import org.apache.commons.bcel6.ExceptionConstants;
+import org.apache.commons.bcel6.ExceptionConst;
/**
* GETSTATIC - Fetch static field from class
@@ -51,8 +51,8 @@ public class GETSTATIC extends FieldInst
@Override
public Class<?>[] getExceptions() {
- return
ExceptionConstants.createExceptions(ExceptionConstants.EXCS.EXCS_FIELD_AND_METHOD_RESOLUTION,
- ExceptionConstants.INCOMPATIBLE_CLASS_CHANGE_ERROR);
+ return
ExceptionConst.createExceptions(ExceptionConst.EXCS.EXCS_FIELD_AND_METHOD_RESOLUTION,
+ ExceptionConst.INCOMPATIBLE_CLASS_CHANGE_ERROR);
}
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/INSTANCEOF.java
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/INSTANCEOF.java?rev=1702350&r1=1702349&r2=1702350&view=diff
==============================================================================
---
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/INSTANCEOF.java
(original)
+++
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/INSTANCEOF.java
Thu Sep 10 23:31:58 2015
@@ -17,7 +17,7 @@
*/
package org.apache.commons.bcel6.generic;
-import org.apache.commons.bcel6.ExceptionConstants;
+import org.apache.commons.bcel6.ExceptionConst;
/**
* INSTANCEOF - Determine if object is of given type
@@ -43,7 +43,7 @@ public class INSTANCEOF extends CPInstru
@Override
public Class<?>[] getExceptions() {
- return
ExceptionConstants.createExceptions(ExceptionConstants.EXCS.EXCS_CLASS_AND_INTERFACE_RESOLUTION);
+ return
ExceptionConst.createExceptions(ExceptionConst.EXCS.EXCS_CLASS_AND_INTERFACE_RESOLUTION);
}
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/INVOKEDYNAMIC.java
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/INVOKEDYNAMIC.java?rev=1702350&r1=1702349&r2=1702350&view=diff
==============================================================================
---
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/INVOKEDYNAMIC.java
(original)
+++
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/INVOKEDYNAMIC.java
Thu Sep 10 23:31:58 2015
@@ -21,7 +21,7 @@ import java.io.DataOutputStream;
import java.io.IOException;
import org.apache.commons.bcel6.Constants;
-import org.apache.commons.bcel6.ExceptionConstants;
+import org.apache.commons.bcel6.ExceptionConst;
import org.apache.commons.bcel6.classfile.ConstantPool;
import org.apache.commons.bcel6.util.ByteSequence;
@@ -87,11 +87,11 @@ public class INVOKEDYNAMIC extends Invok
@Override
public Class<?>[] getExceptions() {
- return
ExceptionConstants.createExceptions(ExceptionConstants.EXCS.EXCS_INTERFACE_METHOD_RESOLUTION,
- ExceptionConstants.UNSATISFIED_LINK_ERROR,
- ExceptionConstants.ABSTRACT_METHOD_ERROR,
- ExceptionConstants.ILLEGAL_ACCESS_ERROR,
- ExceptionConstants.INCOMPATIBLE_CLASS_CHANGE_ERROR);
+ return
ExceptionConst.createExceptions(ExceptionConst.EXCS.EXCS_INTERFACE_METHOD_RESOLUTION,
+ ExceptionConst.UNSATISFIED_LINK_ERROR,
+ ExceptionConst.ABSTRACT_METHOD_ERROR,
+ ExceptionConst.ILLEGAL_ACCESS_ERROR,
+ ExceptionConst.INCOMPATIBLE_CLASS_CHANGE_ERROR);
}
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/INVOKEINTERFACE.java
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/INVOKEINTERFACE.java?rev=1702350&r1=1702349&r2=1702350&view=diff
==============================================================================
---
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/INVOKEINTERFACE.java
(original)
+++
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/INVOKEINTERFACE.java
Thu Sep 10 23:31:58 2015
@@ -21,7 +21,7 @@ import java.io.DataOutputStream;
import java.io.IOException;
import org.apache.commons.bcel6.Constants;
-import org.apache.commons.bcel6.ExceptionConstants;
+import org.apache.commons.bcel6.ExceptionConst;
import org.apache.commons.bcel6.classfile.ConstantPool;
import org.apache.commons.bcel6.util.ByteSequence;
@@ -108,11 +108,11 @@ public final class INVOKEINTERFACE exten
@Override
public Class<?>[] getExceptions() {
- return
ExceptionConstants.createExceptions(ExceptionConstants.EXCS.EXCS_INTERFACE_METHOD_RESOLUTION,
- ExceptionConstants.UNSATISFIED_LINK_ERROR,
- ExceptionConstants.ABSTRACT_METHOD_ERROR,
- ExceptionConstants.ILLEGAL_ACCESS_ERROR,
- ExceptionConstants.INCOMPATIBLE_CLASS_CHANGE_ERROR);
+ return
ExceptionConst.createExceptions(ExceptionConst.EXCS.EXCS_INTERFACE_METHOD_RESOLUTION,
+ ExceptionConst.UNSATISFIED_LINK_ERROR,
+ ExceptionConst.ABSTRACT_METHOD_ERROR,
+ ExceptionConst.ILLEGAL_ACCESS_ERROR,
+ ExceptionConst.INCOMPATIBLE_CLASS_CHANGE_ERROR);
}
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/INVOKESPECIAL.java
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/INVOKESPECIAL.java?rev=1702350&r1=1702349&r2=1702350&view=diff
==============================================================================
---
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/INVOKESPECIAL.java
(original)
+++
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/INVOKESPECIAL.java
Thu Sep 10 23:31:58 2015
@@ -21,7 +21,7 @@ import java.io.DataOutputStream;
import java.io.IOException;
import org.apache.commons.bcel6.Constants;
-import org.apache.commons.bcel6.ExceptionConstants;
+import org.apache.commons.bcel6.ExceptionConst;
/**
* INVOKESPECIAL - Invoke instance method; special handling for superclass,
private
@@ -61,11 +61,11 @@ public class INVOKESPECIAL extends Invok
@Override
public Class<?>[] getExceptions() {
- return
ExceptionConstants.createExceptions(ExceptionConstants.EXCS.EXCS_FIELD_AND_METHOD_RESOLUTION,
- ExceptionConstants.NULL_POINTER_EXCEPTION,
- ExceptionConstants.INCOMPATIBLE_CLASS_CHANGE_ERROR,
- ExceptionConstants.ABSTRACT_METHOD_ERROR,
- ExceptionConstants.UNSATISFIED_LINK_ERROR);
+ return
ExceptionConst.createExceptions(ExceptionConst.EXCS.EXCS_FIELD_AND_METHOD_RESOLUTION,
+ ExceptionConst.NULL_POINTER_EXCEPTION,
+ ExceptionConst.INCOMPATIBLE_CLASS_CHANGE_ERROR,
+ ExceptionConst.ABSTRACT_METHOD_ERROR,
+ ExceptionConst.UNSATISFIED_LINK_ERROR);
}
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/INVOKESTATIC.java
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/INVOKESTATIC.java?rev=1702350&r1=1702349&r2=1702350&view=diff
==============================================================================
---
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/INVOKESTATIC.java
(original)
+++
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/INVOKESTATIC.java
Thu Sep 10 23:31:58 2015
@@ -21,7 +21,7 @@ import java.io.DataOutputStream;
import java.io.IOException;
import org.apache.commons.bcel6.Constants;
-import org.apache.commons.bcel6.ExceptionConstants;
+import org.apache.commons.bcel6.ExceptionConst;
/**
* INVOKESTATIC - Invoke a class (static) method
@@ -60,9 +60,9 @@ public class INVOKESTATIC extends Invoke
@Override
public Class<?>[] getExceptions() {
- return
ExceptionConstants.createExceptions(ExceptionConstants.EXCS.EXCS_FIELD_AND_METHOD_RESOLUTION,
- ExceptionConstants.UNSATISFIED_LINK_ERROR,
- ExceptionConstants.INCOMPATIBLE_CLASS_CHANGE_ERROR);
+ return
ExceptionConst.createExceptions(ExceptionConst.EXCS.EXCS_FIELD_AND_METHOD_RESOLUTION,
+ ExceptionConst.UNSATISFIED_LINK_ERROR,
+ ExceptionConst.INCOMPATIBLE_CLASS_CHANGE_ERROR);
}
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/INVOKEVIRTUAL.java
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/INVOKEVIRTUAL.java?rev=1702350&r1=1702349&r2=1702350&view=diff
==============================================================================
---
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/INVOKEVIRTUAL.java
(original)
+++
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/INVOKEVIRTUAL.java
Thu Sep 10 23:31:58 2015
@@ -21,7 +21,7 @@ import java.io.DataOutputStream;
import java.io.IOException;
import org.apache.commons.bcel6.Constants;
-import org.apache.commons.bcel6.ExceptionConstants;
+import org.apache.commons.bcel6.ExceptionConst;
/**
* INVOKEVIRTUAL - Invoke instance method; dispatch based on class
@@ -60,11 +60,11 @@ public class INVOKEVIRTUAL extends Invok
@Override
public Class<?>[] getExceptions() {
- return
ExceptionConstants.createExceptions(ExceptionConstants.EXCS.EXCS_FIELD_AND_METHOD_RESOLUTION,
- ExceptionConstants.NULL_POINTER_EXCEPTION,
- ExceptionConstants.INCOMPATIBLE_CLASS_CHANGE_ERROR,
- ExceptionConstants.ABSTRACT_METHOD_ERROR,
- ExceptionConstants.UNSATISFIED_LINK_ERROR);
+ return
ExceptionConst.createExceptions(ExceptionConst.EXCS.EXCS_FIELD_AND_METHOD_RESOLUTION,
+ ExceptionConst.NULL_POINTER_EXCEPTION,
+ ExceptionConst.INCOMPATIBLE_CLASS_CHANGE_ERROR,
+ ExceptionConst.ABSTRACT_METHOD_ERROR,
+ ExceptionConst.UNSATISFIED_LINK_ERROR);
}
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LDC.java
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LDC.java?rev=1702350&r1=1702349&r2=1702350&view=diff
==============================================================================
---
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LDC.java
(original)
+++
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LDC.java
Thu Sep 10 23:31:58 2015
@@ -20,7 +20,7 @@ package org.apache.commons.bcel6.generic
import java.io.DataOutputStream;
import java.io.IOException;
-import org.apache.commons.bcel6.ExceptionConstants;
+import org.apache.commons.bcel6.ExceptionConst;
import org.apache.commons.bcel6.util.ByteSequence;
/**
@@ -133,7 +133,7 @@ public class LDC extends CPInstruction i
@Override
public Class<?>[] getExceptions() {
- return
ExceptionConstants.createExceptions(ExceptionConstants.EXCS.EXCS_STRING_RESOLUTION);
+ return
ExceptionConst.createExceptions(ExceptionConst.EXCS.EXCS_STRING_RESOLUTION);
}
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/MULTIANEWARRAY.java
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/MULTIANEWARRAY.java?rev=1702350&r1=1702349&r2=1702350&view=diff
==============================================================================
---
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/MULTIANEWARRAY.java
(original)
+++
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/MULTIANEWARRAY.java
Thu Sep 10 23:31:58 2015
@@ -20,7 +20,7 @@ package org.apache.commons.bcel6.generic
import java.io.DataOutputStream;
import java.io.IOException;
-import org.apache.commons.bcel6.ExceptionConstants;
+import org.apache.commons.bcel6.ExceptionConst;
import org.apache.commons.bcel6.classfile.ConstantPool;
import org.apache.commons.bcel6.util.ByteSequence;
@@ -116,9 +116,9 @@ public class MULTIANEWARRAY extends CPIn
@Override
public Class<?>[] getExceptions() {
- return
ExceptionConstants.createExceptions(ExceptionConstants.EXCS.EXCS_CLASS_AND_INTERFACE_RESOLUTION,
- ExceptionConstants.ILLEGAL_ACCESS_ERROR,
- ExceptionConstants.NEGATIVE_ARRAY_SIZE_EXCEPTION);
+ return
ExceptionConst.createExceptions(ExceptionConst.EXCS.EXCS_CLASS_AND_INTERFACE_RESOLUTION,
+ ExceptionConst.ILLEGAL_ACCESS_ERROR,
+ ExceptionConst.NEGATIVE_ARRAY_SIZE_EXCEPTION);
}
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/NEW.java
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/NEW.java?rev=1702350&r1=1702349&r2=1702350&view=diff
==============================================================================
---
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/NEW.java
(original)
+++
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/NEW.java
Thu Sep 10 23:31:58 2015
@@ -17,7 +17,7 @@
*/
package org.apache.commons.bcel6.generic;
-import org.apache.commons.bcel6.ExceptionConstants;
+import org.apache.commons.bcel6.ExceptionConst;
/**
* NEW - Create new object
@@ -43,9 +43,9 @@ public class NEW extends CPInstruction i
@Override
public Class<?>[] getExceptions() {
- return
ExceptionConstants.createExceptions(ExceptionConstants.EXCS.EXCS_CLASS_AND_INTERFACE_RESOLUTION,
- ExceptionConstants.ILLEGAL_ACCESS_ERROR,
- ExceptionConstants.INSTANTIATION_ERROR);
+ return
ExceptionConst.createExceptions(ExceptionConst.EXCS.EXCS_CLASS_AND_INTERFACE_RESOLUTION,
+ ExceptionConst.ILLEGAL_ACCESS_ERROR,
+ ExceptionConst.INSTANTIATION_ERROR);
}
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/PUTFIELD.java
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/PUTFIELD.java?rev=1702350&r1=1702349&r2=1702350&view=diff
==============================================================================
---
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/PUTFIELD.java
(original)
+++
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/PUTFIELD.java
Thu Sep 10 23:31:58 2015
@@ -18,7 +18,7 @@
package org.apache.commons.bcel6.generic;
import org.apache.commons.bcel6.Constants;
-import org.apache.commons.bcel6.ExceptionConstants;
+import org.apache.commons.bcel6.ExceptionConst;
/**
* PUTFIELD - Put field in object
@@ -51,9 +51,9 @@ public class PUTFIELD extends FieldInstr
@Override
public Class<?>[] getExceptions() {
- return
ExceptionConstants.createExceptions(ExceptionConstants.EXCS.EXCS_FIELD_AND_METHOD_RESOLUTION,
- ExceptionConstants.NULL_POINTER_EXCEPTION,
- ExceptionConstants.INCOMPATIBLE_CLASS_CHANGE_ERROR);
+ return
ExceptionConst.createExceptions(ExceptionConst.EXCS.EXCS_FIELD_AND_METHOD_RESOLUTION,
+ ExceptionConst.NULL_POINTER_EXCEPTION,
+ ExceptionConst.INCOMPATIBLE_CLASS_CHANGE_ERROR);
}
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/PUTSTATIC.java
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/PUTSTATIC.java?rev=1702350&r1=1702349&r2=1702350&view=diff
==============================================================================
---
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/PUTSTATIC.java
(original)
+++
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/PUTSTATIC.java
Thu Sep 10 23:31:58 2015
@@ -18,7 +18,7 @@
package org.apache.commons.bcel6.generic;
import org.apache.commons.bcel6.Constants;
-import org.apache.commons.bcel6.ExceptionConstants;
+import org.apache.commons.bcel6.ExceptionConst;
/**
* PUTSTATIC - Put static field in class
@@ -51,8 +51,8 @@ public class PUTSTATIC extends FieldInst
@Override
public Class<?>[] getExceptions() {
- return
ExceptionConstants.createExceptions(ExceptionConstants.EXCS.EXCS_FIELD_AND_METHOD_RESOLUTION,
- ExceptionConstants.INCOMPATIBLE_CLASS_CHANGE_ERROR);
+ return
ExceptionConst.createExceptions(ExceptionConst.EXCS.EXCS_FIELD_AND_METHOD_RESOLUTION,
+ ExceptionConst.INCOMPATIBLE_CLASS_CHANGE_ERROR);
}
