tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1384051 - /tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/
Date Wed, 12 Sep 2012 17:47:45 GMT
Author: markt
Date: Wed Sep 12 17:47:43 2012
New Revision: 1384051

URL: http://svn.apache.org/viewvc?rev=1384051&view=rev
Log:
Remove unused toString() methods

Modified:
    tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationElementValue.java
    tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ArrayElementValue.java
    tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Attribute.java
    tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ClassElementValue.java
    tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Code.java
    tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/CodeException.java
    tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Constant.java
    tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantCP.java
    tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantClass.java
    tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantDouble.java
    tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantFloat.java
    tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantInteger.java
    tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantInvokeDynamic.java
    tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantLong.java
    tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantMethodHandle.java
    tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantMethodType.java
    tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantNameAndType.java
    tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java
    tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantString.java
    tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantUtf8.java
    tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantValue.java
    tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Deprecated.java
    tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ElementValue.java
    tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/EnumElementValue.java
    tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ExceptionTable.java
    tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Field.java
    tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/InnerClass.java
    tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/InnerClasses.java
    tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java
    tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/LineNumber.java
    tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/LineNumberTable.java
    tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/LocalVariable.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/Method.java
    tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/PMGClass.java
    tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Signature.java
    tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/SimpleElementValue.java
    tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/SourceFile.java
    tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMap.java
    tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapEntry.java
    tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapTable.java
    tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapTableEntry.java
    tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapType.java
    tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Synthetic.java
    tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Unknown.java

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationElementValue.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationElementValue.java?rev=1384051&r1=1384050&r2=1384051&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationElementValue.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationElementValue.java Wed Sep 12 17:47:43 2012
@@ -42,18 +42,6 @@ public class AnnotationElementValue exte
         annotationEntry.dump(dos);
     }
 
-    @Override
-    public String stringifyValue()
-    {
-        return annotationEntry.toString();
-    }
-
-    @Override
-    public String toString()
-    {
-        return stringifyValue();
-    }
-
     public AnnotationEntry getAnnotationEntry()
     {
         return annotationEntry;

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ArrayElementValue.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ArrayElementValue.java?rev=1384051&r1=1384050&r2=1384051&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ArrayElementValue.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ArrayElementValue.java Wed Sep 12 17:47:43 2012
@@ -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);
@@ -60,21 +45,6 @@ public class ArrayElementValue extends E
         }
     }
 
-    @Override
-    public String stringifyValue()
-    {
-        StringBuilder sb = new StringBuilder();
-        sb.append("[");
-        for (int i = 0; i < evalues.length; i++)
-        {
-            sb.append(evalues[i].stringifyValue());
-            if ((i + 1) < evalues.length)
-                sb.append(",");
-        }
-        sb.append("]");
-        return sb.toString();
-    }
-
     public ElementValue[] getElementValuesArray()
     {
         return evalues;

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Attribute.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Attribute.java?rev=1384051&r1=1384050&r2=1384051&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Attribute.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Attribute.java Wed Sep 12 17:47:43 2012
@@ -215,13 +215,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/trunk/java/org/apache/tomcat/util/bcel/classfile/ClassElementValue.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ClassElementValue.java?rev=1384051&r1=1384050&r2=1384051&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ClassElementValue.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ClassElementValue.java Wed Sep 12 17:47:43 2012
@@ -20,8 +20,6 @@ package org.apache.tomcat.util.bcel.clas
 import java.io.DataOutputStream;
 import java.io.IOException;
 
-import org.apache.tomcat.util.bcel.Constants;
-
 public class ClassElementValue extends ElementValue
 {
     // For primitive types and string type, this points to the value entry in
@@ -37,14 +35,6 @@ public class ClassElementValue extends E
 
 
     @Override
-    public String stringifyValue()
-    {
-        ConstantUtf8 cu8 = (ConstantUtf8) cpool.getConstant(idx,
-                Constants.CONSTANT_Utf8);
-        return cu8.getBytes();
-    }
-
-    @Override
     public void dump(DataOutputStream dos) throws IOException
     {
         dos.writeByte(type); // u1 kind of value

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Code.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Code.java?rev=1384051&r1=1384050&r2=1384051&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Code.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Code.java Wed Sep 12 17:47:43 2012
@@ -183,39 +183,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/trunk/java/org/apache/tomcat/util/bcel/classfile/CodeException.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/CodeException.java?rev=1384051&r1=1384050&r2=1384051&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/CodeException.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/CodeException.java Wed Sep 12 17:47:43 2012
@@ -93,16 +93,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) {

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Constant.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Constant.java?rev=1384051&r1=1384050&r2=1384051&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Constant.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Constant.java Wed Sep 12 17:47:43 2012
@@ -76,15 +76,6 @@ public abstract class Constant implement
     }
 
 
-    /**
-     * @return String representation.
-     */
-    @Override
-    public String toString() {
-        return Constants.CONSTANT_NAMES[tag] + "[" + tag + "]";
-    }
-
-
     @Override
     public Object clone() throws CloneNotSupportedException {
         return super.clone();

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantCP.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantCP.java?rev=1384051&r1=1384050&r2=1384051&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantCP.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantCP.java Wed Sep 12 17:47:43 2012
@@ -74,14 +74,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/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantClass.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantClass.java?rev=1384051&r1=1384050&r2=1384051&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantClass.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantClass.java Wed Sep 12 17:47:43 2012
@@ -64,13 +64,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/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantDouble.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantDouble.java?rev=1384051&r1=1384050&r2=1384051&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantDouble.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantDouble.java Wed Sep 12 17:47:43 2012
@@ -63,13 +63,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/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantFloat.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantFloat.java?rev=1384051&r1=1384050&r2=1384051&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantFloat.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantFloat.java Wed Sep 12 17:47:43 2012
@@ -63,13 +63,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/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantInteger.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantInteger.java?rev=1384051&r1=1384050&r2=1384051&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantInteger.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantInteger.java Wed Sep 12 17:47:43 2012
@@ -63,13 +63,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/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantInvokeDynamic.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantInvokeDynamic.java?rev=1384051&r1=1384050&r2=1384051&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantInvokeDynamic.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantInvokeDynamic.java Wed Sep 12 17:47:43 2012
@@ -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/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantLong.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantLong.java?rev=1384051&r1=1384050&r2=1384051&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantLong.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantLong.java Wed Sep 12 17:47:43 2012
@@ -63,13 +63,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/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantMethodHandle.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantMethodHandle.java?rev=1384051&r1=1384050&r2=1384051&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantMethodHandle.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantMethodHandle.java Wed Sep 12 17:47:43 2012
@@ -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/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantMethodType.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantMethodType.java?rev=1384051&r1=1384050&r2=1384051&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantMethodType.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantMethodType.java Wed Sep 12 17:47:43 2012
@@ -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/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantNameAndType.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantNameAndType.java?rev=1384051&r1=1384050&r2=1384051&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantNameAndType.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantNameAndType.java Wed Sep 12 17:47:43 2012
@@ -75,14 +75,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/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java?rev=1384051&r1=1384050&r2=1384051&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java Wed Sep 12 17:47:43 2012
@@ -258,19 +258,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/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantString.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantString.java?rev=1384051&r1=1384050&r2=1384051&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantString.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantString.java Wed Sep 12 17:47:43 2012
@@ -63,13 +63,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/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantUtf8.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantUtf8.java?rev=1384051&r1=1384050&r2=1384051&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantUtf8.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantUtf8.java Wed Sep 12 17:47:43 2012
@@ -54,13 +54,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/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantValue.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantValue.java?rev=1384051&r1=1384050&r2=1384051&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantValue.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantValue.java Wed Sep 12 17:47:43 2012
@@ -64,40 +64,6 @@ public final class ConstantValue extends
 
 
     /**
-     * @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;
-    }
-
-
-    /**
      * @return deep copy of this attribute
      */
     @Override

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Deprecated.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Deprecated.java?rev=1384051&r1=1384050&r2=1384051&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Deprecated.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Deprecated.java Wed Sep 12 17:47:43 2012
@@ -69,15 +69,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/trunk/java/org/apache/tomcat/util/bcel/classfile/ElementValue.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ElementValue.java?rev=1384051&r1=1384050&r2=1384051&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ElementValue.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ElementValue.java Wed Sep 12 17:47:43 2012
@@ -32,21 +32,12 @@ public abstract class ElementValue
 
     protected ConstantPool cpool;
 
-    @Override
-    public String toString()
-    {
-        return stringifyValue();
-    }
-
     protected ElementValue(int type, ConstantPool cpool)
     {
         this.type = type;
         this.cpool = cpool;
     }
 
-
-    public abstract String stringifyValue();
-
     public abstract void dump(DataOutputStream dos) throws IOException;
 
     public static final int STRING = 's';

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/EnumElementValue.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/EnumElementValue.java?rev=1384051&r1=1384050&r2=1384051&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/EnumElementValue.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/EnumElementValue.java Wed Sep 12 17:47:43 2012
@@ -20,8 +20,6 @@ package org.apache.tomcat.util.bcel.clas
 import java.io.DataOutputStream;
 import java.io.IOException;
 
-import org.apache.tomcat.util.bcel.Constants;
-
 public class EnumElementValue extends ElementValue
 {
     // For enum types, these two indices point to the type and value
@@ -47,12 +45,4 @@ public class EnumElementValue extends El
         dos.writeShort(typeIdx); // u2
         dos.writeShort(valueIdx); // u2
     }
-
-    @Override
-    public String stringifyValue()
-    {
-        ConstantUtf8 cu8 = (ConstantUtf8) cpool.getConstant(valueIdx,
-                Constants.CONSTANT_Utf8);
-        return cu8.getBytes();
-    }
 }

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ExceptionTable.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ExceptionTable.java?rev=1384051&r1=1384050&r2=1384051&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ExceptionTable.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ExceptionTable.java Wed Sep 12 17:47:43 2012
@@ -84,25 +84,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/trunk/java/org/apache/tomcat/util/bcel/classfile/Field.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Field.java?rev=1384051&r1=1384050&r2=1384051&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Field.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Field.java Wed Sep 12 17:47:43 2012
@@ -76,36 +76,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/trunk/java/org/apache/tomcat/util/bcel/classfile/InnerClass.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/InnerClass.java?rev=1384051&r1=1384050&r2=1384051&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/InnerClass.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/InnerClass.java Wed Sep 12 17:47:43 2012
@@ -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
@@ -83,44 +81,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/trunk/java/org/apache/tomcat/util/bcel/classfile/InnerClasses.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/InnerClasses.java?rev=1384051&r1=1384050&r2=1384051&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/InnerClasses.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/InnerClasses.java Wed Sep 12 17:47:43 2012
@@ -82,19 +82,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/trunk/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java?rev=1384051&r1=1384050&r2=1384051&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java Wed Sep 12 17:47:43 2012
@@ -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;
@@ -199,72 +198,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/trunk/java/org/apache/tomcat/util/bcel/classfile/LineNumber.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/LineNumber.java?rev=1384051&r1=1384050&r2=1384051&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/LineNumber.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/LineNumber.java Wed Sep 12 17:47:43 2012
@@ -71,15 +71,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/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=1384051&r1=1384050&r2=1384051&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 Wed Sep 12 17:47:43 2012
@@ -81,30 +81,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/trunk/java/org/apache/tomcat/util/bcel/classfile/LocalVariable.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/LocalVariable.java?rev=1384051&r1=1384050&r2=1384051&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/LocalVariable.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/LocalVariable.java Wed Sep 12 17:47:43 2012
@@ -119,17 +119,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/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=1384051&r1=1384050&r2=1384051&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 Wed Sep 12 17:47:43 2012
@@ -98,22 +98,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/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=1384051&r1=1384050&r2=1384051&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 Wed Sep 12 17:47:43 2012
@@ -79,22 +79,6 @@ private int             local_variable_t
   }
 
   /**
-   * @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
    */
   @Override

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Method.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Method.java?rev=1384051&r1=1384050&r2=1384051&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Method.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Method.java Wed Sep 12 17:47:43 2012
@@ -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;
 
 /**
@@ -113,43 +112,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/trunk/java/org/apache/tomcat/util/bcel/classfile/PMGClass.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/PMGClass.java?rev=1384051&r1=1384050&r2=1384051&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/PMGClass.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/PMGClass.java Wed Sep 12 17:47:43 2012
@@ -86,15 +86,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/trunk/java/org/apache/tomcat/util/bcel/classfile/Signature.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Signature.java?rev=1384051&r1=1384050&r2=1384051&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Signature.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Signature.java Wed Sep 12 17:47:43 2012
@@ -72,16 +72,6 @@ public final class Signature extends Att
     }
 
     /**
-     * @return String representation
-     */
-    @Override
-    public final String toString() {
-        String s = getSignature();
-        return "Signature(" + s + ")";
-    }
-
-
-    /**
      * @return deep copy of this attribute
      */
     @Override

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/SimpleElementValue.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/SimpleElementValue.java?rev=1384051&r1=1384050&r2=1384051&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/SimpleElementValue.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/SimpleElementValue.java Wed Sep 12 17:47:43 2012
@@ -20,8 +20,6 @@ package org.apache.tomcat.util.bcel.clas
 import java.io.DataOutputStream;
 import java.io.IOException;
 
-import org.apache.tomcat.util.bcel.Constants;
-
 public class SimpleElementValue extends ElementValue
 {
     private int index;
@@ -42,64 +40,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()
-    {
-        switch (type)
-        {
-        case PRIMITIVE_INT:
-            ConstantInteger c = (ConstantInteger) cpool.getConstant(getIndex(),
-                    Constants.CONSTANT_Integer);
-            return Integer.toString(c.getBytes());
-        case PRIMITIVE_LONG:
-            ConstantLong j = (ConstantLong) cpool.getConstant(getIndex(),
-                    Constants.CONSTANT_Long);
-            return Long.toString(j.getBytes());
-        case PRIMITIVE_DOUBLE:
-            ConstantDouble d = (ConstantDouble) cpool.getConstant(getIndex(),
-                    Constants.CONSTANT_Double);
-            return Double.toString(d.getBytes());
-        case PRIMITIVE_FLOAT:
-            ConstantFloat f = (ConstantFloat) cpool.getConstant(getIndex(),
-                    Constants.CONSTANT_Float);
-            return Float.toString(f.getBytes());
-        case PRIMITIVE_SHORT:
-            ConstantInteger s = (ConstantInteger) cpool.getConstant(getIndex(),
-                    Constants.CONSTANT_Integer);
-            return Integer.toString(s.getBytes());
-        case PRIMITIVE_BYTE:
-            ConstantInteger b = (ConstantInteger) cpool.getConstant(getIndex(),
-                    Constants.CONSTANT_Integer);
-            return Integer.toString(b.getBytes());
-        case PRIMITIVE_CHAR:
-            ConstantInteger ch = (ConstantInteger) cpool.getConstant(
-                    getIndex(), Constants.CONSTANT_Integer);
-            return String.valueOf((char)ch.getBytes());
-        case PRIMITIVE_BOOLEAN:
-            ConstantInteger bo = (ConstantInteger) cpool.getConstant(
-                    getIndex(), Constants.CONSTANT_Integer);
-            if (bo.getBytes() == 0) {
-                return "false";
-            }
-            return "true";
-        case STRING:
-            ConstantUtf8 cu8 = (ConstantUtf8) cpool.getConstant(getIndex(),
-                    Constants.CONSTANT_Utf8);
-            return cu8.getBytes();
-        default:
-            throw new RuntimeException(
-                    "SimpleElementValue class does not know how to stringify type "
-                            + type);
-        }
-    }
-
-    @Override
     public void dump(DataOutputStream dos) throws IOException
     {
         dos.writeByte(type); // u1 kind of value

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/SourceFile.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/SourceFile.java?rev=1384051&r1=1384050&r2=1384051&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/SourceFile.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/SourceFile.java Wed Sep 12 17:47:43 2012
@@ -82,15 +82,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/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMap.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMap.java?rev=1384051&r1=1384050&r2=1384051&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMap.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMap.java Wed Sep 12 17:47:43 2012
@@ -85,23 +85,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/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapEntry.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapEntry.java?rev=1384051&r1=1384050&r2=1384051&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapEntry.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapEntry.java Wed Sep 12 17:47:43 2012
@@ -93,38 +93,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() {

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapTable.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapTable.java?rev=1384051&r1=1384050&r2=1384051&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapTable.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapTable.java Wed Sep 12 17:47:43 2012
@@ -85,23 +85,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/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapTableEntry.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapTableEntry.java?rev=1384051&r1=1384050&r2=1384051&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapTableEntry.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapTableEntry.java Wed Sep 12 17:47:43 2012
@@ -150,56 +150,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/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapType.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapType.java?rev=1384051&r1=1384050&r2=1384051&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapType.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapType.java Wed Sep 12 17:47:43 2012
@@ -125,15 +125,6 @@ public final class StackMapType implemen
 
 
     /**
-     * @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 ) {

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Synthetic.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Synthetic.java?rev=1384051&r1=1384050&r2=1384051&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Synthetic.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Synthetic.java Wed Sep 12 17:47:43 2012
@@ -75,19 +75,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/trunk/java/org/apache/tomcat/util/bcel/classfile/Unknown.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Unknown.java?rev=1384051&r1=1384050&r2=1384051&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Unknown.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Unknown.java Wed Sep 12 17:47:43 2012
@@ -94,26 +94,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



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message