You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by se...@apache.org on 2015/08/19 23:46:35 UTC
svn commit: r1696673 - in
/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6:
classfile/ generic/ util/
Author: sebb
Date: Wed Aug 19 21:46:34 2015
New Revision: 1696673
URL: http://svn.apache.org/r1696673
Log:
BCEL-242 Remove Seializable
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/AccessFlags.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/AnnotationEntry.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Attribute.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/BootstrapMethod.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/CodeException.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Constant.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ConstantPool.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/InnerClass.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/LineNumber.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/LocalVariable.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/MethodParameter.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/StackMapEntry.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/StackMapTableEntry.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/StackMapType.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/CodeExceptionGen.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ConstantPoolGen.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/Instruction.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/InstructionFactory.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/InstructionHandle.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/InstructionList.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LineNumberGen.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LocalVariableGen.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/Type.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/ClassPath.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/ClassQueue.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/ClassSet.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/ClassStack.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/Repository.java
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/AccessFlags.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/AccessFlags.java?rev=1696673&r1=1696672&r2=1696673&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/AccessFlags.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/AccessFlags.java Wed Aug 19 21:46:34 2015
@@ -25,9 +25,8 @@ import org.apache.commons.bcel6.Constant
*
* @version $Id$
*/
-public abstract class AccessFlags implements java.io.Serializable {
+public abstract class AccessFlags {
- private static final long serialVersionUID = 2845404654039163061L;
protected int access_flags;
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/AnnotationEntry.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/AnnotationEntry.java?rev=1696673&r1=1696672&r2=1696673&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/AnnotationEntry.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/AnnotationEntry.java Wed Aug 19 21:46:34 2015
@@ -20,7 +20,6 @@ package org.apache.commons.bcel6.classfi
import java.io.DataInput;
import java.io.DataOutputStream;
import java.io.IOException;
-import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@@ -33,9 +32,7 @@ import org.apache.commons.bcel6.Constant
* @version $Id: AnnotationEntry
* @since 6.0
*/
-public class AnnotationEntry implements Node, Serializable {
-
- private static final long serialVersionUID = 1L;
+public class AnnotationEntry implements Node {
private final int type_index;
private final ConstantPool constant_pool;
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Attribute.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Attribute.java?rev=1696673&r1=1696672&r2=1696673&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Attribute.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Attribute.java Wed Aug 19 21:46:34 2015
@@ -21,7 +21,6 @@ import java.io.DataInput;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import java.io.Serializable;
import java.util.HashMap;
import java.util.Map;
@@ -48,9 +47,7 @@ import org.apache.commons.bcel6.Constant
* @see Deprecated
* @see Signature
*/
-public abstract class Attribute implements Cloneable, Node, Serializable
-{
- private static final long serialVersionUID = -1707826820310002955L;
+public abstract class Attribute implements Cloneable, Node {
protected int name_index; // Points to attribute name in constant pool TODO make private (has getter & setter)
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/BootstrapMethod.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/BootstrapMethod.java?rev=1696673&r1=1696672&r2=1696673&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/BootstrapMethod.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/BootstrapMethod.java Wed Aug 19 21:46:34 2015
@@ -20,7 +20,6 @@ package org.apache.commons.bcel6.classfi
import java.io.DataInput;
import java.io.DataOutputStream;
import java.io.IOException;
-import java.io.Serializable;
import org.apache.commons.bcel6.Constants;
@@ -32,9 +31,7 @@ import org.apache.commons.bcel6.Constant
* @see <a href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.7.23">The class File Format : The BootstrapMethods Attribute</a>
* @since 6.0
*/
-public class BootstrapMethod implements Serializable, Cloneable {
-
- private static final long serialVersionUID = -4517534834047695344L;
+public class BootstrapMethod implements Cloneable {
/** Index of the CONSTANT_MethodHandle_info structure in the constant_pool table */
private int bootstrap_method_ref;
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/CodeException.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/CodeException.java?rev=1696673&r1=1696672&r2=1696673&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/CodeException.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/CodeException.java Wed Aug 19 21:46:34 2015
@@ -20,7 +20,6 @@ package org.apache.commons.bcel6.classfi
import java.io.DataInput;
import java.io.DataOutputStream;
import java.io.IOException;
-import java.io.Serializable;
import org.apache.commons.bcel6.Constants;
@@ -32,9 +31,8 @@ import org.apache.commons.bcel6.Constant
* @version $Id$
* @see Code
*/
-public final class CodeException implements Cloneable, Node, Serializable {
+public final class CodeException implements Cloneable, Node {
- private static final long serialVersionUID = 2972500041254967221L;
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.,
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Constant.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Constant.java?rev=1696673&r1=1696672&r2=1696673&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Constant.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Constant.java Wed Aug 19 21:46:34 2015
@@ -20,7 +20,6 @@ package org.apache.commons.bcel6.classfi
import java.io.DataInput;
import java.io.DataOutputStream;
import java.io.IOException;
-import java.io.Serializable;
import org.apache.commons.bcel6.Constants;
import org.apache.commons.bcel6.util.BCELComparator;
@@ -32,9 +31,8 @@ import org.apache.commons.bcel6.util.BCE
*
* @version $Id$
*/
-public abstract class Constant implements Cloneable, Node, Serializable {
+public abstract class Constant implements Cloneable, Node {
- private static final long serialVersionUID = 5739037344085356353L;
private static BCELComparator _cmp = new BCELComparator() {
@Override
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ConstantPool.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ConstantPool.java?rev=1696673&r1=1696672&r2=1696673&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ConstantPool.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ConstantPool.java Wed Aug 19 21:46:34 2015
@@ -20,7 +20,6 @@ package org.apache.commons.bcel6.classfi
import java.io.DataInput;
import java.io.DataOutputStream;
import java.io.IOException;
-import java.io.Serializable;
import org.apache.commons.bcel6.Constants;
@@ -36,9 +35,8 @@ import org.apache.commons.bcel6.Constant
* @see Constant
* @see org.apache.commons.bcel6.generic.ConstantPoolGen
*/
-public class ConstantPool implements Cloneable, Node, Serializable {
+public class ConstantPool implements Cloneable, Node {
- private static final long serialVersionUID = -9093478476423540196L;
private Constant[] constant_pool;
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/InnerClass.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/InnerClass.java?rev=1696673&r1=1696672&r2=1696673&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/InnerClass.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/InnerClass.java Wed Aug 19 21:46:34 2015
@@ -20,7 +20,6 @@ package org.apache.commons.bcel6.classfi
import java.io.DataInput;
import java.io.DataOutputStream;
import java.io.IOException;
-import java.io.Serializable;
import org.apache.commons.bcel6.Constants;
@@ -32,9 +31,8 @@ import org.apache.commons.bcel6.Constant
* @version $Id$
* @see InnerClasses
*/
-public final class InnerClass implements Cloneable, Node, Serializable {
+public final class InnerClass implements Cloneable, Node {
- private static final long serialVersionUID = -7200195918166127614L;
private int inner_class_index;
private int outer_class_index;
private int inner_name_index;
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/LineNumber.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/LineNumber.java?rev=1696673&r1=1696672&r2=1696673&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/LineNumber.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/LineNumber.java Wed Aug 19 21:46:34 2015
@@ -20,7 +20,6 @@ package org.apache.commons.bcel6.classfi
import java.io.DataInput;
import java.io.DataOutputStream;
import java.io.IOException;
-import java.io.Serializable;
/**
* This class represents a (PC offset, line number) pair, i.e., a line number in
@@ -30,10 +29,8 @@ import java.io.Serializable;
* @version $Id$
* @see LineNumberTable
*/
-public final class LineNumber implements Cloneable, Node, Serializable {
+public final class LineNumber implements Cloneable, Node {
- private static final long serialVersionUID = 169537400672820016L;
-
/** Program Counter (PC) corresponds to line */
private short start_pc;
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/LocalVariable.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/LocalVariable.java?rev=1696673&r1=1696672&r2=1696673&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/LocalVariable.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/LocalVariable.java Wed Aug 19 21:46:34 2015
@@ -20,7 +20,6 @@ package org.apache.commons.bcel6.classfi
import java.io.DataInput;
import java.io.DataOutputStream;
import java.io.IOException;
-import java.io.Serializable;
import org.apache.commons.bcel6.Constants;
@@ -31,9 +30,8 @@ import org.apache.commons.bcel6.Constant
* @version $Id$
* @see LocalVariableTable
*/
-public final class LocalVariable implements Cloneable, Node, Serializable {
+public final class LocalVariable implements Cloneable, Node {
- private static final long serialVersionUID = -51081099265972179L;
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
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/MethodParameter.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/MethodParameter.java?rev=1696673&r1=1696672&r2=1696673&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/MethodParameter.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/MethodParameter.java Wed Aug 19 21:46:34 2015
@@ -20,7 +20,6 @@ package org.apache.commons.bcel6.classfi
import java.io.DataInput;
import java.io.DataOutputStream;
import java.io.IOException;
-import java.io.Serializable;
import org.apache.commons.bcel6.Constants;
@@ -30,9 +29,7 @@ import org.apache.commons.bcel6.Constant
* @see <a href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.7.24">The class File Format : The MethodParameters Attribute</a>
* @since 6.0
*/
-public class MethodParameter implements Serializable, Cloneable {
-
- private static final long serialVersionUID = 6014494029439440326L;
+public class MethodParameter implements Cloneable {
/** Index of the CONSTANT_Utf8_info structure in the constant_pool table representing the name of the parameter */
private int name_index;
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/StackMapEntry.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/StackMapEntry.java?rev=1696673&r1=1696672&r2=1696673&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/StackMapEntry.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/StackMapEntry.java Wed Aug 19 21:46:34 2015
@@ -20,7 +20,6 @@ package org.apache.commons.bcel6.classfi
import java.io.DataInput;
import java.io.DataOutputStream;
import java.io.IOException;
-import java.io.Serializable;
/**
* This class represents a stack map entry recording the types of
@@ -32,11 +31,8 @@ import java.io.Serializable;
* @see StackMapType
*/
public final class StackMapEntry implements Cloneable
- ,Serializable /* since 6.0 */
{
- private static final long serialVersionUID = 1L;
-
private int byte_code_offset;
private StackMapType[] types_of_locals;
private StackMapType[] types_of_stack_items;
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/StackMapTableEntry.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/StackMapTableEntry.java?rev=1696673&r1=1696672&r2=1696673&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/StackMapTableEntry.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/StackMapTableEntry.java Wed Aug 19 21:46:34 2015
@@ -20,7 +20,6 @@ package org.apache.commons.bcel6.classfi
import java.io.DataInput;
import java.io.DataOutputStream;
import java.io.IOException;
-import java.io.Serializable;
import org.apache.commons.bcel6.Constants;
@@ -34,9 +33,7 @@ import org.apache.commons.bcel6.Constant
* @see StackMapType
* @since 6.0
*/
-public final class StackMapTableEntry implements Cloneable, Serializable {
-
- private static final long serialVersionUID = 1L;
+public final class StackMapTableEntry implements Cloneable {
private final int frame_type;
private int byte_code_offset;
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/StackMapType.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/StackMapType.java?rev=1696673&r1=1696672&r2=1696673&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/StackMapType.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/StackMapType.java Wed Aug 19 21:46:34 2015
@@ -20,7 +20,6 @@ package org.apache.commons.bcel6.classfi
import java.io.DataInput;
import java.io.DataOutputStream;
import java.io.IOException;
-import java.io.Serializable;
import org.apache.commons.bcel6.Constants;
@@ -33,10 +32,7 @@ import org.apache.commons.bcel6.Constant
* @see StackMap
* @see Constants
*/
-public final class StackMapType implements Cloneable
- ,Serializable /* since 6.0 */ {
-
- private static final long serialVersionUID = 1L;
+public final class StackMapType implements Cloneable {
private byte type;
private int index = -1; // Index to CONSTANT_Class or offset
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/CodeExceptionGen.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/CodeExceptionGen.java?rev=1696673&r1=1696672&r2=1696673&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/CodeExceptionGen.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/CodeExceptionGen.java Wed Aug 19 21:46:34 2015
@@ -33,9 +33,8 @@ import org.apache.commons.bcel6.classfil
* @see CodeException
* @see InstructionHandle
*/
-public final class CodeExceptionGen implements InstructionTargeter, Cloneable, java.io.Serializable {
+public final class CodeExceptionGen implements InstructionTargeter, Cloneable {
- private static final long serialVersionUID = 6548901422158960190L;
private InstructionHandle start_pc;
private InstructionHandle end_pc;
private InstructionHandle handler_pc;
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ConstantPoolGen.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ConstantPoolGen.java?rev=1696673&r1=1696672&r2=1696673&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ConstantPoolGen.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ConstantPoolGen.java Wed Aug 19 21:46:34 2015
@@ -50,9 +50,8 @@ import org.apache.commons.bcel6.classfil
* @version $Id$
* @see Constant
*/
-public class ConstantPoolGen implements java.io.Serializable {
+public class ConstantPoolGen {
- private static final long serialVersionUID = 6664071417323174824L;
protected int size;
protected Constant[] constants;
protected int index = 1; // First entry (0) used by JVM
@@ -61,10 +60,9 @@ public class ConstantPoolGen implements
private static final String FIELDREF_DELIM = "&";
private static final String NAT_DELIM = "%";
- private static class Index implements java.io.Serializable {
+ private static class Index {
- private static final long serialVersionUID = -9187078620578535161L;
- int index;
+ int index; // TODO this could be final
Index(int i) {
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/Instruction.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/Instruction.java?rev=1696673&r1=1696672&r2=1696673&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/Instruction.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/Instruction.java Wed Aug 19 21:46:34 2015
@@ -19,7 +19,6 @@ package org.apache.commons.bcel6.generic
import java.io.DataOutputStream;
import java.io.IOException;
-import java.io.Serializable;
import org.apache.commons.bcel6.Constants;
import org.apache.commons.bcel6.classfile.ConstantPool;
@@ -30,9 +29,8 @@ import org.apache.commons.bcel6.util.Byt
*
* @version $Id$
*/
-public abstract class Instruction implements Cloneable, Serializable {
+public abstract class Instruction implements Cloneable {
- private static final long serialVersionUID = -2518741982574515847L;
protected short length = 1; // Length of instruction in bytes
protected short opcode = -1; // Opcode number
private static InstructionComparator cmp = InstructionComparator.DEFAULT;
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/InstructionFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/InstructionFactory.java?rev=1696673&r1=1696672&r2=1696673&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/InstructionFactory.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/InstructionFactory.java Wed Aug 19 21:46:34 2015
@@ -28,10 +28,9 @@ import org.apache.commons.bcel6.Constant
* @version $Id$
* @see Constants
*/
-public class InstructionFactory implements java.io.Serializable {
-
- private static final long serialVersionUID = -1210011499635580258L;
+public class InstructionFactory {
+ // N.N. These must agree with the order of Constants.T_CHAR through T_LONG
private static final String[] short_names = {
"C", "F", "D", "B", "S", "I", "L"
};
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/InstructionHandle.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/InstructionHandle.java?rev=1696673&r1=1696672&r2=1696673&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/InstructionHandle.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/InstructionHandle.java Wed Aug 19 21:46:34 2015
@@ -42,9 +42,8 @@ import org.apache.commons.bcel6.classfil
* @see BranchHandle
* @see InstructionList
*/
-public class InstructionHandle implements java.io.Serializable {
+public class InstructionHandle {
- private static final long serialVersionUID = -3585254135692924106L;
InstructionHandle next, prev; // Will be set from the outside
Instruction instruction;
protected int i_position = -1; // byte code offset of instruction
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/InstructionList.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/InstructionList.java?rev=1696673&r1=1696672&r2=1696673&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/InstructionList.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/InstructionList.java Wed Aug 19 21:46:34 2015
@@ -20,7 +20,6 @@ package org.apache.commons.bcel6.generic
import java.io.ByteArrayOutputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import java.io.Serializable;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
@@ -50,9 +49,8 @@ import org.apache.commons.bcel6.util.Byt
* @see InstructionHandle
* @see BranchHandle
*/
-public class InstructionList implements Serializable {
+public class InstructionList {
- private static final long serialVersionUID = 2651389055345707857L;
private InstructionHandle start = null, end = null;
private int length = 0; // number of elements in list
private int[] byte_positions; // byte code offsets corresponding to instructions
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LineNumberGen.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LineNumberGen.java?rev=1696673&r1=1696672&r2=1696673&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LineNumberGen.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LineNumberGen.java Wed Aug 19 21:46:34 2015
@@ -27,9 +27,8 @@ import org.apache.commons.bcel6.classfil
* @see LineNumber
* @see MethodGen
*/
-public class LineNumberGen implements InstructionTargeter, Cloneable, java.io.Serializable {
+public class LineNumberGen implements InstructionTargeter, Cloneable {
- private static final long serialVersionUID = 4939965573936108738L;
private InstructionHandle ih;
private int src_line;
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LocalVariableGen.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LocalVariableGen.java?rev=1696673&r1=1696672&r2=1696673&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LocalVariableGen.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LocalVariableGen.java Wed Aug 19 21:46:34 2015
@@ -30,10 +30,8 @@ import org.apache.commons.bcel6.classfil
* @see LocalVariable
* @see MethodGen
*/
-public class LocalVariableGen implements InstructionTargeter, NamedAndTyped, Cloneable,
- java.io.Serializable {
+public class LocalVariableGen implements InstructionTargeter, NamedAndTyped, Cloneable {
- private static final long serialVersionUID = -3810966319065955534L;
private int index;
private String name;
private Type type;
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/Type.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/Type.java?rev=1696673&r1=1696672&r2=1696673&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/Type.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/Type.java Wed Aug 19 21:46:34 2015
@@ -32,9 +32,8 @@ import org.apache.commons.bcel6.verifier
*
* @version $Id$
*/
-public abstract class Type implements java.io.Serializable {
+public abstract class Type {
- private static final long serialVersionUID = -1985077286871826895L;
protected byte type; // TODO should be final (and private)
protected String signature; // signature for the type TODO should be private
/** Predefined constants
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/ClassPath.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/ClassPath.java?rev=1696673&r1=1696672&r2=1696673&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/ClassPath.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/ClassPath.java Wed Aug 19 21:46:34 2015
@@ -23,7 +23,6 @@ import java.io.FileInputStream;
import java.io.FilenameFilter;
import java.io.IOException;
import java.io.InputStream;
-import java.io.Serializable;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.ArrayList;
@@ -41,9 +40,8 @@ import java.util.zip.ZipFile;
*
* @version $Id$
*/
-public class ClassPath implements Serializable {
+public class ClassPath {
- private static final long serialVersionUID = 2099441438483340671L;
public static final ClassPath SYSTEM_CLASS_PATH = new ClassPath(getClassPath());
private static final FilenameFilter ARCHIVE_FILTER = new FilenameFilter() {
@@ -350,9 +348,8 @@ public class ClassPath implements Serial
return getClassFile(name, suffix).getPath();
}
- private static abstract class PathEntry implements Serializable {
+ private static abstract class PathEntry {
- private static final long serialVersionUID = 6828494485207666122L;
abstract ClassFile getClassFile( String name, String suffix ) throws IOException;
abstract URL getResource(String name);
abstract InputStream getResourceAsStream(String name);
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/ClassQueue.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/ClassQueue.java?rev=1696673&r1=1696672&r2=1696673&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/ClassQueue.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/ClassQueue.java Wed Aug 19 21:46:34 2015
@@ -27,9 +27,8 @@ import org.apache.commons.bcel6.classfil
*
* @version $Id$
*/
-public class ClassQueue implements java.io.Serializable {
+public class ClassQueue {
- private static final long serialVersionUID = 685144104322420292L;
protected LinkedList<JavaClass> vec = new LinkedList<>();
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/ClassSet.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/ClassSet.java?rev=1696673&r1=1696672&r2=1696673&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/ClassSet.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/ClassSet.java Wed Aug 19 21:46:34 2015
@@ -31,9 +31,8 @@ import org.apache.commons.bcel6.classfil
* @version $Id$
* @see ClassStack
*/
-public class ClassSet implements java.io.Serializable {
+public class ClassSet {
- private static final long serialVersionUID = -7476907380350035254L;
private final Map<String, JavaClass> _map = new HashMap<>();
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/ClassStack.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/ClassStack.java?rev=1696673&r1=1696672&r2=1696673&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/ClassStack.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/ClassStack.java Wed Aug 19 21:46:34 2015
@@ -27,9 +27,8 @@ import org.apache.commons.bcel6.classfil
* @version $Id$
* @see Stack
*/
-public class ClassStack implements java.io.Serializable {
+public class ClassStack {
- private static final long serialVersionUID = 6126079269396985982L;
private final Stack<JavaClass> stack = new Stack<>();
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/Repository.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/Repository.java?rev=1696673&r1=1696672&r2=1696673&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/Repository.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/Repository.java Wed Aug 19 21:46:34 2015
@@ -27,7 +27,7 @@ import org.apache.commons.bcel6.classfil
* @see org.apache.commons.bcel6.Repository
* @version $Id$
*/
-public interface Repository extends java.io.Serializable {
+public interface Repository {
/**
* Store the provided class under "clazz.getClassName()"