Author: markt
Date: Fri Sep 12 11:51:40 2014
New Revision: 1624503
URL: http://svn.apache.org/r1624503
Log:
Port removal of unused code from trunk
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationElementValue.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationEntry.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ArrayElementValue.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Attribute.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ClassParser.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Code.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/CodeException.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Constant.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantCP.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantClass.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantDouble.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantFloat.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantInteger.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantInvokeDynamic.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantLong.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantMethodHandle.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantMethodType.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantNameAndType.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantString.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantUtf8.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantValue.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Deprecated.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ElementValue.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ExceptionTable.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Field.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/InnerClass.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/InnerClasses.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/LineNumber.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/LineNumberTable.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/LocalVariable.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/LocalVariableTable.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/LocalVariableTypeTable.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Method.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/PMGClass.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Signature.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/SimpleElementValue.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/SourceFile.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMap.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapEntry.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapTable.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapTableEntry.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapType.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Synthetic.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Unknown.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Utility.java
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1384068-1384069,1397950
Propchange: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/
------------------------------------------------------------------------------
Merged /tomcat/trunk/java/org/apache/tomcat/util/bcel:r1384068-1384069,1397950
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationElementValue.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationElementValue.java?rev=1624503&r1=1624502&r2=1624503&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationElementValue.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationElementValue.java
Fri Sep 12 11:51:40 2014
@@ -49,12 +49,6 @@ public class AnnotationElementValue exte
return annotationEntry.toString();
}
- @Override
- public String toString()
- {
- return stringifyValue();
- }
-
public AnnotationEntry getAnnotationEntry()
{
return annotationEntry;
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationEntry.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationEntry.java?rev=1624503&r1=1624502&r2=1624503&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationEntry.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationEntry.java
Fri Sep 12 11:51:40 2014
@@ -20,7 +20,6 @@ package org.apache.tomcat.util.bcel.clas
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
@@ -32,10 +31,8 @@ import org.apache.tomcat.util.bcel.Const
* @author <A HREF="mailto:dbros...@mebigfatguy.com";>D. Brosius</A>
* @since 6.0
*/
-public class AnnotationEntry implements Constants, Serializable {
+public class AnnotationEntry implements Constants {
- private static final long serialVersionUID = 1L;
-
private final int type_index;
private final ConstantPool constant_pool;
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ArrayElementValue.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ArrayElementValue.java?rev=1624503&r1=1624502&r2=1624503&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ArrayElementValue.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ArrayElementValue.java
Fri Sep 12 11:51:40 2014
@@ -25,21 +25,6 @@ public class ArrayElementValue extends E
// For array types, this is the array
private ElementValue[] evalues;
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
- sb.append("{");
- for (int i = 0; i < evalues.length; i++)
- {
- sb.append(evalues[i].toString());
- if ((i + 1) < evalues.length)
- sb.append(",");
- }
- sb.append("}");
- return sb.toString();
- }
-
public ArrayElementValue(int type, ElementValue[] datums, ConstantPool
cpool)
{
super(type, cpool);
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Attribute.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Attribute.java?rev=1624503&r1=1624502&r2=1624503&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Attribute.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Attribute.java
Fri Sep 12 11:51:40 2014
@@ -221,13 +221,4 @@ public abstract class Attribute implemen
* @return deep copy of this attribute
*/
public abstract Attribute copy(ConstantPool _constant_pool);
-
- /**
- * @return attribute name.
- */
- @Override
- public String toString()
- {
- return Constants.ATTRIBUTE_NAMES[tag];
- }
}
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ClassParser.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ClassParser.java?rev=1624503&r1=1624502&r2=1624503&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ClassParser.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ClassParser.java
Fri Sep 12 11:51:40 2014
@@ -48,7 +48,6 @@ public final class ClassParser {
private String file_name;
private String zip_file;
private int class_name_index, superclass_name_index;
- private int major, minor; // Compiler version
private int access_flags; // Access rights of parsed class
private int[] interfaces; // Names of implemented interfaces
private ConstantPool constant_pool; // collection of constants
@@ -157,8 +156,9 @@ public final class ClassParser {
}
}
// Return the information we have gathered in a new object
- return new JavaClass(class_name_index, superclass_name_index,
file_name, major, minor,
- access_flags, constant_pool, interfaces, fields, methods,
attributes);
+ return new JavaClass(class_name_index, superclass_name_index,
+ access_flags, constant_pool, interfaces, fields, methods,
+ attributes);
}
@@ -275,7 +275,7 @@ public final class ClassParser {
* @throws ClassFormatException
*/
private void readVersion() throws IOException, ClassFormatException {
- minor = file.readUnsignedShort();
- major = file.readUnsignedShort();
+ file.readUnsignedShort();
+ file.readUnsignedShort();
}
}
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Code.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Code.java?rev=1624503&r1=1624502&r2=1624503&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Code.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Code.java
Fri Sep 12 11:51:40 2014
@@ -43,8 +43,6 @@ import org.apache.tomcat.util.bcel.Const
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
private byte[] code; // Actual byte code
private int exception_table_length;
@@ -62,8 +60,8 @@ public final class Code extends Attribut
Code(int name_index, int length, DataInputStream file, ConstantPool
constant_pool)
throws IOException {
// Initialize with some default values which will be overwritten later
- this(name_index, length, file.readUnsignedShort(),
file.readUnsignedShort(), (byte[]) null,
- (CodeException[]) null, (Attribute[]) null, constant_pool);
+ this(name_index, length, (byte[]) null, (CodeException[]) null,
+ (Attribute[]) null, constant_pool);
code_length = file.readInt();
code = new byte[code_length]; // Read byte code
file.readFully(code);
@@ -94,18 +92,14 @@ public final class Code extends Attribut
/**
* @param name_index Index pointing to the name <em>Code</em>
* @param length Content length in bytes
- * @param max_stack Maximum size of stack
- * @param max_locals Number of local variables
* @param code Actual byte code
* @param exception_table Table of handled exceptions
* @param attributes Attributes of code: LineNumber or LocalVariable
* @param constant_pool Array of constants
*/
- public Code(int name_index, int length, int max_stack, int max_locals,
byte[] code,
+ public Code(int name_index, int length, byte[] code,
CodeException[] exception_table, Attribute[] attributes,
ConstantPool constant_pool) {
super(Constants.ATTR_CODE, name_index, length, constant_pool);
- this.max_stack = max_stack;
- this.max_locals = max_locals;
setCode(code);
setExceptionTable(exception_table);
setAttributes(attributes); // Overwrites length!
@@ -182,39 +176,6 @@ public final class Code extends Attribut
/**
- * @return String representation of code chunk.
- */
- public final String toString( boolean verbose ) {
- StringBuilder buf = new StringBuilder(100);
- buf.append("Code(max_stack = ").append(max_stack).append(", max_locals
= ").append(
- max_locals).append(", code_length =
").append(code_length).append(")\n").append(
- Utility.codeToString(code, constant_pool, 0, -1, verbose));
- if (exception_table_length > 0) {
- buf.append("\nException handler(s) =
\n").append("From\tTo\tHandler\tType\n");
- for (int i = 0; i < exception_table_length; i++) {
- buf.append(exception_table[i].toString(constant_pool,
verbose)).append("\n");
- }
- }
- if (attributes_count > 0) {
- buf.append("\nAttribute(s) = \n");
- for (int i = 0; i < attributes_count; i++) {
- buf.append(attributes[i].toString()).append("\n");
- }
- }
- return buf.toString();
- }
-
-
- /**
- * @return String representation of code chunk.
- */
- @Override
- public final String toString() {
- return toString(true);
- }
-
-
- /**
* @return deep copy of this attribute
*
* @param _constant_pool the constant pool to duplicate
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/CodeException.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/CodeException.java?rev=1624503&r1=1624502&r2=1624503&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/CodeException.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/CodeException.java
Fri Sep 12 11:51:40 2014
@@ -90,31 +90,6 @@ public final class CodeException impleme
/**
- * @return String representation.
- */
- @Override
- public final String toString() {
- return "CodeException(start_pc = " + start_pc + ", end_pc = " + end_pc
+ ", handler_pc = "
- + handler_pc + ", catch_type = " + catch_type + ")";
- }
-
-
- /**
- * @return String representation.
- */
- public final String toString( ConstantPool cp, boolean verbose ) {
- String str;
- if (catch_type == 0) {
- str = "<Any exception>(0)";
- } else {
- str = Utility.compactClassName(cp.getConstantString(catch_type,
CONSTANT_Class), false)
- + (verbose ? "(" + catch_type + ")" : "");
- }
- return start_pc + "\t" + end_pc + "\t" + handler_pc + "\t" + str;
- }
-
-
- /**
* @return deep copy of this object
*/
public CodeException copy() {
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Constant.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Constant.java?rev=1624503&r1=1624502&r2=1624503&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Constant.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Constant.java
Fri Sep 12 11:51:40 2014
@@ -75,15 +75,6 @@ public abstract class Constant implement
}
- /**
- * @return String representation.
- */
- @Override
- public String toString() {
- return Constants.CONSTANT_NAMES[tag] + "[" + tag + "]";
- }
-
-
@Override
public Object clone() {
try {
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantCP.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantCP.java?rev=1624503&r1=1624502&r2=1624503&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantCP.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantCP.java
Fri Sep 12 11:51:40 2014
@@ -73,14 +73,4 @@ public abstract class ConstantCP extends
public final int getNameAndTypeIndex() {
return name_and_type_index;
}
-
-
- /**
- * @return String representation.
- */
- @Override
- public final String toString() {
- return super.toString() + "(class_index = " + class_index + ",
name_and_type_index = "
- + name_and_type_index + ")";
- }
}
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantClass.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantClass.java?rev=1624503&r1=1624502&r2=1624503&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantClass.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantClass.java
Fri Sep 12 11:51:40 2014
@@ -63,13 +63,4 @@ public final class ConstantClass extends
public final int getNameIndex() {
return name_index;
}
-
-
- /**
- * @return String representation.
- */
- @Override
- public final String toString() {
- return super.toString() + "(name_index = " + name_index + ")";
- }
}
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantDouble.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantDouble.java?rev=1624503&r1=1624502&r2=1624503&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantDouble.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantDouble.java
Fri Sep 12 11:51:40 2014
@@ -62,13 +62,4 @@ public final class ConstantDouble extend
public final double getBytes() {
return bytes;
}
-
-
- /**
- * @return String representation.
- */
- @Override
- public final String toString() {
- return super.toString() + "(bytes = " + bytes + ")";
- }
}
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantFloat.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantFloat.java?rev=1624503&r1=1624502&r2=1624503&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantFloat.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantFloat.java
Fri Sep 12 11:51:40 2014
@@ -62,13 +62,4 @@ public final class ConstantFloat extends
public final float getBytes() {
return bytes;
}
-
-
- /**
- * @return String representation.
- */
- @Override
- public final String toString() {
- return super.toString() + "(bytes = " + bytes + ")";
- }
}
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantInteger.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantInteger.java?rev=1624503&r1=1624502&r2=1624503&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantInteger.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantInteger.java
Fri Sep 12 11:51:40 2014
@@ -62,13 +62,4 @@ public final class ConstantInteger exten
public final int getBytes() {
return bytes;
}
-
-
- /**
- * @return String representation.
- */
- @Override
- public final String toString() {
- return super.toString() + "(bytes = " + bytes + ")";
- }
}
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantInvokeDynamic.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantInvokeDynamic.java?rev=1624503&r1=1624502&r2=1624503&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantInvokeDynamic.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantInvokeDynamic.java
Fri Sep 12 11:51:40 2014
@@ -81,15 +81,4 @@ public final class ConstantInvokeDynamic
public void setNameAndTypeIndex(int name_and_type_index) {
this.name_and_type_index = name_and_type_index;
}
-
-
- /**
- * @return String representation
- */
- @Override
- public final String toString() {
- return super.toString() + "(bootstrap_method_attr_index = " +
- bootstrap_method_attr_index + ", name_and_type_index = " +
- name_and_type_index + ")";
- }
}
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantLong.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantLong.java?rev=1624503&r1=1624502&r2=1624503&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantLong.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantLong.java
Fri Sep 12 11:51:40 2014
@@ -62,13 +62,4 @@ public final class ConstantLong extends
public final long getBytes() {
return bytes;
}
-
-
- /**
- * @return String representation.
- */
- @Override
- public final String toString() {
- return super.toString() + "(bytes = " + bytes + ")";
- }
}
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantMethodHandle.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantMethodHandle.java?rev=1624503&r1=1624502&r2=1624503&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantMethodHandle.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantMethodHandle.java
Fri Sep 12 11:51:40 2014
@@ -80,14 +80,4 @@ public final class ConstantMethodHandle
public void setReferenceIndex(int reference_index) {
this.reference_index = reference_index;
}
-
-
- /**
- * @return String representation
- */
- @Override
- public final String toString() {
- return super.toString() + "(reference_kind = " + reference_kind +
- ", reference_index = " + reference_index + ")";
- }
}
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantMethodType.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantMethodType.java?rev=1624503&r1=1624502&r2=1624503&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantMethodType.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantMethodType.java
Fri Sep 12 11:51:40 2014
@@ -68,13 +68,4 @@ public final class ConstantMethodType ex
public void setDescriptorIndex(int descriptor_index) {
this.descriptor_index = descriptor_index;
}
-
-
- /**
- * @return String representation
- */
- @Override
- public final String toString() {
- return super.toString() + "(descriptor_index = " + descriptor_index +
")";
- }
}
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantNameAndType.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantNameAndType.java?rev=1624503&r1=1624502&r2=1624503&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantNameAndType.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantNameAndType.java
Fri Sep 12 11:51:40 2014
@@ -74,14 +74,4 @@ public final class ConstantNameAndType e
public final int getSignatureIndex() {
return signature_index;
}
-
-
- /**
- * @return String representation
- */
- @Override
- public final String toString() {
- return super.toString() + "(name_index = " + name_index + ",
signature_index = "
- + signature_index + ")";
- }
}
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java?rev=1624503&r1=1624502&r2=1624503&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java
Fri Sep 12 11:51:40 2014
@@ -257,19 +257,4 @@ public class ConstantPool implements Clo
public int getLength() {
return constant_pool_count;
}
-
-
- /**
- * @return String representation.
- */
- @Override
- public String toString() {
- StringBuilder buf = new StringBuilder();
- for (int i = 1; i < constant_pool_count; i++) {
- buf.append(i).append(")").append(constant_pool[i]).append("\n");
- }
- return buf.toString();
- }
-
-
}
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantString.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantString.java?rev=1624503&r1=1624502&r2=1624503&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantString.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantString.java
Fri Sep 12 11:51:40 2014
@@ -62,13 +62,4 @@ public final class ConstantString extend
public final int getStringIndex() {
return string_index;
}
-
-
- /**
- * @return String representation.
- */
- @Override
- public final String toString() {
- return super.toString() + "(string_index = " + string_index + ")";
- }
}
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantUtf8.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantUtf8.java?rev=1624503&r1=1624502&r2=1624503&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantUtf8.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantUtf8.java
Fri Sep 12 11:51:40 2014
@@ -103,13 +103,4 @@ public final class ConstantUtf8 extends
public final String getBytes() {
return bytes;
}
-
-
- /**
- * @return String representation
- */
- @Override
- public final String toString() {
- return super.toString() + "(\"" + Utility.replace(bytes, "\n", "\\n")
+ "\")";
- }
}
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantValue.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantValue.java?rev=1624503&r1=1624502&r2=1624503&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantValue.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantValue.java
Fri Sep 12 11:51:40 2014
@@ -32,7 +32,6 @@ import org.apache.tomcat.util.bcel.Const
public final class ConstantValue extends Attribute {
private static final long serialVersionUID = -388222612752527969L;
- private int constantvalue_index;
/**
@@ -45,54 +44,18 @@ public final class ConstantValue extends
*/
ConstantValue(int name_index, int length, DataInput file, ConstantPool
constant_pool)
throws IOException {
- this(name_index, length, file.readUnsignedShort(), constant_pool);
+ this(name_index, length, constant_pool);
}
/**
* @param name_index Name index in constant pool
* @param length Content length in bytes
- * @param constantvalue_index Index in constant pool
* @param constant_pool Array of constants
*/
- public ConstantValue(int name_index, int length, int constantvalue_index,
+ public ConstantValue(int name_index, int length,
ConstantPool constant_pool) {
super(Constants.ATTR_CONSTANT_VALUE, name_index, length,
constant_pool);
- this.constantvalue_index = constantvalue_index;
- }
-
-
- /**
- * @return String representation of constant value.
- */
- @Override
- public final String toString() {
- Constant c = constant_pool.getConstant(constantvalue_index);
- String buf;
- int i;
- // Print constant to string depending on its type
- switch (c.getTag()) {
- case Constants.CONSTANT_Long:
- buf = String.valueOf(((ConstantLong) c).getBytes());
- break;
- case Constants.CONSTANT_Float:
- buf = String.valueOf(((ConstantFloat) c).getBytes());
- break;
- case Constants.CONSTANT_Double:
- buf = String.valueOf(((ConstantDouble) c).getBytes());
- break;
- case Constants.CONSTANT_Integer:
- buf = String.valueOf(((ConstantInteger) c).getBytes());
- break;
- case Constants.CONSTANT_String:
- i = ((ConstantString) c).getStringIndex();
- c = constant_pool.getConstant(i, Constants.CONSTANT_Utf8);
- buf = "\"" + Utility.convertString(((ConstantUtf8)
c).getBytes()) + "\"";
- break;
- default:
- throw new IllegalStateException("Type of ConstValue invalid: "
+ c);
- }
- return buf;
}
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Deprecated.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Deprecated.java?rev=1624503&r1=1624502&r2=1624503&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Deprecated.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Deprecated.java
Fri Sep 12 11:51:40 2014
@@ -68,15 +68,6 @@ public final class Deprecated extends At
/**
- * @return attribute name
- */
- @Override
- public final String toString() {
- return Constants.ATTRIBUTE_NAMES[Constants.ATTR_DEPRECATED];
- }
-
-
- /**
* @return deep copy of this attribute
*/
@Override
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ElementValue.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ElementValue.java?rev=1624503&r1=1624502&r2=1624503&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ElementValue.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ElementValue.java
Fri Sep 12 11:51:40 2014
@@ -31,11 +31,6 @@ public abstract class ElementValue
protected ConstantPool cpool;
- @Override
- public String toString()
- {
- return stringifyValue();
- }
protected ElementValue(int type, ConstantPool cpool)
{
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ExceptionTable.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ExceptionTable.java?rev=1624503&r1=1624502&r2=1624503&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ExceptionTable.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ExceptionTable.java
Fri Sep 12 11:51:40 2014
@@ -83,25 +83,6 @@ public final class ExceptionTable extend
/**
- * @return String representation, i.e., a list of thrown exceptions.
- */
- @Override
- public final String toString() {
- StringBuilder buf = new StringBuilder();
- String str;
- for (int i = 0; i < number_of_exceptions; i++) {
- str = constant_pool.getConstantString(exception_index_table[i],
- Constants.CONSTANT_Class);
- buf.append(Utility.compactClassName(str, false));
- if (i < number_of_exceptions - 1) {
- buf.append(", ");
- }
- }
- return buf.toString();
- }
-
-
- /**
* @return deep copy of this attribute
*/
@Override
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Field.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Field.java?rev=1624503&r1=1624502&r2=1624503&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Field.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Field.java
Fri Sep 12 11:51:40 2014
@@ -75,36 +75,6 @@ public final class Field extends FieldOr
/**
- * Return string representation close to declaration format,
- * `public static final short MAX = 100', e.g..
- *
- * @return String representation of field, including the signature.
- */
- @Override
- public final String toString() {
- String name, signature, access; // Short cuts to constant pool
- // Get names from constant pool
- access = Utility.accessToString(access_flags);
- access = access.equals("") ? "" : (access + " ");
- signature = Utility.signatureToString(getSignature());
- name = getName();
- StringBuilder buf = new StringBuilder(64);
- buf.append(access).append(signature).append(" ").append(name);
- ConstantValue cv = getConstantValue();
- if (cv != null) {
- buf.append(" = ").append(cv);
- }
- for (int i = 0; i < attributes_count; i++) {
- Attribute a = attributes[i];
- if (!(a instanceof ConstantValue)) {
- buf.append(" [").append(a.toString()).append("]");
- }
- }
- return buf.toString();
- }
-
-
- /**
* Return value as defined by given BCELComparator strategy.
* By default two Field objects are said to be equal when
* their names and signatures are equal.
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/InnerClass.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/InnerClass.java?rev=1624503&r1=1624502&r2=1624503&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/InnerClass.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/InnerClass.java
Fri Sep 12 11:51:40 2014
@@ -22,8 +22,6 @@ import java.io.DataOutputStream;
import java.io.IOException;
import java.io.Serializable;
-import org.apache.tomcat.util.bcel.Constants;
-
/**
* This class represents a inner class attribute, i.e., the class
* indices of the inner and outer classes, the name and the attributes
@@ -82,44 +80,6 @@ public final class InnerClass implements
/**
- * @return String representation.
- */
- @Override
- public final String toString() {
- return "InnerClass(" + inner_class_index + ", " + outer_class_index +
", "
- + inner_name_index + ", " + inner_access_flags + ")";
- }
-
-
- /**
- * @return Resolved string representation
- */
- public final String toString( ConstantPool constant_pool ) {
- String inner_class_name, outer_class_name, inner_name, access;
- inner_class_name = constant_pool.getConstantString(inner_class_index,
- Constants.CONSTANT_Class);
- inner_class_name = Utility.compactClassName(inner_class_name);
- if (outer_class_index != 0) {
- outer_class_name =
constant_pool.getConstantString(outer_class_index,
- Constants.CONSTANT_Class);
- outer_class_name = Utility.compactClassName(outer_class_name);
- } else {
- outer_class_name = "<not a member>";
- }
- if (inner_name_index != 0) {
- inner_name = ((ConstantUtf8)
constant_pool.getConstant(inner_name_index,
- Constants.CONSTANT_Utf8)).getBytes();
- } else {
- inner_name = "<anonymous>";
- }
- access = Utility.accessToString(inner_access_flags, true);
- access = access.equals("") ? "" : (access + " ");
- return "InnerClass:" + access + inner_class_name + "(\"" +
outer_class_name + "\", \""
- + inner_name + "\")";
- }
-
-
- /**
* @return deep copy of this object
*/
public InnerClass copy() {
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/InnerClasses.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/InnerClasses.java?rev=1624503&r1=1624502&r2=1624503&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/InnerClasses.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/InnerClasses.java
Fri Sep 12 11:51:40 2014
@@ -81,19 +81,6 @@ public final class InnerClasses extends
/**
- * @return String representation.
- */
- @Override
- public final String toString() {
- StringBuilder buf = new StringBuilder();
- for (int i = 0; i < number_of_classes; i++) {
- buf.append(inner_classes[i].toString(constant_pool)).append("\n");
- }
- return buf.toString();
- }
-
-
- /**
* @return deep copy of this attribute
*/
@Override
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java?rev=1624503&r1=1624502&r2=1624503&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java
Fri Sep 12 11:51:40 2014
@@ -19,7 +19,6 @@ package org.apache.tomcat.util.bcel.clas
import java.util.ArrayList;
import java.util.List;
-import java.util.StringTokenizer;
import org.apache.tomcat.util.bcel.Constants;
import org.apache.tomcat.util.bcel.util.BCELComparator;
@@ -38,16 +37,9 @@ public class JavaClass extends AccessFla
implements Cloneable, Comparable<JavaClass> {
private static final long serialVersionUID = 7029227708237523236L;
- private String file_name;
- private String source_file_name = "<Unknown>";
private String class_name;
private String superclass_name;
- private int major, minor; // Compiler version
- private ConstantPool constant_pool; // Constant pool
- private int[] interfaces; // implemented interfaces
private String[] interface_names;
- private Field[] fields; // Fields, i.e., variables of class
- private Method[] methods; // methods defined in the class
private Attribute[] attributes; // attributes defined in the class
private AnnotationEntry[] annotations; // annotations defined on the
class
@@ -80,9 +72,6 @@ public class JavaClass extends AccessFla
* ConstantClass that represents this class.
* @param superclass_name_index Index into constant pool referencing a
* ConstantClass that represents this class's superclass.
- * @param file_name File name
- * @param major Major compiler version
- * @param minor Minor compiler version
* @param access_flags Access rights defined by bit flags
* @param constant_pool Array of constants
* @param interfaces Implemented interfaces
@@ -90,8 +79,8 @@ public class JavaClass extends AccessFla
* @param methods Class methods
* @param attributes Class attributes
*/
- public JavaClass(int class_name_index, int superclass_name_index, String
file_name, int major,
- int minor, int access_flags, ConstantPool constant_pool, int[]
interfaces,
+ public JavaClass(int class_name_index, int superclass_name_index,
+ int access_flags, ConstantPool constant_pool, int[] interfaces,
Field[] fields, Method[] methods, Attribute[] attributes) {
if (interfaces == null) {
interfaces = new int[0];
@@ -105,23 +94,10 @@ public class JavaClass extends AccessFla
if (methods == null) {
methods = new Method[0];
}
- this.file_name = file_name;
- this.major = major;
- this.minor = minor;
this.access_flags = access_flags;
- this.constant_pool = constant_pool;
- this.interfaces = interfaces;
- this.fields = fields;
- this.methods = methods;
this.attributes = attributes;
annotationsOutOfDate = true;
- // Get source file name if available
- for (int i = 0; i < attributes.length; i++) {
- if (attributes[i] instanceof SourceFile) {
- source_file_name = ((SourceFile)
attributes[i]).getSourceFileName();
- break;
- }
- }
+
/* According to the specification the following entries must be of type
* `ConstantClass' but we check that anyway via the
* `ConstPool.getConstant' method.
@@ -197,72 +173,6 @@ public class JavaClass extends AccessFla
}
- /**
- * @return String representing class contents.
- */
- @Override
- public String toString() {
- String access = Utility.accessToString(access_flags, true);
- access = access.equals("") ? "" : (access + " ");
- StringBuilder buf = new StringBuilder(128);
-
buf.append(access).append(Utility.classOrInterface(access_flags)).append("
").append(
- class_name).append(" extends ").append(
- Utility.compactClassName(superclass_name, false)).append('\n');
- int size = interfaces.length;
- if (size > 0) {
- buf.append("implements\t\t");
- for (int i = 0; i < size; i++) {
- buf.append(interface_names[i]);
- if (i < size - 1) {
- buf.append(", ");
- }
- }
- buf.append('\n');
- }
- buf.append("filename\t\t").append(file_name).append('\n');
- buf.append("compiled from\t\t").append(source_file_name).append('\n');
- buf.append("compiler
version\t").append(major).append(".").append(minor).append('\n');
- buf.append("access flags\t\t").append(access_flags).append('\n');
- buf.append("constant
pool\t\t").append(constant_pool.getLength()).append(" entries\n");
- buf.append("ACC_SUPER flag\t\t").append(isSuper()).append("\n");
- if (attributes.length > 0) {
- buf.append("\nAttribute(s):\n");
- for (int i = 0; i < attributes.length; i++) {
- buf.append(indent(attributes[i]));
- }
- }
- AnnotationEntry[] annotations = getAnnotationEntries();
- if (annotations!=null && annotations.length>0) {
- buf.append("\nAnnotation(s):\n");
- for (int i=0; i<annotations.length; i++)
- buf.append(indent(annotations[i]));
- }
- if (fields.length > 0) {
- buf.append("\n").append(fields.length).append(" fields:\n");
- for (int i = 0; i < fields.length; i++) {
- buf.append("\t").append(fields[i]).append('\n');
- }
- }
- if (methods.length > 0) {
- buf.append("\n").append(methods.length).append(" methods:\n");
- for (int i = 0; i < methods.length; i++) {
- buf.append("\t").append(methods[i]).append('\n');
- }
- }
- return buf.toString();
- }
-
-
- private static final String indent( Object obj ) {
- StringTokenizer tok = new StringTokenizer(obj.toString(), "\n");
- StringBuilder buf = new StringBuilder();
- while (tok.hasMoreTokens()) {
- buf.append("\t").append(tok.nextToken()).append("\n");
- }
- return buf.toString();
- }
-
-
public final boolean isSuper() {
return (access_flags & Constants.ACC_SUPER) != 0;
}
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/LineNumber.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/LineNumber.java?rev=1624503&r1=1624502&r2=1624503&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/LineNumber.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/LineNumber.java
Fri Sep 12 11:51:40 2014
@@ -70,15 +70,6 @@ public final class LineNumber implements
/**
- * @return String representation
- */
- @Override
- public final String toString() {
- return "LineNumber(" + start_pc + ", " + line_number + ")";
- }
-
-
- /**
* @return deep copy of this object
*/
public LineNumber copy() {
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/LineNumberTable.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/LineNumberTable.java?rev=1624503&r1=1624502&r2=1624503&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/LineNumberTable.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/LineNumberTable.java
Fri Sep 12 11:51:40 2014
@@ -80,30 +80,6 @@ public final class LineNumberTable exten
/**
- * @return String representation.
- */
- @Override
- public final String toString() {
- StringBuilder buf = new StringBuilder();
- StringBuilder line = new StringBuilder();
- String newLine = System.getProperty("line.separator", "\n");
- for (int i = 0; i < line_number_table_length; i++) {
- line.append(line_number_table[i].toString());
- if (i < line_number_table_length - 1) {
- line.append(", ");
- }
- if (line.length() > 72) {
- line.append(newLine);
- buf.append(line.toString());
- line.setLength(0);
- }
- }
- buf.append(line);
- return buf.toString();
- }
-
-
- /**
* @return deep copy of this attribute
*/
@Override
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/LocalVariable.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/LocalVariable.java?rev=1624503&r1=1624502&r2=1624503&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/LocalVariable.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/LocalVariable.java
Fri Sep 12 11:51:40 2014
@@ -118,17 +118,6 @@ public final class LocalVariable impleme
/**
- * @return string representation.
- */
- @Override
- public final String toString() {
- String name = getName(), signature =
Utility.signatureToString(getSignature());
- return "LocalVariable(start_pc = " + start_pc + ", length = " + length
+ ", index = "
- + index + ":" + signature + " " + name + ")";
- }
-
-
- /**
* @return deep copy of this object
*/
public LocalVariable copy() {
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/LocalVariableTable.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/LocalVariableTable.java?rev=1624503&r1=1624502&r2=1624503&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/LocalVariableTable.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/LocalVariableTable.java
Fri Sep 12 11:51:40 2014
@@ -97,22 +97,6 @@ public class LocalVariableTable extends
/**
- * @return String representation.
- */
- @Override
- public final String toString() {
- StringBuilder buf = new StringBuilder();
- for (int i = 0; i < local_variable_table_length; i++) {
- buf.append(local_variable_table[i].toString());
- if (i < local_variable_table_length - 1) {
- buf.append('\n');
- }
- }
- return buf.toString();
- }
-
-
- /**
* @return deep copy of this attribute
*/
@Override
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/LocalVariableTypeTable.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/LocalVariableTypeTable.java?rev=1624503&r1=1624502&r2=1624503&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/LocalVariableTypeTable.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/LocalVariableTypeTable.java
Fri Sep 12 11:51:40 2014
@@ -78,21 +78,6 @@ private int local_variable_t
local_variable_table.length;
}
- /**
- * @return String representation.
- */
- @Override
- public final String toString() {
- StringBuilder buf = new StringBuilder();
-
- for(int i=0; i < local_variable_type_table_length; i++) {
- buf.append(local_variable_type_table[i].toString());
-
- if(i < local_variable_type_table_length - 1) buf.append('\n');
- }
-
- return buf.toString();
- }
/**
* @return deep copy of this attribute
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Method.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Method.java?rev=1624503&r1=1624502&r2=1624503&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Method.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Method.java
Fri Sep 12 11:51:40 2014
@@ -20,7 +20,6 @@ package org.apache.tomcat.util.bcel.clas
import java.io.DataInputStream;
import java.io.IOException;
-import org.apache.tomcat.util.bcel.Constants;
import org.apache.tomcat.util.bcel.util.BCELComparator;
/**
@@ -112,43 +111,6 @@ public final class Method extends FieldO
/**
- * Return string representation close to declaration format,
- * `public static void main(String[] args) throws IOException', e.g.
- *
- * @return String representation of the method.
- */
- @Override
- public final String toString() {
- ConstantUtf8 c;
- String name, signature, access; // Short cuts to constant pool
- StringBuilder buf;
- access = Utility.accessToString(access_flags);
- // Get name and signature from constant pool
- c = (ConstantUtf8) constant_pool.getConstant(signature_index,
Constants.CONSTANT_Utf8);
- signature = c.getBytes();
- c = (ConstantUtf8) constant_pool.getConstant(name_index,
Constants.CONSTANT_Utf8);
- name = c.getBytes();
- signature = Utility.methodSignatureToString(signature, name, access,
true,
- getLocalVariableTable());
- buf = new StringBuilder(signature);
- for (int i = 0; i < attributes_count; i++) {
- Attribute a = attributes[i];
- if (!((a instanceof Code) || (a instanceof ExceptionTable))) {
- buf.append(" [").append(a.toString()).append("]");
- }
- }
- ExceptionTable e = getExceptionTable();
- if (e != null) {
- String str = e.toString();
- if (!str.equals("")) {
- buf.append("\n\t\tthrows ").append(str);
- }
- }
- return buf.toString();
- }
-
-
- /**
* Return value as defined by given BCELComparator strategy.
* By default two method objects are said to be equal when
* their names and signatures are equal.
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/PMGClass.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/PMGClass.java?rev=1624503&r1=1624502&r2=1624503&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/PMGClass.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/PMGClass.java
Fri Sep 12 11:51:40 2014
@@ -85,15 +85,6 @@ public final class PMGClass extends Attr
/**
- * @return String representation
- */
- @Override
- public final String toString() {
- return "PMGClass(" + getPMGName() + ", " + getPMGClassName() + ")";
- }
-
-
- /**
* @return deep copy of this attribute
*/
@Override
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Signature.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Signature.java?rev=1624503&r1=1624502&r2=1624503&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Signature.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Signature.java
Fri Sep 12 11:51:40 2014
@@ -70,15 +70,6 @@ public final class Signature extends Att
return c.getBytes();
}
- /**
- * @return String representation
- */
- @Override
- public final String toString() {
- String s = getSignature();
- return "Signature(" + s + ")";
- }
-
/**
* @return deep copy of this attribute
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/SimpleElementValue.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/SimpleElementValue.java?rev=1624503&r1=1624502&r2=1624503&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/SimpleElementValue.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/SimpleElementValue.java
Fri Sep 12 11:51:40 2014
@@ -41,12 +41,6 @@ public class SimpleElementValue extends
}
- @Override
- public String toString()
- {
- return stringifyValue();
- }
-
// Whatever kind of value it is, return it as a string
@Override
public String stringifyValue()
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/SourceFile.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/SourceFile.java?rev=1624503&r1=1624502&r2=1624503&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/SourceFile.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/SourceFile.java
Fri Sep 12 11:51:40 2014
@@ -81,15 +81,6 @@ public final class SourceFile extends At
/**
- * @return String representation
- */
- @Override
- public final String toString() {
- return "SourceFile(" + getSourceFileName() + ")";
- }
-
-
- /**
* @return deep copy of this attribute
*/
@Override
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMap.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMap.java?rev=1624503&r1=1624502&r2=1624503&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMap.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMap.java
Fri Sep 12 11:51:40 2014
@@ -69,7 +69,7 @@ public final class StackMap extends Attr
map_length = file.readUnsignedShort();
map = new StackMapEntry[map_length];
for (int i = 0; i < map_length; i++) {
- map[i] = new StackMapEntry(file, constant_pool);
+ map[i] = new StackMapEntry(file);
}
}
@@ -84,23 +84,6 @@ public final class StackMap extends Attr
/**
- * @return String representation.
- */
- @Override
- public final String toString() {
- StringBuilder buf = new StringBuilder("StackMap(");
- for (int i = 0; i < map_length; i++) {
- buf.append(map[i].toString());
- if (i < map_length - 1) {
- buf.append(", ");
- }
- }
- buf.append(')');
- return buf.toString();
- }
-
-
- /**
* @return deep copy of this attribute
*/
@Override
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapEntry.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapEntry.java?rev=1624503&r1=1624502&r2=1624503&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapEntry.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapEntry.java
Fri Sep 12 11:51:40 2014
@@ -47,16 +47,16 @@ public final class StackMapEntry impleme
* @param file Input stream
* @throws IOException
*/
- StackMapEntry(DataInputStream file, ConstantPool constant_pool) throws
IOException {
+ StackMapEntry(DataInputStream file) throws IOException {
this(file.readShort(), file.readShort(), null, -1, null);
types_of_locals = new StackMapType[number_of_locals];
for (int i = 0; i < number_of_locals; i++) {
- types_of_locals[i] = new StackMapType(file, constant_pool);
+ types_of_locals[i] = new StackMapType(file);
}
number_of_stack_items = file.readShort();
types_of_stack_items = new StackMapType[number_of_stack_items];
for (int i = 0; i < number_of_stack_items; i++) {
- types_of_stack_items[i] = new StackMapType(file, constant_pool);
+ types_of_stack_items[i] = new StackMapType(file);
}
}
@@ -92,38 +92,6 @@ public final class StackMapEntry impleme
/**
- * @return String representation.
- */
- @Override
- public final String toString() {
- StringBuilder buf = new StringBuilder(64);
- buf.append("(offset=").append(byte_code_offset);
- if (number_of_locals > 0) {
- buf.append(", locals={");
- for (int i = 0; i < number_of_locals; i++) {
- buf.append(types_of_locals[i]);
- if (i < number_of_locals - 1) {
- buf.append(", ");
- }
- }
- buf.append("}");
- }
- if (number_of_stack_items > 0) {
- buf.append(", stack items={");
- for (int i = 0; i < number_of_stack_items; i++) {
- buf.append(types_of_stack_items[i]);
- if (i < number_of_stack_items - 1) {
- buf.append(", ");
- }
- }
- buf.append("}");
- }
- buf.append(")");
- return buf.toString();
- }
-
-
- /**
* @return deep copy of this object
*/
public StackMapEntry copy() {
@@ -133,6 +101,4 @@ public final class StackMapEntry impleme
}
return null;
}
-
-
}
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapTable.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapTable.java?rev=1624503&r1=1624502&r2=1624503&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapTable.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapTable.java
Fri Sep 12 11:51:40 2014
@@ -69,7 +69,7 @@ public final class StackMapTable extends
map_length = file.readUnsignedShort();
map = new StackMapTableEntry[map_length];
for (int i = 0; i < map_length; i++) {
- map[i] = new StackMapTableEntry(file, constant_pool);
+ map[i] = new StackMapTableEntry(file);
}
}
@@ -84,23 +84,6 @@ public final class StackMapTable extends
/**
- * @return String representation.
- */
- @Override
- public final String toString() {
- StringBuilder buf = new StringBuilder("StackMapTable(");
- for (int i = 0; i < map_length; i++) {
- buf.append(map[i].toString());
- if (i < map_length - 1) {
- buf.append(", ");
- }
- }
- buf.append(')');
- return buf.toString();
- }
-
-
- /**
* @return deep copy of this attribute
*/
@Override
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapTableEntry.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapTableEntry.java?rev=1624503&r1=1624502&r2=1624503&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapTableEntry.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapTableEntry.java
Fri Sep 12 11:51:40 2014
@@ -50,7 +50,7 @@ public final class StackMapTableEntry im
* @param file Input stream
* @throws IOException
*/
- StackMapTableEntry(DataInputStream file, ConstantPool constant_pool)
throws IOException {
+ StackMapTableEntry(DataInputStream file) throws IOException {
this(file.read(), -1, -1, null, -1, null);
if (frame_type >= Constants.SAME_FRAME && frame_type <=
Constants.SAME_FRAME_MAX) {
@@ -59,12 +59,12 @@ public final class StackMapTableEntry im
byte_code_offset_delta = frame_type -
Constants.SAME_LOCALS_1_STACK_ITEM_FRAME;
number_of_stack_items = 1;
types_of_stack_items = new StackMapType[1];
- types_of_stack_items[0] = new StackMapType(file, constant_pool);
+ types_of_stack_items[0] = new StackMapType(file);
} else if (frame_type ==
Constants.SAME_LOCALS_1_STACK_ITEM_FRAME_EXTENDED) {
byte_code_offset_delta = file.readShort();
number_of_stack_items = 1;
types_of_stack_items = new StackMapType[1];
- types_of_stack_items[0] = new StackMapType(file, constant_pool);
+ types_of_stack_items[0] = new StackMapType(file);
} else if (frame_type >= Constants.CHOP_FRAME && frame_type <=
Constants.CHOP_FRAME_MAX) {
byte_code_offset_delta = file.readShort();
} else if (frame_type == Constants.SAME_FRAME_EXTENDED) {
@@ -74,19 +74,19 @@ public final class StackMapTableEntry im
number_of_locals = frame_type - 251;
types_of_locals = new StackMapType[number_of_locals];
for (int i = 0; i < number_of_locals; i++) {
- types_of_locals[i] = new StackMapType(file, constant_pool);
+ types_of_locals[i] = new StackMapType(file);
}
} else if (frame_type == Constants.FULL_FRAME) {
byte_code_offset_delta = file.readShort();
number_of_locals = file.readShort();
types_of_locals = new StackMapType[number_of_locals];
for (int i = 0; i < number_of_locals; i++) {
- types_of_locals[i] = new StackMapType(file, constant_pool);
+ types_of_locals[i] = new StackMapType(file);
}
number_of_stack_items = file.readShort();
types_of_stack_items = new StackMapType[number_of_stack_items];
for (int i = 0; i < number_of_stack_items; i++) {
- types_of_stack_items[i] = new StackMapType(file,
constant_pool);
+ types_of_stack_items[i] = new StackMapType(file);
}
} else {
/* Can't happen */
@@ -149,56 +149,6 @@ public final class StackMapTableEntry im
/**
- * @return String representation.
- */
- @Override
- public final String toString() {
- StringBuilder buf = new StringBuilder(64);
- buf.append("(");
- if (frame_type >= Constants.SAME_FRAME && frame_type <=
Constants.SAME_FRAME_MAX) {
- buf.append("SAME");
- } else if (frame_type >= Constants.SAME_LOCALS_1_STACK_ITEM_FRAME &&
frame_type <= Constants.SAME_LOCALS_1_STACK_ITEM_FRAME_MAX) {
- buf.append("SAME_LOCALS_1_STACK");
- } else if (frame_type ==
Constants.SAME_LOCALS_1_STACK_ITEM_FRAME_EXTENDED) {
- buf.append("SAME_LOCALS_1_STACK_EXTENDED");
- } else if (frame_type >= Constants.CHOP_FRAME && frame_type <=
Constants.CHOP_FRAME_MAX) {
- buf.append("CHOP "+(251-frame_type));
- } else if (frame_type == Constants.SAME_FRAME_EXTENDED) {
- buf.append("SAME_EXTENDED");
- } else if (frame_type >= Constants.APPEND_FRAME && frame_type <=
Constants.APPEND_FRAME_MAX) {
- buf.append("APPEND "+(frame_type-251));
- } else if (frame_type == Constants.FULL_FRAME) {
- buf.append("FULL");
- } else {
- buf.append("UNKNOWN");
- }
- buf.append(", offset delta=").append(byte_code_offset_delta);
- if (number_of_locals > 0) {
- buf.append(", locals={");
- for (int i = 0; i < number_of_locals; i++) {
- buf.append(types_of_locals[i]);
- if (i < number_of_locals - 1) {
- buf.append(", ");
- }
- }
- buf.append("}");
- }
- if (number_of_stack_items > 0) {
- buf.append(", stack items={");
- for (int i = 0; i < number_of_stack_items; i++) {
- buf.append(types_of_stack_items[i]);
- if (i < number_of_stack_items - 1) {
- buf.append(", ");
- }
- }
- buf.append("}");
- }
- buf.append(")");
- return buf.toString();
- }
-
-
- /**
* @return deep copy of this object
*/
public StackMapTableEntry copy() {
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapType.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapType.java?rev=1624503&r1=1624502&r2=1624503&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapType.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapType.java
Fri Sep 12 11:51:40 2014
@@ -39,7 +39,6 @@ public final class StackMapType implemen
private byte type;
private int index = -1; // Index to CONSTANT_Class or offset
- private ConstantPool constant_pool;
/**
@@ -47,12 +46,11 @@ public final class StackMapType implemen
* @param file Input stream
* @throws IOException
*/
- StackMapType(DataInput file, ConstantPool constant_pool) throws
IOException {
- this(file.readByte(), -1, constant_pool);
+ StackMapType(DataInput file) throws IOException {
+ this(file.readByte(), -1);
if (hasIndex()) {
setIndex(file.readShort());
}
- setConstantPool(constant_pool);
}
@@ -60,10 +58,9 @@ public final class StackMapType implemen
* @param type type tag as defined in the Constants interface
* @param index index to constant pool, or byte code offset
*/
- public StackMapType(byte type, int index, ConstantPool constant_pool) {
+ public StackMapType(byte type, int index) {
setType(type);
setIndex(index);
- setConstantPool(constant_pool);
}
@@ -107,35 +104,4 @@ public final class StackMapType implemen
public final boolean hasIndex() {
return ((type == Constants.ITEM_Object) || (type ==
Constants.ITEM_NewObject));
}
-
-
- private String printIndex() {
- if (type == Constants.ITEM_Object) {
- if (index < 0) {
- return ", class=<unknown>";
- }
- return ", class=" + constant_pool.constantToString(index,
Constants.CONSTANT_Class);
- } else if (type == Constants.ITEM_NewObject) {
- return ", offset=" + index;
- } else {
- return "";
- }
- }
-
-
- /**
- * @return String representation
- */
- @Override
- public final String toString() {
- return "(type=" + Constants.ITEM_NAMES[type] + printIndex() + ")";
- }
-
-
- /**
- * @param constant_pool Constant pool to be used for this object.
- */
- public final void setConstantPool( ConstantPool constant_pool ) {
- this.constant_pool = constant_pool;
- }
}
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Synthetic.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Synthetic.java?rev=1624503&r1=1624502&r2=1624503&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Synthetic.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Synthetic.java
Fri Sep 12 11:51:40 2014
@@ -74,19 +74,6 @@ public final class Synthetic extends Att
/**
- * @return String representation.
- */
- @Override
- public final String toString() {
- StringBuilder buf = new StringBuilder("Synthetic");
- if (length > 0) {
- buf.append(" ").append(Utility.toHexString(bytes));
- }
- return buf.toString();
- }
-
-
- /**
* @return deep copy of this attribute
*/
@Override
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Unknown.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Unknown.java?rev=1624503&r1=1624502&r2=1624503&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Unknown.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Unknown.java
Fri Sep 12 11:51:40 2014
@@ -93,26 +93,6 @@ public final class Unknown extends Attri
/**
- * @return String representation.
- */
- @Override
- public final String toString() {
- if (length == 0 || bytes == null) {
- return "(Unknown attribute " + name + ")";
- }
- String hex;
- if (length > 10) {
- byte[] tmp = new byte[10];
- System.arraycopy(bytes, 0, tmp, 0, 10);
- hex = Utility.toHexString(tmp) + "... (truncated)";
- } else {
- hex = Utility.toHexString(bytes);
- }
- return "(Unknown attribute " + name + ": " + hex + ")";
- }
-
-
- /**
* @return deep copy of this attribute
*/
@Override
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Utility.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Utility.java?rev=1624503&r1=1624502&r2=1624503&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Utility.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Utility.java
Fri Sep 12 11:51:40 2014
@@ -458,80 +458,6 @@ public abstract class Utility {
return compactClassName(str, "java.lang.", chopit);
}
- /**
- * A returntype signature represents the return value from a method.
- * It is a series of bytes in the following grammar:
- *
- * <return_signature> ::= <field_type> | V
- *
- * The character V indicates that the method returns no value. Otherwise,
the
- * signature indicates the type of the return value.
- * An argument signature represents an argument passed to a method:
- *
- * <argument_signature> ::= <field_type>
- *
- * A method signature represents the arguments that the method expects, and
- * the value that it returns.
- * <method_signature> ::= (<arguments_signature>) <return_signature>
- * <arguments_signature>::= <argument_signature>*
- *
- * This method converts such a string into a Java type declaration like
- * `void main(String[])' and throws a `ClassFormatException' when the
parsed
- * type is invalid.
- *
- * @param signature Method signature
- * @param name Method name
- * @param access Method access rights
- * @param chopit
- * @param vars
- * @return Java type declaration
- * @throws ClassFormatException
- */
- public static final String methodSignatureToString( String signature,
String name,
- String access, boolean chopit, LocalVariableTable vars ) throws
ClassFormatException {
- StringBuilder buf = new StringBuilder("(");
- String type;
- int index;
- int var_index = (access.indexOf("static") >= 0) ? 0 : 1;
- try { // Read all declarations between for `(' and `)'
- if (signature.charAt(0) != '(') {
- throw new ClassFormatException("Invalid method signature: " +
signature);
- }
- index = 1; // current string position
- while (signature.charAt(index) != ')') {
- String param_type =
signatureToString(signature.substring(index), chopit);
- buf.append(param_type);
- if (vars != null) {
- LocalVariable l = vars.getLocalVariable(var_index);
- if (l != null) {
- buf.append(" ").append(l.getName());
- }
- } else {
- buf.append(" arg").append(var_index);
- }
- if ("double".equals(param_type) || "long".equals(param_type)) {
- var_index += 2;
- } else {
- var_index++;
- }
- buf.append(", ");
- //corrected concurrent private static field acess
- index += unwrap(consumed_chars); // update position
- }
- index++; // update position
- // Read return type after `)'
- type = signatureToString(signature.substring(index), chopit);
- } catch (StringIndexOutOfBoundsException e) { // Should never occur
- throw new ClassFormatException("Invalid method signature: " +
signature, e);
- }
- if (buf.length() > 1) {
- buf.setLength(buf.length() - 2);
- }
- buf.append(")");
- return access + ((access.length() > 0) ? " " : "") + // May be an
empty string
- type + " " + name + buf.toString();
- }
-
// Guess what this does
private static final int pow2( int n ) {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
