From 3f92a9bd2686114eac1a99ef038ef2e2e7128b47 Mon Sep 17 00:00:00 2001 From: markt Date: Fri, 3 Sep 2010 17:40:12 +0000 Subject: [PATCH] Sync with Jakarta. Add generated serialVersionUID's. Don't use the same values as Jakarta since the code has been structurally modified (to removed unused elements) git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@992392 13f79535-47bb-0310-9956-ffa450edef68 --- java/org/apache/tomcat/util/bcel/classfile/AccessFlags.java | 1 + java/org/apache/tomcat/util/bcel/classfile/AnnotationDefault.java | 1 + java/org/apache/tomcat/util/bcel/classfile/Attribute.java | 2 ++ java/org/apache/tomcat/util/bcel/classfile/ClassFormatException.java | 2 ++ java/org/apache/tomcat/util/bcel/classfile/Code.java | 1 + java/org/apache/tomcat/util/bcel/classfile/CodeException.java | 1 + java/org/apache/tomcat/util/bcel/classfile/Constant.java | 1 + java/org/apache/tomcat/util/bcel/classfile/ConstantCP.java | 1 + java/org/apache/tomcat/util/bcel/classfile/ConstantClass.java | 1 + java/org/apache/tomcat/util/bcel/classfile/ConstantDouble.java | 1 + java/org/apache/tomcat/util/bcel/classfile/ConstantFieldref.java | 2 ++ java/org/apache/tomcat/util/bcel/classfile/ConstantFloat.java | 1 + java/org/apache/tomcat/util/bcel/classfile/ConstantInteger.java | 1 + .../apache/tomcat/util/bcel/classfile/ConstantInterfaceMethodref.java | 2 ++ java/org/apache/tomcat/util/bcel/classfile/ConstantLong.java | 1 + java/org/apache/tomcat/util/bcel/classfile/ConstantMethodref.java | 2 ++ java/org/apache/tomcat/util/bcel/classfile/ConstantNameAndType.java | 1 + java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java | 1 + java/org/apache/tomcat/util/bcel/classfile/ConstantString.java | 1 + java/org/apache/tomcat/util/bcel/classfile/ConstantUtf8.java | 1 + java/org/apache/tomcat/util/bcel/classfile/ConstantValue.java | 1 + java/org/apache/tomcat/util/bcel/classfile/Deprecated.java | 1 + java/org/apache/tomcat/util/bcel/classfile/EnclosingMethod.java | 2 ++ java/org/apache/tomcat/util/bcel/classfile/ExceptionTable.java | 1 + java/org/apache/tomcat/util/bcel/classfile/Field.java | 1 + java/org/apache/tomcat/util/bcel/classfile/FieldOrMethod.java | 1 + java/org/apache/tomcat/util/bcel/classfile/InnerClass.java | 1 + java/org/apache/tomcat/util/bcel/classfile/InnerClasses.java | 1 + java/org/apache/tomcat/util/bcel/classfile/JavaClass.java | 1 + java/org/apache/tomcat/util/bcel/classfile/LineNumber.java | 1 + java/org/apache/tomcat/util/bcel/classfile/LineNumberTable.java | 1 + java/org/apache/tomcat/util/bcel/classfile/LocalVariable.java | 1 + java/org/apache/tomcat/util/bcel/classfile/LocalVariableTable.java | 1 + java/org/apache/tomcat/util/bcel/classfile/LocalVariableTypeTable.java | 3 ++- java/org/apache/tomcat/util/bcel/classfile/Method.java | 1 + java/org/apache/tomcat/util/bcel/classfile/PMGClass.java | 1 + java/org/apache/tomcat/util/bcel/classfile/ParameterAnnotations.java | 1 + .../apache/tomcat/util/bcel/classfile/RuntimeInvisibleAnnotations.java | 2 ++ .../util/bcel/classfile/RuntimeInvisibleParameterAnnotations.java | 3 +++ .../apache/tomcat/util/bcel/classfile/RuntimeVisibleAnnotations.java | 2 ++ .../tomcat/util/bcel/classfile/RuntimeVisibleParameterAnnotations.java | 3 +++ java/org/apache/tomcat/util/bcel/classfile/Signature.java | 1 + java/org/apache/tomcat/util/bcel/classfile/SourceFile.java | 1 + java/org/apache/tomcat/util/bcel/classfile/StackMap.java | 1 + java/org/apache/tomcat/util/bcel/classfile/StackMapTable.java | 1 + java/org/apache/tomcat/util/bcel/classfile/Synthetic.java | 1 + java/org/apache/tomcat/util/bcel/classfile/Unknown.java | 1 + 47 files changed, 60 insertions(+), 1 deletion(-) diff --git a/java/org/apache/tomcat/util/bcel/classfile/AccessFlags.java b/java/org/apache/tomcat/util/bcel/classfile/AccessFlags.java index bc6dc68aa..b32857d0d 100644 --- a/java/org/apache/tomcat/util/bcel/classfile/AccessFlags.java +++ b/java/org/apache/tomcat/util/bcel/classfile/AccessFlags.java @@ -26,6 +26,7 @@ package org.apache.tomcat.util.bcel.classfile; */ public abstract class AccessFlags implements java.io.Serializable { + private static final long serialVersionUID = 2548932939969293935L; protected int access_flags; diff --git a/java/org/apache/tomcat/util/bcel/classfile/AnnotationDefault.java b/java/org/apache/tomcat/util/bcel/classfile/AnnotationDefault.java index b752ad024..b35952141 100644 --- a/java/org/apache/tomcat/util/bcel/classfile/AnnotationDefault.java +++ b/java/org/apache/tomcat/util/bcel/classfile/AnnotationDefault.java @@ -32,6 +32,7 @@ import org.apache.tomcat.util.bcel.Constants; */ public class AnnotationDefault extends Attribute { + private static final long serialVersionUID = 6715933396664171543L; ElementValue default_value; /** diff --git a/java/org/apache/tomcat/util/bcel/classfile/Attribute.java b/java/org/apache/tomcat/util/bcel/classfile/Attribute.java index e5d943c20..e38610a98 100644 --- a/java/org/apache/tomcat/util/bcel/classfile/Attribute.java +++ b/java/org/apache/tomcat/util/bcel/classfile/Attribute.java @@ -50,6 +50,8 @@ import org.apache.tomcat.util.bcel.Constants; */ public abstract class Attribute implements Cloneable, Serializable { + private static final long serialVersionUID = 1514136303496688899L; + protected int name_index; // Points to attribute name in constant pool protected int length; // Content length of attribute field diff --git a/java/org/apache/tomcat/util/bcel/classfile/ClassFormatException.java b/java/org/apache/tomcat/util/bcel/classfile/ClassFormatException.java index 6b4aea7a4..527c555b1 100644 --- a/java/org/apache/tomcat/util/bcel/classfile/ClassFormatException.java +++ b/java/org/apache/tomcat/util/bcel/classfile/ClassFormatException.java @@ -27,6 +27,8 @@ package org.apache.tomcat.util.bcel.classfile; */ public class ClassFormatException extends RuntimeException { + private static final long serialVersionUID = 3243149520175287759L; + public ClassFormatException() { super(); } diff --git a/java/org/apache/tomcat/util/bcel/classfile/Code.java b/java/org/apache/tomcat/util/bcel/classfile/Code.java index ed3a43bb3..a9fe8a074 100644 --- a/java/org/apache/tomcat/util/bcel/classfile/Code.java +++ b/java/org/apache/tomcat/util/bcel/classfile/Code.java @@ -44,6 +44,7 @@ import org.apache.tomcat.util.bcel.Constants; */ public final class Code extends Attribute { + private static final long serialVersionUID = 8936843273318969602L; private int max_stack; // Maximum size of stack used by this method private int max_locals; // Number of local variables private int code_length; // Length of code in bytes diff --git a/java/org/apache/tomcat/util/bcel/classfile/CodeException.java b/java/org/apache/tomcat/util/bcel/classfile/CodeException.java index 73d04e2d9..0c0e83348 100644 --- a/java/org/apache/tomcat/util/bcel/classfile/CodeException.java +++ b/java/org/apache/tomcat/util/bcel/classfile/CodeException.java @@ -35,6 +35,7 @@ import org.apache.tomcat.util.bcel.Constants; */ public final class CodeException implements Cloneable, Constants, Serializable { + private static final long serialVersionUID = -6351674720658890686L; 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., diff --git a/java/org/apache/tomcat/util/bcel/classfile/Constant.java b/java/org/apache/tomcat/util/bcel/classfile/Constant.java index dd9282ce7..833ae206c 100644 --- a/java/org/apache/tomcat/util/bcel/classfile/Constant.java +++ b/java/org/apache/tomcat/util/bcel/classfile/Constant.java @@ -35,6 +35,7 @@ import org.apache.tomcat.util.bcel.util.BCELComparator; */ public abstract class Constant implements Cloneable, Serializable { + private static final long serialVersionUID = 2827409182154809454L; private static BCELComparator _cmp = new BCELComparator() { public boolean equals( Object o1, Object o2 ) { diff --git a/java/org/apache/tomcat/util/bcel/classfile/ConstantCP.java b/java/org/apache/tomcat/util/bcel/classfile/ConstantCP.java index 926ae65b2..cf4ae71c4 100644 --- a/java/org/apache/tomcat/util/bcel/classfile/ConstantCP.java +++ b/java/org/apache/tomcat/util/bcel/classfile/ConstantCP.java @@ -32,6 +32,7 @@ import java.io.IOException; */ public abstract class ConstantCP extends Constant { + private static final long serialVersionUID = 7282382456501145526L; /** References to the constants containing the class and the field signature */ protected int class_index, name_and_type_index; diff --git a/java/org/apache/tomcat/util/bcel/classfile/ConstantClass.java b/java/org/apache/tomcat/util/bcel/classfile/ConstantClass.java index e0af229b6..b71853fa1 100644 --- a/java/org/apache/tomcat/util/bcel/classfile/ConstantClass.java +++ b/java/org/apache/tomcat/util/bcel/classfile/ConstantClass.java @@ -34,6 +34,7 @@ import org.apache.tomcat.util.bcel.Constants; */ public final class ConstantClass extends Constant implements ConstantObject { + private static final long serialVersionUID = -6603658849582876642L; private int name_index; // Identical to ConstantString except for the name diff --git a/java/org/apache/tomcat/util/bcel/classfile/ConstantDouble.java b/java/org/apache/tomcat/util/bcel/classfile/ConstantDouble.java index 3967005e2..a0801a555 100644 --- a/java/org/apache/tomcat/util/bcel/classfile/ConstantDouble.java +++ b/java/org/apache/tomcat/util/bcel/classfile/ConstantDouble.java @@ -34,6 +34,7 @@ import org.apache.tomcat.util.bcel.Constants; */ public final class ConstantDouble extends Constant implements ConstantObject { + private static final long serialVersionUID = 3450743772468544760L; private double bytes; diff --git a/java/org/apache/tomcat/util/bcel/classfile/ConstantFieldref.java b/java/org/apache/tomcat/util/bcel/classfile/ConstantFieldref.java index 76b918cd3..3b2ff84a6 100644 --- a/java/org/apache/tomcat/util/bcel/classfile/ConstantFieldref.java +++ b/java/org/apache/tomcat/util/bcel/classfile/ConstantFieldref.java @@ -33,6 +33,8 @@ public final class ConstantFieldref extends ConstantCP { + private static final long serialVersionUID = -8062332095934294437L; + /** * Initialize instance from file data. * diff --git a/java/org/apache/tomcat/util/bcel/classfile/ConstantFloat.java b/java/org/apache/tomcat/util/bcel/classfile/ConstantFloat.java index 2522b5a82..ea2f20cd7 100644 --- a/java/org/apache/tomcat/util/bcel/classfile/ConstantFloat.java +++ b/java/org/apache/tomcat/util/bcel/classfile/ConstantFloat.java @@ -34,6 +34,7 @@ import org.apache.tomcat.util.bcel.Constants; */ public final class ConstantFloat extends Constant implements ConstantObject { + private static final long serialVersionUID = 8301269629885378651L; private float bytes; diff --git a/java/org/apache/tomcat/util/bcel/classfile/ConstantInteger.java b/java/org/apache/tomcat/util/bcel/classfile/ConstantInteger.java index e9069d49b..13554ba0c 100644 --- a/java/org/apache/tomcat/util/bcel/classfile/ConstantInteger.java +++ b/java/org/apache/tomcat/util/bcel/classfile/ConstantInteger.java @@ -34,6 +34,7 @@ import org.apache.tomcat.util.bcel.Constants; */ public final class ConstantInteger extends Constant implements ConstantObject { + private static final long serialVersionUID = -6415476571232528966L; private int bytes; diff --git a/java/org/apache/tomcat/util/bcel/classfile/ConstantInterfaceMethodref.java b/java/org/apache/tomcat/util/bcel/classfile/ConstantInterfaceMethodref.java index 75d1b6c45..b4f3502c6 100644 --- a/java/org/apache/tomcat/util/bcel/classfile/ConstantInterfaceMethodref.java +++ b/java/org/apache/tomcat/util/bcel/classfile/ConstantInterfaceMethodref.java @@ -33,6 +33,8 @@ public final class ConstantInterfaceMethodref extends ConstantCP { + private static final long serialVersionUID = -8587605570227841891L; + /** * Initialize instance from file data. * diff --git a/java/org/apache/tomcat/util/bcel/classfile/ConstantLong.java b/java/org/apache/tomcat/util/bcel/classfile/ConstantLong.java index 786b9294b..6a3c1a89a 100644 --- a/java/org/apache/tomcat/util/bcel/classfile/ConstantLong.java +++ b/java/org/apache/tomcat/util/bcel/classfile/ConstantLong.java @@ -34,6 +34,7 @@ import org.apache.tomcat.util.bcel.Constants; */ public final class ConstantLong extends Constant implements ConstantObject { + private static final long serialVersionUID = -1893131676489003562L; private long bytes; diff --git a/java/org/apache/tomcat/util/bcel/classfile/ConstantMethodref.java b/java/org/apache/tomcat/util/bcel/classfile/ConstantMethodref.java index 6b16d7346..b99139e3c 100644 --- a/java/org/apache/tomcat/util/bcel/classfile/ConstantMethodref.java +++ b/java/org/apache/tomcat/util/bcel/classfile/ConstantMethodref.java @@ -33,6 +33,8 @@ public final class ConstantMethodref extends ConstantCP { + private static final long serialVersionUID = -7857009620954576086L; + /** * Initialize instance from file data. * diff --git a/java/org/apache/tomcat/util/bcel/classfile/ConstantNameAndType.java b/java/org/apache/tomcat/util/bcel/classfile/ConstantNameAndType.java index 3397f208d..ededee597 100644 --- a/java/org/apache/tomcat/util/bcel/classfile/ConstantNameAndType.java +++ b/java/org/apache/tomcat/util/bcel/classfile/ConstantNameAndType.java @@ -35,6 +35,7 @@ import org.apache.tomcat.util.bcel.Constants; */ public final class ConstantNameAndType extends Constant { + private static final long serialVersionUID = 1010506730811368756L; private int name_index; // Name of field/method private int signature_index; // and its signature. diff --git a/java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java b/java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java index 774a86816..13b978705 100644 --- a/java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java +++ b/java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java @@ -37,6 +37,7 @@ import org.apache.tomcat.util.bcel.Constants; */ public class ConstantPool implements Cloneable, Serializable { + private static final long serialVersionUID = -6765503791185687014L; private int constant_pool_count; private Constant[] constant_pool; diff --git a/java/org/apache/tomcat/util/bcel/classfile/ConstantString.java b/java/org/apache/tomcat/util/bcel/classfile/ConstantString.java index d378cf1c3..8a79e0dbd 100644 --- a/java/org/apache/tomcat/util/bcel/classfile/ConstantString.java +++ b/java/org/apache/tomcat/util/bcel/classfile/ConstantString.java @@ -34,6 +34,7 @@ import org.apache.tomcat.util.bcel.Constants; */ public final class ConstantString extends Constant implements ConstantObject { + private static final long serialVersionUID = 2809338612858801341L; private int string_index; // Identical to ConstantClass except for this name diff --git a/java/org/apache/tomcat/util/bcel/classfile/ConstantUtf8.java b/java/org/apache/tomcat/util/bcel/classfile/ConstantUtf8.java index 053b787dc..f5fa65e78 100644 --- a/java/org/apache/tomcat/util/bcel/classfile/ConstantUtf8.java +++ b/java/org/apache/tomcat/util/bcel/classfile/ConstantUtf8.java @@ -34,6 +34,7 @@ import org.apache.tomcat.util.bcel.Constants; */ public final class ConstantUtf8 extends Constant { + private static final long serialVersionUID = 8119001312020421976L; private String bytes; diff --git a/java/org/apache/tomcat/util/bcel/classfile/ConstantValue.java b/java/org/apache/tomcat/util/bcel/classfile/ConstantValue.java index cb2123311..5fa488ca9 100644 --- a/java/org/apache/tomcat/util/bcel/classfile/ConstantValue.java +++ b/java/org/apache/tomcat/util/bcel/classfile/ConstantValue.java @@ -34,6 +34,7 @@ import org.apache.tomcat.util.bcel.Constants; */ public final class ConstantValue extends Attribute { + private static final long serialVersionUID = -388222612752527969L; private int constantvalue_index; diff --git a/java/org/apache/tomcat/util/bcel/classfile/Deprecated.java b/java/org/apache/tomcat/util/bcel/classfile/Deprecated.java index 1e807c9b8..c100527ae 100644 --- a/java/org/apache/tomcat/util/bcel/classfile/Deprecated.java +++ b/java/org/apache/tomcat/util/bcel/classfile/Deprecated.java @@ -34,6 +34,7 @@ import org.apache.tomcat.util.bcel.Constants; */ public final class Deprecated extends Attribute { + private static final long serialVersionUID = 8499975360019639912L; private byte[] bytes; diff --git a/java/org/apache/tomcat/util/bcel/classfile/EnclosingMethod.java b/java/org/apache/tomcat/util/bcel/classfile/EnclosingMethod.java index 9814f1c0b..86085c2af 100644 --- a/java/org/apache/tomcat/util/bcel/classfile/EnclosingMethod.java +++ b/java/org/apache/tomcat/util/bcel/classfile/EnclosingMethod.java @@ -28,6 +28,8 @@ import org.apache.tomcat.util.bcel.Constants; */ public class EnclosingMethod extends Attribute { + private static final long serialVersionUID = 6755214228300933233L; + // Pointer to the CONSTANT_Class_info structure representing the // innermost class that encloses the declaration of the current class. private int classIndex; diff --git a/java/org/apache/tomcat/util/bcel/classfile/ExceptionTable.java b/java/org/apache/tomcat/util/bcel/classfile/ExceptionTable.java index 1a9d60e33..e06dc142b 100644 --- a/java/org/apache/tomcat/util/bcel/classfile/ExceptionTable.java +++ b/java/org/apache/tomcat/util/bcel/classfile/ExceptionTable.java @@ -37,6 +37,7 @@ import org.apache.tomcat.util.bcel.Constants; */ public final class ExceptionTable extends Attribute { + private static final long serialVersionUID = -5109672682663772900L; private int number_of_exceptions; // Table of indices into private int[] exception_index_table; // constant pool diff --git a/java/org/apache/tomcat/util/bcel/classfile/Field.java b/java/org/apache/tomcat/util/bcel/classfile/Field.java index 092727b51..f5f68e346 100644 --- a/java/org/apache/tomcat/util/bcel/classfile/Field.java +++ b/java/org/apache/tomcat/util/bcel/classfile/Field.java @@ -32,6 +32,7 @@ import org.apache.tomcat.util.bcel.util.BCELComparator; */ public final class Field extends FieldOrMethod { + private static final long serialVersionUID = 2646214544240375238L; private static BCELComparator _cmp = new BCELComparator() { public boolean equals( Object o1, Object o2 ) { diff --git a/java/org/apache/tomcat/util/bcel/classfile/FieldOrMethod.java b/java/org/apache/tomcat/util/bcel/classfile/FieldOrMethod.java index 979b013bc..17e52311f 100644 --- a/java/org/apache/tomcat/util/bcel/classfile/FieldOrMethod.java +++ b/java/org/apache/tomcat/util/bcel/classfile/FieldOrMethod.java @@ -30,6 +30,7 @@ import org.apache.tomcat.util.bcel.Constants; */ public abstract class FieldOrMethod extends AccessFlags implements Cloneable { + private static final long serialVersionUID = -3383525930205542157L; protected int name_index; // Points to field name in constant pool protected int signature_index; // Points to encoded signature protected int attributes_count; // No. of attributes diff --git a/java/org/apache/tomcat/util/bcel/classfile/InnerClass.java b/java/org/apache/tomcat/util/bcel/classfile/InnerClass.java index 256e144ce..c56ddea00 100644 --- a/java/org/apache/tomcat/util/bcel/classfile/InnerClass.java +++ b/java/org/apache/tomcat/util/bcel/classfile/InnerClass.java @@ -35,6 +35,7 @@ import org.apache.tomcat.util.bcel.Constants; */ public final class InnerClass implements Cloneable, Serializable { + private static final long serialVersionUID = -4964694103982806087L; private int inner_class_index; private int outer_class_index; private int inner_name_index; diff --git a/java/org/apache/tomcat/util/bcel/classfile/InnerClasses.java b/java/org/apache/tomcat/util/bcel/classfile/InnerClasses.java index 808ea1e29..cb645dffe 100644 --- a/java/org/apache/tomcat/util/bcel/classfile/InnerClasses.java +++ b/java/org/apache/tomcat/util/bcel/classfile/InnerClasses.java @@ -35,6 +35,7 @@ import org.apache.tomcat.util.bcel.Constants; */ public final class InnerClasses extends Attribute { + private static final long serialVersionUID = 54179484605570305L; private InnerClass[] inner_classes; private int number_of_classes; diff --git a/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java b/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java index dd0768f7a..09783cc0f 100644 --- a/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java +++ b/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java @@ -37,6 +37,7 @@ import org.apache.tomcat.util.bcel.util.BCELComparator; */ public class JavaClass extends AccessFlags implements Cloneable, Comparable { + private static final long serialVersionUID = 7029227708237523236L; private String file_name; private String source_file_name = ""; private String class_name; diff --git a/java/org/apache/tomcat/util/bcel/classfile/LineNumber.java b/java/org/apache/tomcat/util/bcel/classfile/LineNumber.java index 066def3f5..ccc3e93e3 100644 --- a/java/org/apache/tomcat/util/bcel/classfile/LineNumber.java +++ b/java/org/apache/tomcat/util/bcel/classfile/LineNumber.java @@ -33,6 +33,7 @@ import java.io.Serializable; */ public final class LineNumber implements Cloneable, Serializable { + private static final long serialVersionUID = 3393830630264494355L; private int start_pc; // Program Counter (PC) corresponds to line private int line_number; // number in source file diff --git a/java/org/apache/tomcat/util/bcel/classfile/LineNumberTable.java b/java/org/apache/tomcat/util/bcel/classfile/LineNumberTable.java index fec8e3e4e..7f150ce8a 100644 --- a/java/org/apache/tomcat/util/bcel/classfile/LineNumberTable.java +++ b/java/org/apache/tomcat/util/bcel/classfile/LineNumberTable.java @@ -35,6 +35,7 @@ import org.apache.tomcat.util.bcel.Constants; */ public final class LineNumberTable extends Attribute { + private static final long serialVersionUID = 6585122636118666124L; private int line_number_table_length; private LineNumber[] line_number_table; // Table of line/numbers pairs diff --git a/java/org/apache/tomcat/util/bcel/classfile/LocalVariable.java b/java/org/apache/tomcat/util/bcel/classfile/LocalVariable.java index 96d6788b9..f0e7328cc 100644 --- a/java/org/apache/tomcat/util/bcel/classfile/LocalVariable.java +++ b/java/org/apache/tomcat/util/bcel/classfile/LocalVariable.java @@ -34,6 +34,7 @@ import org.apache.tomcat.util.bcel.Constants; */ public final class LocalVariable implements Constants, Cloneable, Serializable { + private static final long serialVersionUID = -914189896372081589L; 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 diff --git a/java/org/apache/tomcat/util/bcel/classfile/LocalVariableTable.java b/java/org/apache/tomcat/util/bcel/classfile/LocalVariableTable.java index 3bb5fc34c..e9e365e04 100644 --- a/java/org/apache/tomcat/util/bcel/classfile/LocalVariableTable.java +++ b/java/org/apache/tomcat/util/bcel/classfile/LocalVariableTable.java @@ -34,6 +34,7 @@ import org.apache.tomcat.util.bcel.Constants; */ public class LocalVariableTable extends Attribute { + private static final long serialVersionUID = -3904314258294133920L; private int local_variable_table_length; // Table of local private LocalVariable[] local_variable_table; // variables diff --git a/java/org/apache/tomcat/util/bcel/classfile/LocalVariableTypeTable.java b/java/org/apache/tomcat/util/bcel/classfile/LocalVariableTypeTable.java index 3c52a7a9f..6afe7adfa 100644 --- a/java/org/apache/tomcat/util/bcel/classfile/LocalVariableTypeTable.java +++ b/java/org/apache/tomcat/util/bcel/classfile/LocalVariableTypeTable.java @@ -50,7 +50,8 @@ import org.apache.tomcat.util.bcel.Constants; // } // J5TODO: Needs some testing ! public class LocalVariableTypeTable extends Attribute { - private int local_variable_type_table_length; // Table of local + private static final long serialVersionUID = -5466082154076451597L; +private int local_variable_type_table_length; // Table of local private LocalVariable[] local_variable_type_table; // variables public LocalVariableTypeTable(int name_index, int length, diff --git a/java/org/apache/tomcat/util/bcel/classfile/Method.java b/java/org/apache/tomcat/util/bcel/classfile/Method.java index 0ddcd84c5..135dff4c2 100644 --- a/java/org/apache/tomcat/util/bcel/classfile/Method.java +++ b/java/org/apache/tomcat/util/bcel/classfile/Method.java @@ -33,6 +33,7 @@ import org.apache.tomcat.util.bcel.util.BCELComparator; */ public final class Method extends FieldOrMethod { + private static final long serialVersionUID = -7447828891136739513L; private static BCELComparator _cmp = new BCELComparator() { public boolean equals( Object o1, Object o2 ) { diff --git a/java/org/apache/tomcat/util/bcel/classfile/PMGClass.java b/java/org/apache/tomcat/util/bcel/classfile/PMGClass.java index 40d9d59dd..774800be4 100644 --- a/java/org/apache/tomcat/util/bcel/classfile/PMGClass.java +++ b/java/org/apache/tomcat/util/bcel/classfile/PMGClass.java @@ -33,6 +33,7 @@ import org.apache.tomcat.util.bcel.Constants; */ public final class PMGClass extends Attribute { + private static final long serialVersionUID = -1876065562391587509L; private int pmg_class_index, pmg_index; diff --git a/java/org/apache/tomcat/util/bcel/classfile/ParameterAnnotations.java b/java/org/apache/tomcat/util/bcel/classfile/ParameterAnnotations.java index c5d002b63..2947bf48d 100644 --- a/java/org/apache/tomcat/util/bcel/classfile/ParameterAnnotations.java +++ b/java/org/apache/tomcat/util/bcel/classfile/ParameterAnnotations.java @@ -29,6 +29,7 @@ import java.io.IOException; */ public abstract class ParameterAnnotations extends Attribute { + private static final long serialVersionUID = -8831779739803248091L; private int num_parameters; private ParameterAnnotationEntry[] parameter_annotation_table; // Table of parameter annotations diff --git a/java/org/apache/tomcat/util/bcel/classfile/RuntimeInvisibleAnnotations.java b/java/org/apache/tomcat/util/bcel/classfile/RuntimeInvisibleAnnotations.java index df79ce0f9..8abc678da 100644 --- a/java/org/apache/tomcat/util/bcel/classfile/RuntimeInvisibleAnnotations.java +++ b/java/org/apache/tomcat/util/bcel/classfile/RuntimeInvisibleAnnotations.java @@ -33,6 +33,8 @@ import org.apache.tomcat.util.bcel.Constants; */ public class RuntimeInvisibleAnnotations extends Annotations { + private static final long serialVersionUID = -7962627688723310248L; + /** * @param name_index * Index pointing to the name Code diff --git a/java/org/apache/tomcat/util/bcel/classfile/RuntimeInvisibleParameterAnnotations.java b/java/org/apache/tomcat/util/bcel/classfile/RuntimeInvisibleParameterAnnotations.java index d44a6b14b..5d655e02b 100644 --- a/java/org/apache/tomcat/util/bcel/classfile/RuntimeInvisibleParameterAnnotations.java +++ b/java/org/apache/tomcat/util/bcel/classfile/RuntimeInvisibleParameterAnnotations.java @@ -32,6 +32,9 @@ import org.apache.tomcat.util.bcel.Constants; */ public class RuntimeInvisibleParameterAnnotations extends ParameterAnnotations { + private static final long serialVersionUID = -6819370369102352536L; + + /** * @param name_index Index pointing to the name Code * @param length Content length in bytes diff --git a/java/org/apache/tomcat/util/bcel/classfile/RuntimeVisibleAnnotations.java b/java/org/apache/tomcat/util/bcel/classfile/RuntimeVisibleAnnotations.java index 5014d00b2..3eb414c0c 100644 --- a/java/org/apache/tomcat/util/bcel/classfile/RuntimeVisibleAnnotations.java +++ b/java/org/apache/tomcat/util/bcel/classfile/RuntimeVisibleAnnotations.java @@ -33,6 +33,8 @@ import org.apache.tomcat.util.bcel.Constants; */ public class RuntimeVisibleAnnotations extends Annotations { + private static final long serialVersionUID = 2912284875689024413L; + /** * @param name_index * Index pointing to the name Code diff --git a/java/org/apache/tomcat/util/bcel/classfile/RuntimeVisibleParameterAnnotations.java b/java/org/apache/tomcat/util/bcel/classfile/RuntimeVisibleParameterAnnotations.java index a86f52134..12d023d6f 100644 --- a/java/org/apache/tomcat/util/bcel/classfile/RuntimeVisibleParameterAnnotations.java +++ b/java/org/apache/tomcat/util/bcel/classfile/RuntimeVisibleParameterAnnotations.java @@ -32,6 +32,9 @@ import org.apache.tomcat.util.bcel.Constants; */ public class RuntimeVisibleParameterAnnotations extends ParameterAnnotations { + private static final long serialVersionUID = 7633756460868573992L; + + /** * @param name_index Index pointing to the name Code * @param length Content length in bytes diff --git a/java/org/apache/tomcat/util/bcel/classfile/Signature.java b/java/org/apache/tomcat/util/bcel/classfile/Signature.java index d62b52a2a..15b4f6501 100644 --- a/java/org/apache/tomcat/util/bcel/classfile/Signature.java +++ b/java/org/apache/tomcat/util/bcel/classfile/Signature.java @@ -33,6 +33,7 @@ import org.apache.tomcat.util.bcel.Constants; */ public final class Signature extends Attribute { + private static final long serialVersionUID = 7493781777025829964L; private int signature_index; diff --git a/java/org/apache/tomcat/util/bcel/classfile/SourceFile.java b/java/org/apache/tomcat/util/bcel/classfile/SourceFile.java index 98bba77a4..529d69d38 100644 --- a/java/org/apache/tomcat/util/bcel/classfile/SourceFile.java +++ b/java/org/apache/tomcat/util/bcel/classfile/SourceFile.java @@ -35,6 +35,7 @@ import org.apache.tomcat.util.bcel.Constants; */ public final class SourceFile extends Attribute { + private static final long serialVersionUID = 332346699609443704L; private int sourcefile_index; diff --git a/java/org/apache/tomcat/util/bcel/classfile/StackMap.java b/java/org/apache/tomcat/util/bcel/classfile/StackMap.java index ea7e05fdd..694607ee2 100644 --- a/java/org/apache/tomcat/util/bcel/classfile/StackMap.java +++ b/java/org/apache/tomcat/util/bcel/classfile/StackMap.java @@ -40,6 +40,7 @@ import org.apache.tomcat.util.bcel.Constants; */ public final class StackMap extends Attribute { + private static final long serialVersionUID = 264958819110329590L; private int map_length; private StackMapEntry[] map; // Table of stack map entries diff --git a/java/org/apache/tomcat/util/bcel/classfile/StackMapTable.java b/java/org/apache/tomcat/util/bcel/classfile/StackMapTable.java index 291ca9d2e..d299d9dea 100644 --- a/java/org/apache/tomcat/util/bcel/classfile/StackMapTable.java +++ b/java/org/apache/tomcat/util/bcel/classfile/StackMapTable.java @@ -40,6 +40,7 @@ import org.apache.tomcat.util.bcel.Constants; */ public final class StackMapTable extends Attribute { + private static final long serialVersionUID = -2931695092763099621L; private int map_length; private StackMapTableEntry[] map; // Table of stack map entries diff --git a/java/org/apache/tomcat/util/bcel/classfile/Synthetic.java b/java/org/apache/tomcat/util/bcel/classfile/Synthetic.java index 60e623b5b..8eee31c25 100644 --- a/java/org/apache/tomcat/util/bcel/classfile/Synthetic.java +++ b/java/org/apache/tomcat/util/bcel/classfile/Synthetic.java @@ -38,6 +38,7 @@ import org.apache.tomcat.util.bcel.Constants; */ public final class Synthetic extends Attribute { + private static final long serialVersionUID = -5129612853226360165L; private byte[] bytes; diff --git a/java/org/apache/tomcat/util/bcel/classfile/Unknown.java b/java/org/apache/tomcat/util/bcel/classfile/Unknown.java index 194950694..8c8071c65 100644 --- a/java/org/apache/tomcat/util/bcel/classfile/Unknown.java +++ b/java/org/apache/tomcat/util/bcel/classfile/Unknown.java @@ -43,6 +43,7 @@ import org.apache.tomcat.util.bcel.Constants; */ public final class Unknown extends Attribute { + private static final long serialVersionUID = -4152422704743201314L; private byte[] bytes; private String name; private static final Map unknown_attributes = new HashMap(); -- 2.11.0