Author: markt
Date: Mon Dec 7 17:11:10 2009
New Revision: 888010
URL: http://svn.apache.org/viewvc?rev=888010&view=rev
Log:
Remove remains of generic package
More clean up
Removed:
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/
Modified:
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationEntry.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ClassElementValue.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ElementValue.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ElementValuePair.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/EnumElementValue.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/SimpleElementValue.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Utility.java
Modified:
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationEntry.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationEntry.java?rev=888010&r1=888009&r2=888010&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationEntry.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationEntry.java
Mon Dec 7 17:11:10 2009
@@ -76,13 +76,7 @@
return c.getBytes();
}
- /**
- * @return the annotation type index
- */
- public int getAnnotationTypeIndex()
- {
- return type_index;
- }
+
@@ -108,15 +102,9 @@
}
- public boolean isRuntimeVisible()
- {
- return isRuntimeVisible;
- }
+
- public void addElementNameValuePair(ElementValuePair
elementNameValuePair)
- {
- element_value_pairs.add(elementNameValuePair);
- }
+
}
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=888010&r1=888009&r2=888010&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
Mon Dec 7 17:11:10 2009
@@ -17,17 +17,9 @@
this.idx = idx;
}
- public int getIndex()
- {
- return idx;
- }
+
- public String getClassString()
- {
- ConstantUtf8 c = (ConstantUtf8) cpool.getConstant(idx,
- Constants.CONSTANT_Utf8);
- return c.getBytes();
- }
+
public String stringifyValue()
{
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=888010&r1=888009&r2=888010&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
Mon Dec 7 17:11:10 2009
@@ -31,7 +31,6 @@
* @version $Id$
* @see Constant
- * @see org.apache.tomcat.util.bcel.generic.ConstantPoolGen
* @author <A HREF="mailto:m.d...@gmx.de";>M. Dahm</A>
*/
public class ConstantPool implements Cloneable, Serializable {
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=888010&r1=888009&r2=888010&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
Mon Dec 7 17:11:10 2009
@@ -42,10 +42,7 @@
this.cpool = cpool;
}
- public int getElementValueType()
- {
- return type;
- }
+
public abstract String stringifyValue();
Modified:
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ElementValuePair.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ElementValuePair.java?rev=888010&r1=888009&r2=888010&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ElementValuePair.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ElementValuePair.java
Mon Dec 7 17:11:10 2009
@@ -55,10 +55,7 @@
return elementValue;
}
- public int getNameIndex()
- {
- return elementNameIndex;
- }
+
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=888010&r1=888009&r2=888010&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
Mon Dec 7 17:11:10 2009
@@ -36,27 +36,11 @@
return cu8.getBytes();
}
- public String getEnumTypeString()
- {
- ConstantUtf8 cu8 = (ConstantUtf8) cpool.getConstant(typeIdx,
- Constants.CONSTANT_Utf8);
- return cu8.getBytes();//
Utility.signatureToString(cu8.getBytes());
- }
+
- public String getEnumValueString()
- {
- ConstantUtf8 cu8 = (ConstantUtf8) cpool.getConstant(valueIdx,
- Constants.CONSTANT_Utf8);
- return cu8.getBytes();
- }
+
- public int getValueIndex()
- {
- return valueIdx;
- }
+
- public int getTypeIndex()
- {
- return typeIdx;
- }
+
}
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=888010&r1=888009&r2=888010&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
Mon Dec 7 17:11:10 2009
@@ -40,90 +40,23 @@
- public String getValueString()
- {
- if (type != STRING)
- throw new RuntimeException(
- "Dont call getValueString() on a non
STRING ElementValue");
- ConstantUtf8 c = (ConstantUtf8) cpool.getConstant(getIndex(),
- Constants.CONSTANT_Utf8);
- return c.getBytes();
- }
+
- public int getValueInt()
- {
- if (type != PRIMITIVE_INT)
- throw new RuntimeException(
- "Dont call getValueString() on a non
STRING ElementValue");
- ConstantInteger c = (ConstantInteger)
cpool.getConstant(getIndex(),
- Constants.CONSTANT_Integer);
- return c.getBytes();
- }
+
- public byte getValueByte()
- {
- if (type != PRIMITIVE_BYTE)
- throw new RuntimeException(
- "Dont call getValueByte() on a non BYTE
ElementValue");
- ConstantInteger c = (ConstantInteger)
cpool.getConstant(getIndex(),
- Constants.CONSTANT_Integer);
- return (byte) c.getBytes();
- }
+
- public char getValueChar()
- {
- if (type != PRIMITIVE_CHAR)
- throw new RuntimeException(
- "Dont call getValueChar() on a non CHAR
ElementValue");
- ConstantInteger c = (ConstantInteger)
cpool.getConstant(getIndex(),
- Constants.CONSTANT_Integer);
- return (char) c.getBytes();
- }
+
- public long getValueLong()
- {
- if (type != PRIMITIVE_LONG)
- throw new RuntimeException(
- "Dont call getValueLong() on a non LONG
ElementValue");
- ConstantLong j = (ConstantLong) cpool.getConstant(getIndex());
- return j.getBytes();
- }
+
- public float getValueFloat()
- {
- if (type != PRIMITIVE_FLOAT)
- throw new RuntimeException(
- "Dont call getValueFloat() on a non
FLOAT ElementValue");
- ConstantFloat f = (ConstantFloat) cpool.getConstant(getIndex());
- return f.getBytes();
- }
+
- public double getValueDouble()
- {
- if (type != PRIMITIVE_DOUBLE)
- throw new RuntimeException(
- "Dont call getValueDouble() on a non
DOUBLE ElementValue");
- ConstantDouble d = (ConstantDouble)
cpool.getConstant(getIndex());
- return d.getBytes();
- }
+
- public boolean getValueBoolean()
- {
- if (type != PRIMITIVE_BOOLEAN)
- throw new RuntimeException(
- "Dont call getValueBoolean() on a non
BOOLEAN ElementValue");
- ConstantInteger bo = (ConstantInteger)
cpool.getConstant(getIndex());
- return (bo.getBytes() != 0);
- }
+
- public short getValueShort()
- {
- if (type != PRIMITIVE_SHORT)
- throw new RuntimeException(
- "Dont call getValueShort() on a non
SHORT ElementValue");
- ConstantInteger s = (ConstantInteger)
cpool.getConstant(getIndex());
- return (short) s.getBytes();
- }
+
public String toString()
{
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Utility.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Utility.java?rev=888010&r1=888009&r2=888010&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Utility.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Utility.java Mon
Dec 7 17:11:10 2009
@@ -741,19 +741,7 @@
}
- /**
- * Return a string for an integer justified left or right and filled up
with
- * `fill' characters if necessary.
- *
- * @param i integer to format
- * @param length length of desired string
- * @param left_justify format left or right
- * @param fill fill character
- * @return formatted int
- */
- public static final String format( int i, int length, boolean
left_justify, char fill ) {
- return fillup(Integer.toString(i), length, left_justify, fill);
- }
+
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
