Author: markt
Date: Wed Jul 9 22:48:55 2014
New Revision: 1609334
URL: http://svn.apache.org/r1609334
Log:
Merge BCEL changes to r1609331. No fucntional change. Cosmetic changes only.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/bcel/ (props changed)
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ElementValue.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/LocalVariableTypeTable.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/RuntimeInvisibleAnnotations.java
Propchange: tomcat/trunk/java/org/apache/tomcat/util/bcel/
------------------------------------------------------------------------------
Merged
/commons/proper/bcel/trunk/src/main/java/org/apache/bcel:r1593496-1609331
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=1609334&r1=1609333&r2=1609334&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 Jul 9 22:48:55 2014
@@ -37,7 +37,6 @@ public abstract class ElementValue
this.cpool = cpool;
}
-
public abstract String stringifyValue();
public static final int STRING = 's';
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=1609334&r1=1609333&r2=1609334&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 Jul 9 22:48:55 2014
@@ -22,16 +22,16 @@ import java.io.IOException;
// The new table is used when generic types are about...
//LocalVariableTable_attribute {
-// u2 attribute_name_index;
-// u4 attribute_length;
-// u2 local_variable_table_length;
-// { u2 start_pc;
-// u2 length;
-// u2 name_index;
-// u2 descriptor_index;
-// u2 index;
-// } local_variable_table[local_variable_table_length];
-// }
+// u2 attribute_name_index;
+// u4 attribute_length;
+// u2 local_variable_table_length;
+// { u2 start_pc;
+// u2 length;
+// u2 name_index;
+// u2 descriptor_index;
+// u2 index;
+// } local_variable_table[local_variable_table_length];
+// }
//LocalVariableTypeTable_attribute {
// u2 attribute_name_index;
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=1609334&r1=1609333&r2=1609334&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
Wed Jul 9 22:48:55 2014
@@ -42,8 +42,8 @@ public class RuntimeInvisibleAnnotations
* Array of constants
*/
RuntimeInvisibleAnnotations(int name_index, int length,
- DataInputStream file, ConstantPool
constant_pool)
- throws IOException
+ DataInputStream file, ConstantPool constant_pool)
+ throws IOException
{
super(name_index, length, file, constant_pool);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
