From 22bab55bcdb19603af3f32a3754a02058adfddea Mon Sep 17 00:00:00 2001 From: markt Date: Mon, 7 Dec 2009 17:22:24 +0000 Subject: [PATCH] More clean up git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@888027 13f79535-47bb-0310-9956-ffa450edef68 --- java/org/apache/tomcat/util/bcel/Constants.java | 4 +--- .../tomcat/util/bcel/classfile/ConstantPool.java | 19 +------------------ .../tomcat/util/bcel/classfile/ConstantUtf8.java | 11 +---------- 3 files changed, 3 insertions(+), 31 deletions(-) diff --git a/java/org/apache/tomcat/util/bcel/Constants.java b/java/org/apache/tomcat/util/bcel/Constants.java index 3c23ec67d..3adb99515 100644 --- a/java/org/apache/tomcat/util/bcel/Constants.java +++ b/java/org/apache/tomcat/util/bcel/Constants.java @@ -284,9 +284,7 @@ public interface Constants { public static final byte T_SHORT = 9; /** Int data type. */ public static final byte T_INT = 10; - - /** Object data type. */ - public static final byte T_OBJECT = 14; + /** Unknown data type. */ public static final byte T_UNKNOWN = 15; diff --git a/java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java b/java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java index 98e0b102d..c4059e5ee 100644 --- a/java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java +++ b/java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java @@ -39,12 +39,7 @@ public class ConstantPool implements Cloneable, Serializable { private Constant[] constant_pool; - /** - * @param constant_pool Array of constants - */ - public ConstantPool(Constant[] constant_pool) { - setConstantPool(constant_pool); - } + /** @@ -274,18 +269,6 @@ public class ConstantPool implements Cloneable, Serializable { } - - - - /** - * @param constant_pool - */ - public void setConstantPool( Constant[] constant_pool ) { - this.constant_pool = constant_pool; - constant_pool_count = (constant_pool == null) ? 0 : constant_pool.length; - } - - /** * @return String representation. */ diff --git a/java/org/apache/tomcat/util/bcel/classfile/ConstantUtf8.java b/java/org/apache/tomcat/util/bcel/classfile/ConstantUtf8.java index a1e1f99a8..654ce5777 100644 --- a/java/org/apache/tomcat/util/bcel/classfile/ConstantUtf8.java +++ b/java/org/apache/tomcat/util/bcel/classfile/ConstantUtf8.java @@ -51,16 +51,7 @@ public final class ConstantUtf8 extends Constant { } - /** - * @param bytes Data - */ - public ConstantUtf8(String bytes) { - super(Constants.CONSTANT_Utf8); - if (bytes == null) { - throw new IllegalArgumentException("bytes must not be null!"); - } - this.bytes = bytes; - } + /** -- 2.11.0