Author: markt
Date: Mon Dec 7 14:14:49 2009
New Revision: 887927
URL: http://svn.apache.org/viewvc?rev=887927&view=rev
Log:
A little more cleanup. UCDetector claims there is no more to clean. I'm not yet
convinced.
Removed:
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/BasicType.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ClassGen.java
Modified:
tomcat/trunk/java/org/apache/tomcat/util/bcel/Constants.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/Select.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/Constants.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/Constants.java?rev=887927&r1=887926&r2=887927&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/Constants.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/Constants.java Mon Dec 7
14:14:49 2009
@@ -24,11 +24,7 @@
*/
public interface Constants {
-
-
-
-
- /** One of the access flags for fields, methods, or classes.
+ /** One of the access flags for fields, methods, or classes.
* @see #ACC_PUBLIC
*/
public final static short ACC_FINAL = 0x0010;
@@ -271,11 +267,6 @@
* @see <a
href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html";>Opcode
definitions in The Java Virtual Machine Specification</a> */
public static final short JSR_W = 201;
-
-
-
-
-
/** Illegal opcode. */
public static final short UNDEFINED = -1;
/** Illegal opcode. */
@@ -287,32 +278,18 @@
/** Mnemonic for an illegal type. */
public static final String ILLEGAL_TYPE = "<illegal type>";
- /** Boolean data type. */
- public static final byte T_BOOLEAN = 4;
- /** Char data type. */
- public static final byte T_CHAR = 5;
- /** Float data type. */
- public static final byte T_FLOAT = 6;
- /** Double data type. */
- public static final byte T_DOUBLE = 7;
/** Byte data type. */
public static final byte T_BYTE = 8;
/** Short data type. */
public static final byte T_SHORT = 9;
/** Int data type. */
public static final byte T_INT = 10;
- /** Long data type. */
- public static final byte T_LONG = 11;
- /** Void data type (non-standard). */
- public static final byte T_VOID = 12; // Non-standard
-
/** Object data type. */
public static final byte T_OBJECT = 14;
/** Unknown data type. */
public static final byte T_UNKNOWN = 15;
-
/** The primitive type names corresponding to the T_XX constants,
* e.g., TYPE_NAMES[T_INT] = "int"
@@ -323,14 +300,7 @@
"void", "array", "object", "unknown", "address"
};
- /** The signature characters corresponding to primitive types,
- * e.g., SHORT_TYPE_NAMES[T_INT] = "I"
- */
- public static final String[] SHORT_TYPE_NAMES = {
- ILLEGAL_TYPE, ILLEGAL_TYPE, ILLEGAL_TYPE, ILLEGAL_TYPE,
- "Z", "C", "F", "D", "B", "S", "I", "J",
- "V", ILLEGAL_TYPE, ILLEGAL_TYPE, ILLEGAL_TYPE
- };
+
/**
* Number of byte code operands for each opcode, i.e., number of bytes after
the tag byte
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java?rev=887927&r1=887926&r2=887927&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java Mon
Dec 7 14:14:49 2009
@@ -31,7 +31,6 @@
* should see the <a href="../generic/ClassGen.html">ClassGen</a> class.
* @version $Id$
- * @see org.apache.tomcat.util.bcel.generic.ClassGen
* @author <A HREF="mailto:m.d...@gmx.de";>M. Dahm</A>
*/
public class JavaClass extends AccessFlags implements Cloneable, Comparable {
@@ -49,8 +48,8 @@
private Attribute[] attributes; // attributes defined in the class
private AnnotationEntry[] annotations; // annotations defined on the
class
- public static final byte FILE = 2;
- public static final byte ZIP = 3;
+
+
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/Select.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/Select.java?rev=887927&r1=887926&r2=887927&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/Select.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/Select.java Mon Dec
7 14:14:49 2009
@@ -36,7 +36,7 @@
protected int[] match; // matches, i.e., case 1: ...
protected int[] indices; // target offsets
protected InstructionHandle[] targets; // target objects in instruction
list
- protected int fixed_length; // fixed length defined by subclasses
+
protected int match_length; // number of cases
protected int padding = 0; // number of pad bytes for alignment
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
