Author: markt
Date: Fri Sep 3 17:50:32 2010
New Revision: 992394
URL: http://svn.apache.org/viewvc?rev=992394&view=rev
Log:
Trace through some unused code and remove it.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationEntry.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Annotations.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ElementValue.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ParameterAnnotationEntry.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/RuntimeInvisibleAnnotations.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/RuntimeVisibleAnnotations.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=992394&r1=992393&r2=992394&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
Fri Sep 3 17:50:32 2010
@@ -39,7 +39,6 @@ public class AnnotationEntry implements
private int type_index;
private ConstantPool constant_pool;
- private boolean isRuntimeVisible;
private List element_value_pairs;
@@ -51,9 +50,9 @@ public class AnnotationEntry implements
* @param isRuntimeVisible
* @throws IOException
*/
- public static AnnotationEntry read(DataInputStream file, ConstantPool
constant_pool, boolean isRuntimeVisible) throws IOException {
+ public static AnnotationEntry read(DataInputStream file, ConstantPool
constant_pool) throws IOException {
- final AnnotationEntry annotationEntry = new
AnnotationEntry(file.readUnsignedShort(), constant_pool, isRuntimeVisible);
+ final AnnotationEntry annotationEntry = new
AnnotationEntry(file.readUnsignedShort(), constant_pool);
final int num_element_value_pairs = (file.readUnsignedShort());
annotationEntry.element_value_pairs = new ArrayList();
for (int i = 0; i < num_element_value_pairs; i++) {
@@ -63,10 +62,9 @@ public class AnnotationEntry implements
return annotationEntry;
}
- public AnnotationEntry(int type_index, ConstantPool constant_pool, boolean
isRuntimeVisible) {
+ public AnnotationEntry(int type_index, ConstantPool constant_pool) {
this.type_index = type_index;
this.constant_pool = constant_pool;
- this.isRuntimeVisible = isRuntimeVisible;
}
/**
Modified:
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Annotations.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Annotations.java?rev=992394&r1=992393&r2=992394&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Annotations.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Annotations.java
Fri Sep 3 17:50:32 2010
@@ -41,12 +41,12 @@ public abstract class Annotations extend
* @param file Input stream
* @param constant_pool Array of constants
*/
- public Annotations(byte annotation_type, int name_index, int length,
DataInputStream file, ConstantPool constant_pool, boolean isRuntimeVisible)
throws IOException {
+ public Annotations(byte annotation_type, int name_index, int length,
DataInputStream file, ConstantPool constant_pool) throws IOException {
this(annotation_type, name_index, length, (AnnotationEntry[]) null,
constant_pool);
final int annotation_table_length = (file.readUnsignedShort());
annotation_table = new AnnotationEntry[annotation_table_length];
for (int i = 0; i < annotation_table_length; i++) {
- annotation_table[i] = AnnotationEntry.read(file, constant_pool,
isRuntimeVisible);
+ annotation_table[i] = AnnotationEntry.read(file, constant_pool);
}
}
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=992394&r1=992393&r2=992394&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
Fri Sep 3 17:50:32 2010
@@ -116,7 +116,7 @@ public abstract class ElementValue
case '@': // Annotation
// TODO isRuntimeVisible
return new AnnotationElementValue(ANNOTATION, AnnotationEntry.read(
- dis, cpool, false), cpool);
+ dis, cpool), cpool);
case '[': // Array
int numArrayVals = dis.readUnsignedShort();
ElementValue[] evalues = new ElementValue[numArrayVals];
Modified:
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ParameterAnnotationEntry.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ParameterAnnotationEntry.java?rev=992394&r1=992393&r2=992394&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ParameterAnnotationEntry.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ParameterAnnotationEntry.java
Fri Sep 3 17:50:32 2010
@@ -44,8 +44,7 @@ public class ParameterAnnotationEntry im
annotation_table_length = (file.readUnsignedShort());
annotation_table = new AnnotationEntry[annotation_table_length];
for (int i = 0; i < annotation_table_length; i++) {
- // TODO isRuntimeVisible
- annotation_table[i] = AnnotationEntry.read(file, constant_pool,
false);
+ annotation_table[i] = AnnotationEntry.read(file, constant_pool);
}
}
Modified:
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/RuntimeInvisibleAnnotations.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/RuntimeInvisibleAnnotations.java?rev=992394&r1=992393&r2=992394&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/RuntimeInvisibleAnnotations.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/RuntimeInvisibleAnnotations.java
Fri Sep 3 17:50:32 2010
@@ -50,7 +50,7 @@ public class RuntimeInvisibleAnnotations
throws IOException
{
super(Constants.ATTR_RUNTIMEIN_VISIBLE_ANNOTATIONS, name_index, length,
- file, constant_pool, false);
+ file, constant_pool);
}
/**
Modified:
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/RuntimeVisibleAnnotations.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/RuntimeVisibleAnnotations.java?rev=992394&r1=992393&r2=992394&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/RuntimeVisibleAnnotations.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/RuntimeVisibleAnnotations.java
Fri Sep 3 17:50:32 2010
@@ -50,7 +50,7 @@ public class RuntimeVisibleAnnotations e
throws IOException
{
super(Constants.ATTR_RUNTIME_VISIBLE_ANNOTATIONS, name_index, length,
- file, constant_pool, true);
+ file, constant_pool);
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
