Author: ggregory
Date: Tue Jun 21 20:36:33 2016
New Revision: 1749598
URL: http://svn.apache.org/viewvc?rev=1749598&view=rev
Log:
Restore BC vs. 5.2.
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/CodeException.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/LocalVariable.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/InstructionFactory.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/PUSH.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/Class2HTML.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/statics/Pass2Verifier.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/structurals/UninitializedObjectType.java
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/CodeException.java
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/CodeException.java?rev=1749598&r1=1749597&r2=1749598&view=diff
==============================================================================
---
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/CodeException.java
(original)
+++
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/CodeException.java
Tue Jun 21 20:36:33 2016
@@ -22,6 +22,7 @@ import java.io.DataOutputStream;
import java.io.IOException;
import org.apache.bcel.Const;
+import org.apache.bcel.Constants;
/**
* This class represents an entry in the exception table of the <em>Code</em>
@@ -31,7 +32,7 @@ import org.apache.bcel.Const;
* @version $Id$
* @see Code
*/
-public final class CodeException implements Cloneable, Node {
+public final class CodeException implements Cloneable, Node, Constants {
private int start_pc; // Range in the code the exception handler is
private int end_pc; // active. start_pc is inclusive, end_pc exclusive
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/LocalVariable.java
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/LocalVariable.java?rev=1749598&r1=1749597&r2=1749598&view=diff
==============================================================================
---
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/LocalVariable.java
(original)
+++
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/LocalVariable.java
Tue Jun 21 20:36:33 2016
@@ -22,6 +22,7 @@ import java.io.DataOutputStream;
import java.io.IOException;
import org.apache.bcel.Const;
+import org.apache.bcel.Constants;
/**
* This class represents a local variable within a method. It contains its
@@ -30,7 +31,7 @@ import org.apache.bcel.Const;
* @version $Id$
* @see LocalVariableTable
*/
-public final class LocalVariable implements Cloneable, Node {
+public final class LocalVariable implements Cloneable, Node, Constants {
private int start_pc; // Range in which the variable is valid
private int length;
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/InstructionFactory.java
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/InstructionFactory.java?rev=1749598&r1=1749597&r2=1749598&view=diff
==============================================================================
---
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/InstructionFactory.java
(original)
+++
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/InstructionFactory.java
Tue Jun 21 20:36:33 2016
@@ -32,7 +32,7 @@ import org.apache.bcel.Const;
* @see Const
* @see InstructionConst
*/
-public class InstructionFactory {
+public class InstructionFactory implements InstructionConstants {
// N.N. These must agree with the order of Constants.T_CHAR through T_LONG
private static final String[] short_names = {
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/PUSH.java
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/PUSH.java?rev=1749598&r1=1749597&r2=1749598&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/PUSH.java
(original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/PUSH.java
Tue Jun 21 20:36:33 2016
@@ -25,7 +25,7 @@ import org.apache.bcel.Const;
*
* @version $Id$
*/
-public final class PUSH implements CompoundInstruction,
VariableLengthInstruction {
+public final class PUSH implements CompoundInstruction,
VariableLengthInstruction, InstructionConstants {
private Instruction instruction;
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/Class2HTML.java
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/Class2HTML.java?rev=1749598&r1=1749597&r2=1749598&view=diff
==============================================================================
---
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/Class2HTML.java
(original)
+++
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/Class2HTML.java
Tue Jun 21 20:36:33 2016
@@ -25,6 +25,7 @@ import java.util.HashSet;
import java.util.Set;
import org.apache.bcel.Const;
+import org.apache.bcel.Constants;
import org.apache.bcel.classfile.Attribute;
import org.apache.bcel.classfile.ClassParser;
import org.apache.bcel.classfile.ConstantPool;
@@ -53,7 +54,7 @@ import org.apache.bcel.classfile.Utility
*
* @version $Id$
*/
-public class Class2HTML {
+public class Class2HTML implements Constants {
private final JavaClass java_class; // current class object
private final String dir;
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/statics/Pass2Verifier.java
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/statics/Pass2Verifier.java?rev=1749598&r1=1749597&r2=1749598&view=diff
==============================================================================
---
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/statics/Pass2Verifier.java
(original)
+++
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/statics/Pass2Verifier.java
Tue Jun 21 20:36:33 2016
@@ -19,13 +19,13 @@ package org.apache.bcel.verifier.statics
import java.util.HashMap;
-
import java.util.HashSet;
import java.util.Locale;
import java.util.Map;
import java.util.Set;
import org.apache.bcel.Const;
+import org.apache.bcel.Constants;
import org.apache.bcel.Repository;
import org.apache.bcel.classfile.Attribute;
import org.apache.bcel.classfile.ClassFormatException;
@@ -83,7 +83,7 @@ import org.apache.bcel.verifier.exc.Loca
* @version $Id$
* @see #do_verify()
*/
-public final class Pass2Verifier extends PassVerifier {
+public final class Pass2Verifier extends PassVerifier implements Constants {
/**
* The LocalVariableInfo instances used by Pass3bVerifier.
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/structurals/UninitializedObjectType.java
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/structurals/UninitializedObjectType.java?rev=1749598&r1=1749597&r2=1749598&view=diff
==============================================================================
---
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/structurals/UninitializedObjectType.java
(original)
+++
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/structurals/UninitializedObjectType.java
Tue Jun 21 20:36:33 2016
@@ -19,6 +19,7 @@ package org.apache.bcel.verifier.structu
import org.apache.bcel.Const;
+import org.apache.bcel.Constants;
import org.apache.bcel.generic.ObjectType;
import org.apache.bcel.generic.ReferenceType;
@@ -29,7 +30,7 @@ import org.apache.bcel.generic.Reference
*
* @version $Id$
*/
-public class UninitializedObjectType extends ReferenceType{
+public class UninitializedObjectType extends ReferenceType implements
Constants {
/** The "initialized" version. */
private final ObjectType initialized;
