mdahm 2002/07/11 12:39:05
Modified: src/java/org/apache/bcel/classfile AccessFlags.java
Attribute.java AttributeReader.java
CodeException.java Constant.java ConstantPool.java
JavaClass.java LineNumber.java LocalVariable.java
src/java/org/apache/bcel/generic CodeExceptionGen.java
ConstantPoolGen.java InstructionFactory.java
LineNumberGen.java LocalVariableGen.java Type.java
src/java/org/apache/bcel/util ClassPath.java ClassQueue.java
ClassStack.java ClassVector.java Repository.java
Log:
make everything serialzable
Revision Changes Path
1.3 +2 -2 jakarta-bcel/src/java/org/apache/bcel/classfile/AccessFlags.java
Index: AccessFlags.java
===================================================================
RCS file: /home/cvs/jakarta-bcel/src/java/org/apache/bcel/classfile/AccessFlags.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AccessFlags.java 13 Jun 2002 13:43:24 -0000 1.2
+++ AccessFlags.java 11 Jul 2002 19:39:04 -0000 1.3
@@ -63,7 +63,7 @@
* @version $Id$
* @author <A HREF="mailto:[email protected]">M. Dahm</A>
*/
-public abstract class AccessFlags {
+public abstract class AccessFlags implements java.io.Serializable {
protected int access_flags;
public AccessFlags() {}
1.8 +4 -4 jakarta-bcel/src/java/org/apache/bcel/classfile/Attribute.java
Index: Attribute.java
===================================================================
RCS file: /home/cvs/jakarta-bcel/src/java/org/apache/bcel/classfile/Attribute.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Attribute.java 24 Apr 2002 11:01:30 -0000 1.7
+++ Attribute.java 11 Jul 2002 19:39:04 -0000 1.8
@@ -80,7 +80,7 @@
* @see Deprecated
* @see Signature
*/
-public abstract class Attribute implements Cloneable, Node {
+public abstract class Attribute implements Cloneable, Node, Serializable {
protected int name_index; // Points to attribute name in constant pool
protected int length; // Content length of attribute field
protected byte tag; // Tag to distiguish subclasses
@@ -149,7 +149,7 @@
* @throws ClassFormatException
*/
public static final Attribute readAttribute(DataInputStream file,
- ConstantPool constant_pool)
+ ConstantPool constant_pool)
throws IOException, ClassFormatException
{
ConstantUtf8 c;
@@ -159,7 +159,7 @@
byte tag = Constants.ATTR_UNKNOWN; // Unknown attribute
// Get class name from constant pool via `name_index' indirection
- name_index = (int)(file.readUnsignedShort());
+ name_index = (int)file.readUnsignedShort();
c = (ConstantUtf8)constant_pool.getConstant(name_index,
Constants.CONSTANT_Utf8);
name = c.getBytes();
1.3 +6 -7 jakarta-bcel/src/java/org/apache/bcel/classfile/AttributeReader.java
Index: AttributeReader.java
===================================================================
RCS file: /home/cvs/jakarta-bcel/src/java/org/apache/bcel/classfile/AttributeReader.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AttributeReader.java 11 Apr 2002 14:09:04 -0000 1.2
+++ AttributeReader.java 11 Jul 2002 19:39:04 -0000 1.3
@@ -55,10 +55,9 @@
*/
/**
-
* Unknown (non-standard) attributes may be read via user-defined factory
* objects that can be registered with the Attribute.addAttributeReader
- * method. These factory objects should implement this interface.
+ * method. These factory objects should implement this interface.
* @see Attribute
* @version $Id$
@@ -91,8 +90,8 @@
@see Attribute#addAttributeReader( String, AttributeReader )
*/
- public Attribute createAttribute( int name_index,
- int length,
- java.io.DataInputStream file,
- ConstantPool constant_pool );
+ public Attribute createAttribute(int name_index,
+ int length,
+ java.io.DataInputStream file,
+ ConstantPool constant_pool);
}
1.3 +4 -2 jakarta-bcel/src/java/org/apache/bcel/classfile/CodeException.java
Index: CodeException.java
===================================================================
RCS file: /home/cvs/jakarta-bcel/src/java/org/apache/bcel/classfile/CodeException.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CodeException.java 11 Mar 2002 16:16:35 -0000 1.2
+++ CodeException.java 11 Jul 2002 19:39:04 -0000 1.3
@@ -66,7 +66,9 @@
* @author <A HREF="mailto:[email protected]">M. Dahm</A>
* @see Code
*/
-public final class CodeException implements Cloneable, Constants, Node {
+public final class CodeException
+ implements Cloneable, Constants, Node, Serializable
+{
private int start_pc; // Range in the code the exception handler is
private int end_pc; // active. start_pc is inclusive, end_pc exclusive
private int handler_pc; /* Starting address of exception handler, i.e.,
1.3 +2 -2 jakarta-bcel/src/java/org/apache/bcel/classfile/Constant.java
Index: Constant.java
===================================================================
RCS file: /home/cvs/jakarta-bcel/src/java/org/apache/bcel/classfile/Constant.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Constant.java 24 Apr 2002 11:01:30 -0000 1.2
+++ Constant.java 11 Jul 2002 19:39:04 -0000 1.3
@@ -65,7 +65,7 @@
* @version $Id$
* @author <A HREF="mailto:[email protected]">M. Dahm</A>
*/
-public abstract class Constant implements Cloneable, Node {
+public abstract class Constant implements Cloneable, Node, Serializable {
/* In fact this tag is redundant since we can distinguish different
* `Constant' objects by their type, i.e., via `instanceof'. In some
* places we will use the tag for switch()es anyway.
1.6 +2 -3 jakarta-bcel/src/java/org/apache/bcel/classfile/ConstantPool.java
Index: ConstantPool.java
===================================================================
RCS file: /home/cvs/jakarta-bcel/src/java/org/apache/bcel/classfile/ConstantPool.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ConstantPool.java 26 May 2002 15:07:52 -0000 1.5
+++ ConstantPool.java 11 Jul 2002 19:39:04 -0000 1.6
@@ -58,7 +58,6 @@
import java.io.*;
/**
-
* This class represents the constant pool, i.e., a table of constants, of
* a parsed classfile. It may contain null references, due to the JVM
* specification that skips an entry after an 8-byte constant (double,
@@ -71,7 +70,7 @@
* @see org.apache.bcel.generic.ConstantPoolGen
* @author <A HREF="mailto:[email protected]">M. Dahm</A>
*/
-public class ConstantPool implements Cloneable, Node {
+public class ConstantPool implements Cloneable, Node, Serializable {
private int constant_pool_count;
private Constant[] constant_pool;
1.13 +2 -2 jakarta-bcel/src/java/org/apache/bcel/classfile/JavaClass.java
Index: JavaClass.java
===================================================================
RCS file: /home/cvs/jakarta-bcel/src/java/org/apache/bcel/classfile/JavaClass.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- JavaClass.java 6 Jul 2002 15:49:49 -0000 1.12
+++ JavaClass.java 11 Jul 2002 19:39:04 -0000 1.13
@@ -106,7 +106,7 @@
* use the default SyntheticRepository, because we
* don't know any better.
*/
- private org.apache.bcel.util.Repository repository =
+ private transient org.apache.bcel.util.Repository repository =
SyntheticRepository.getInstance();
/**
1.3 +2 -2 jakarta-bcel/src/java/org/apache/bcel/classfile/LineNumber.java
Index: LineNumber.java
===================================================================
RCS file: /home/cvs/jakarta-bcel/src/java/org/apache/bcel/classfile/LineNumber.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- LineNumber.java 11 Mar 2002 16:16:35 -0000 1.2
+++ LineNumber.java 11 Jul 2002 19:39:04 -0000 1.3
@@ -66,7 +66,7 @@
* @author <A HREF="mailto:[email protected]">M. Dahm</A>
* @see LineNumberTable
*/
-public final class LineNumber implements Cloneable, Node {
+public final class LineNumber implements Cloneable, Node, Serializable {
private int start_pc; // Program Counter (PC) corresponds to line
private int line_number; // number in source file
1.3 +4 -2 jakarta-bcel/src/java/org/apache/bcel/classfile/LocalVariable.java
Index: LocalVariable.java
===================================================================
RCS file: /home/cvs/jakarta-bcel/src/java/org/apache/bcel/classfile/LocalVariable.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- LocalVariable.java 11 Mar 2002 16:16:35 -0000 1.2
+++ LocalVariable.java 11 Jul 2002 19:39:04 -0000 1.3
@@ -65,7 +65,9 @@
* @author <A HREF="mailto:[email protected]">M. Dahm</A>
* @see LocalVariableTable
*/
-public final class LocalVariable implements Constants, Cloneable, Node {
+public final class LocalVariable
+ implements Constants, Cloneable, Node, Serializable
+{
private int start_pc; // Range in which the variable is valid
private int length;
private int name_index; // Index in constant pool of variable name
1.2 +3 -2 jakarta-bcel/src/java/org/apache/bcel/generic/CodeExceptionGen.java
Index: CodeExceptionGen.java
===================================================================
RCS file: /home/cvs/jakarta-bcel/src/java/org/apache/bcel/generic/CodeExceptionGen.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CodeExceptionGen.java 29 Oct 2001 20:00:08 -0000 1.1
+++ CodeExceptionGen.java 11 Jul 2002 19:39:04 -0000 1.2
@@ -72,7 +72,8 @@
* @see CodeException
* @see InstructionHandle
*/
-public final class CodeExceptionGen implements InstructionTargeter, Cloneable {
+public final class CodeExceptionGen
+ implements InstructionTargeter, Cloneable, java.io.Serializable {
private InstructionHandle start_pc;
private InstructionHandle end_pc;
private InstructionHandle handler_pc;
1.3 +3 -3 jakarta-bcel/src/java/org/apache/bcel/generic/ConstantPoolGen.java
Index: ConstantPoolGen.java
===================================================================
RCS file: /home/cvs/jakarta-bcel/src/java/org/apache/bcel/generic/ConstantPoolGen.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ConstantPoolGen.java 11 Feb 2002 10:45:36 -0000 1.2
+++ ConstantPoolGen.java 11 Jul 2002 19:39:04 -0000 1.3
@@ -72,7 +72,7 @@
* @author <A HREF="mailto:[email protected]">M. Dahm</A>
* @see Constant
*/
-public class ConstantPoolGen {
+public class ConstantPoolGen implements java.io.Serializable {
protected int size = 1024; // Inital size, sufficient in most cases
protected Constant[] constants = new Constant[size];
protected int index = 1; // First entry (0) used by JVM
@@ -82,7 +82,7 @@
private static final String FIELDREF_DELIM = "&";
private static final String NAT_DELIM = "%";
- private static class Index {
+ private static class Index implements java.io.Serializable {
int index;
Index(int i) { index = i; }
}
1.6 +4 -2 jakarta-bcel/src/java/org/apache/bcel/generic/InstructionFactory.java
Index: InstructionFactory.java
===================================================================
RCS file: /home/cvs/jakarta-bcel/src/java/org/apache/bcel/generic/InstructionFactory.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- InstructionFactory.java 29 Jun 2002 15:15:14 -0000 1.5
+++ InstructionFactory.java 11 Jul 2002 19:39:04 -0000 1.6
@@ -65,7 +65,9 @@
* @author <A HREF="mailto:[email protected]">M. Dahm</A>
* @see Constants
*/
-public class InstructionFactory implements InstructionConstants {
+public class InstructionFactory
+ implements InstructionConstants, java.io.Serializable
+{
protected ClassGen cg;
protected ConstantPoolGen cp;
1.3 +4 -2 jakarta-bcel/src/java/org/apache/bcel/generic/LineNumberGen.java
Index: LineNumberGen.java
===================================================================
RCS file: /home/cvs/jakarta-bcel/src/java/org/apache/bcel/generic/LineNumberGen.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- LineNumberGen.java 11 Mar 2002 16:16:38 -0000 1.2
+++ LineNumberGen.java 11 Jul 2002 19:39:04 -0000 1.3
@@ -66,7 +66,9 @@
* @see LineNumber
* @see MethodGen
*/
-public class LineNumberGen implements InstructionTargeter, Cloneable {
+public class LineNumberGen
+ implements InstructionTargeter, Cloneable, java.io.Serializable
+{
private InstructionHandle ih;
private int src_line;
1.3 +5 -2 jakarta-bcel/src/java/org/apache/bcel/generic/LocalVariableGen.java
Index: LocalVariableGen.java
===================================================================
RCS file: /home/cvs/jakarta-bcel/src/java/org/apache/bcel/generic/LocalVariableGen.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- LocalVariableGen.java 14 Dec 2001 18:32:54 -0000 1.2
+++ LocalVariableGen.java 11 Jul 2002 19:39:04 -0000 1.3
@@ -68,7 +68,10 @@
* @see LocalVariable
* @see MethodGen
*/
-public class LocalVariableGen implements InstructionTargeter, NamedAndTyped, Cloneable {
+public class LocalVariableGen
+ implements InstructionTargeter, NamedAndTyped, Cloneable,
+ java.io.Serializable
+{
private int index;
private String name;
private Type type;
1.6 +2 -2 jakarta-bcel/src/java/org/apache/bcel/generic/Type.java
Index: Type.java
===================================================================
RCS file: /home/cvs/jakarta-bcel/src/java/org/apache/bcel/generic/Type.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Type.java 13 Jun 2002 13:45:00 -0000 1.5
+++ Type.java 11 Jul 2002 19:39:04 -0000 1.6
@@ -66,7 +66,7 @@
* @version $Id$
* @author <A HREF="mailto:[email protected]">M. Dahm</A>
*/
-public abstract class Type {
+public abstract class Type implements java.io.Serializable {
protected byte type;
protected String signature; // signature for the type
1.5 +3 -3 jakarta-bcel/src/java/org/apache/bcel/util/ClassPath.java
Index: ClassPath.java
===================================================================
RCS file: /home/cvs/jakarta-bcel/src/java/org/apache/bcel/util/ClassPath.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ClassPath.java 6 Jun 2002 11:32:55 -0000 1.4
+++ ClassPath.java 11 Jul 2002 19:39:05 -0000 1.5
@@ -65,7 +65,7 @@
* @version $Id$
* @author <A HREF="mailto:[email protected]">M. Dahm</A>
*/
-public class ClassPath {
+public class ClassPath implements Serializable {
public static final ClassPath SYSTEM_CLASS_PATH = new ClassPath();
private PathEntry[] paths;
@@ -292,7 +292,7 @@
return getClassFile(name, suffix).getPath();
}
- private static abstract class PathEntry {
+ private static abstract class PathEntry implements Serializable {
abstract ClassFile getClassFile(String name, String suffix) throws IOException;
}
1.3 +2 -2 jakarta-bcel/src/java/org/apache/bcel/util/ClassQueue.java
Index: ClassQueue.java
===================================================================
RCS file: /home/cvs/jakarta-bcel/src/java/org/apache/bcel/util/ClassQueue.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ClassQueue.java 4 Feb 2002 08:43:22 -0000 1.2
+++ ClassQueue.java 11 Jul 2002 19:39:05 -0000 1.3
@@ -64,7 +64,7 @@
* @author <A HREF="mailto:[email protected]">M. Dahm</A>
* @see ClassVector
*/
-public class ClassQueue {
+public class ClassQueue implements java.io.Serializable {
protected ArrayList vec = new ArrayList();
public void enqueue(JavaClass clazz) { vec.add(clazz); }
1.2 +2 -2 jakarta-bcel/src/java/org/apache/bcel/util/ClassStack.java
Index: ClassStack.java
===================================================================
RCS file: /home/cvs/jakarta-bcel/src/java/org/apache/bcel/util/ClassStack.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ClassStack.java 29 Oct 2001 20:00:29 -0000 1.1
+++ ClassStack.java 11 Jul 2002 19:39:05 -0000 1.2
@@ -63,7 +63,7 @@
* @author <A HREF="mailto:[email protected]">M. Dahm</A>
* @see Stack
*/
-public class ClassStack {
+public class ClassStack implements java.io.Serializable {
private Stack stack = new Stack();
public void push(JavaClass clazz) { stack.push(clazz); }
1.2 +2 -2 jakarta-bcel/src/java/org/apache/bcel/util/ClassVector.java
Index: ClassVector.java
===================================================================
RCS file: /home/cvs/jakarta-bcel/src/java/org/apache/bcel/util/ClassVector.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ClassVector.java 29 Oct 2001 20:00:29 -0000 1.1
+++ ClassVector.java 11 Jul 2002 19:39:05 -0000 1.2
@@ -64,7 +64,7 @@
* @author <A HREF="mailto:[email protected]">M. Dahm</A>
* @see ClassQueue
*/
-public class ClassVector {
+public class ClassVector implements java.io.Serializable {
protected ArrayList vec = new ArrayList();
public void addElement(JavaClass clazz) { vec.add(clazz); }
1.3 +1 -2 jakarta-bcel/src/java/org/apache/bcel/util/Repository.java
Index: Repository.java
===================================================================
RCS file: /home/cvs/jakarta-bcel/src/java/org/apache/bcel/util/Repository.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Repository.java 6 Jun 2002 11:33:20 -0000 1.2
+++ Repository.java 11 Jul 2002 19:39:05 -0000 1.3
@@ -56,8 +56,7 @@
import org.apache.bcel.classfile.JavaClass;
-public interface Repository
-{
+public interface Repository extends java.io.Serializable {
/**
* Store the provided class under "clazz.getClassName()"
*/
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.