You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2012/10/14 19:59:39 UTC
svn commit: r1398107 - in
/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile: LineNumber.java
LineNumberTable.java LocalVariable.java LocalVariableTable.java
LocalVariableTypeTable.java Utility.java
Author: markt
Date: Sun Oct 14 17:59:38 2012
New Revision: 1398107
URL: http://svn.apache.org/viewvc?rev=1398107&view=rev
Log:
More unused classes
Removed:
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/LineNumber.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/LocalVariable.java
Modified:
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/LineNumberTable.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/LocalVariableTable.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/LocalVariableTypeTable.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Utility.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/LineNumberTable.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/LineNumberTable.java?rev=1398107&r1=1398106&r2=1398107&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/LineNumberTable.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/LineNumberTable.java Sun Oct 14 17:59:38 2012
@@ -28,26 +28,10 @@ import java.io.IOException;
* @version $Id$
* @author <A HREF="mailto:m.dahm@gmx.de">M. Dahm</A>
* @see Code
- * @see LineNumber
*/
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
-
-
- /*
- * @param name_index Index of name
- * @param length Content length in bytes
- * @param line_number_table Table of line/numbers pairs
- * @param constant_pool Array of constants
- */
- public LineNumberTable(int name_index, int length, LineNumber[] line_number_table,
- ConstantPool constant_pool) {
- super(name_index, length, constant_pool);
- setLineNumberTable(line_number_table);
- }
/**
@@ -60,20 +44,10 @@ public final class LineNumberTable exten
*/
LineNumberTable(int name_index, int length, DataInputStream file, ConstantPool constant_pool)
throws IOException {
- this(name_index, length, (LineNumber[]) null, constant_pool);
- line_number_table_length = (file.readUnsignedShort());
- line_number_table = new LineNumber[line_number_table_length];
+ super(name_index, length, constant_pool);
+ int line_number_table_length = (file.readUnsignedShort());
for (int i = 0; i < line_number_table_length; i++) {
- line_number_table[i] = new LineNumber(file);
+ Utility.swallowLineNumber(file);
}
}
-
-
- /**
- * @param line_number_table the line number entries for this table
- */
- public final void setLineNumberTable( LineNumber[] line_number_table ) {
- this.line_number_table = line_number_table;
- line_number_table_length = (line_number_table == null) ? 0 : line_number_table.length;
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/LocalVariableTable.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/LocalVariableTable.java?rev=1398107&r1=1398106&r2=1398107&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/LocalVariableTable.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/LocalVariableTable.java Sun Oct 14 17:59:38 2012
@@ -27,26 +27,10 @@ import java.io.IOException;
* @version $Id$
* @author <A HREF="mailto:m.dahm@gmx.de">M. Dahm</A>
* @see Code
- * @see LocalVariable
*/
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
-
-
- /**
- * @param name_index Index in constant pool to `LocalVariableTable'
- * @param length Content length in bytes
- * @param local_variable_table Table of local variables
- * @param constant_pool Array of constants
- */
- public LocalVariableTable(int name_index, int length, LocalVariable[] local_variable_table,
- ConstantPool constant_pool) {
- super(name_index, length, constant_pool);
- setLocalVariableTable(local_variable_table);
- }
/**
@@ -59,19 +43,10 @@ public class LocalVariableTable extends
*/
LocalVariableTable(int name_index, int length, DataInputStream file, ConstantPool constant_pool)
throws IOException {
- this(name_index, length, (LocalVariable[]) null, constant_pool);
- local_variable_table_length = (file.readUnsignedShort());
- local_variable_table = new LocalVariable[local_variable_table_length];
+ super(name_index, length, constant_pool);
+ int local_variable_table_length = (file.readUnsignedShort());
for (int i = 0; i < local_variable_table_length; i++) {
- local_variable_table[i] = new LocalVariable(file);
+ Utility.swallowLocalVariable(file);
}
}
-
-
- public final void setLocalVariableTable( LocalVariable[] local_variable_table ) {
- this.local_variable_table = local_variable_table;
- local_variable_table_length = (local_variable_table == null)
- ? 0
- : local_variable_table.length;
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/LocalVariableTypeTable.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/LocalVariableTypeTable.java?rev=1398107&r1=1398106&r2=1398107&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/LocalVariableTypeTable.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/LocalVariableTypeTable.java Sun Oct 14 17:59:38 2012
@@ -47,32 +47,16 @@ import java.io.IOException;
// }
// J5TODO: Needs some testing !
public class LocalVariableTypeTable extends Attribute {
- private static final long serialVersionUID = -5466082154076451597L;
-private int local_variable_type_table_length; // Table of local
- private LocalVariable[] local_variable_type_table; // variables
+ private static final long serialVersionUID = -5466082154076451597L;
- public LocalVariableTypeTable(int name_index, int length,
- LocalVariable[] local_variable_table,
- ConstantPool constant_pool)
- {
- super(name_index, length, constant_pool);
- setLocalVariableTable(local_variable_table);
- }
+ LocalVariableTypeTable(int name_index, int length,
+ DataInputStream dis, ConstantPool constant_pool)
+ throws IOException {
+ super(name_index, length, constant_pool);
- LocalVariableTypeTable(int nameIdx, int len, DataInputStream dis,ConstantPool cpool) throws IOException {
- this(nameIdx, len, (LocalVariable[])null, cpool);
+ int local_variable_type_table_length = (dis.readUnsignedShort());
- local_variable_type_table_length = (dis.readUnsignedShort());
- local_variable_type_table = new LocalVariable[local_variable_type_table_length];
-
- for(int i=0; i < local_variable_type_table_length; i++)
- local_variable_type_table[i] = new LocalVariable(dis);
- }
-
- public final void setLocalVariableTable(LocalVariable[] local_variable_table)
- {
- this.local_variable_type_table = local_variable_table;
- local_variable_type_table_length = (local_variable_table == null)? 0 :
- local_variable_table.length;
- }
+ for(int i=0; i < local_variable_type_table_length; i++)
+ Utility.swallowLocalVariable(dis);
+ }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Utility.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Utility.java?rev=1398107&r1=1398106&r2=1398107&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Utility.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Utility.java Sun Oct 14 17:59:38 2012
@@ -106,4 +106,18 @@ public abstract class Utility {
file.readUnsignedShort(); // Unused inner_name_index
file.readUnsignedShort(); // Unused inner_access_flags
}
+
+ protected static void swallowLineNumber(DataInput file) throws IOException {
+ file.readUnsignedShort(); // Unused start_pc
+ file.readUnsignedShort(); // Unused line_number
+ }
+
+ protected static void swallowLocalVariable(DataInput file)
+ throws IOException {
+ file.readUnsignedShort(); // Unused start_pc
+ file.readUnsignedShort(); // Unused length
+ file.readUnsignedShort(); // Unused name_index
+ file.readUnsignedShort(); // Unused signature_index
+ file.readUnsignedShort(); // Unused index
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org