svn commit: r1624500 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/tomcat/util/bcel/ java/org/apache/tomcat/util/bcel/classfile/

[markt]

Author: markt
Date: Fri Sep 12 11:28:01 2014
New Revision: 1624500

URL: http://svn.apache.org/r1624500
Log:
Merge cosmetic changes from trunk. No functional change.

Modified:
    tomcat/tc7.0.x/trunk/   (props changed)
    tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/   (props changed)
    
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ElementValue.java
    
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/LocalVariableTypeTable.java
    
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/RuntimeInvisibleAnnotations.java

Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
  Merged /tomcat/trunk:r1609334

Propchange: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/
------------------------------------------------------------------------------
  Merged /tomcat/trunk/java/org/apache/tomcat/util/bcel:r1609334
  Merged 
/commons/proper/bcel/trunk/src/main/java/org/apache/bcel:r1593496-1609331

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ElementValue.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ElementValue.java?rev=1624500&r1=1624499&r2=1624500&view=diff
==============================================================================
--- 
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ElementValue.java
 (original)
+++ 
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ElementValue.java
 Fri Sep 12 11:28:01 2014
@@ -43,7 +43,6 @@ public abstract class ElementValue
         this.cpool = cpool;
     }
 
-
     public abstract String stringifyValue();
 
     public abstract void dump(DataOutputStream dos) throws IOException;

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/LocalVariableTypeTable.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/LocalVariableTypeTable.java?rev=1624500&r1=1624499&r2=1624500&view=diff
==============================================================================
--- 
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/LocalVariableTypeTable.java
 (original)
+++ 
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/LocalVariableTypeTable.java
 Fri Sep 12 11:28:01 2014
@@ -24,16 +24,16 @@ import org.apache.tomcat.util.bcel.Const
 // 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/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/RuntimeInvisibleAnnotations.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/RuntimeInvisibleAnnotations.java?rev=1624500&r1=1624499&r2=1624500&view=diff
==============================================================================
--- 
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/RuntimeInvisibleAnnotations.java
 (original)
+++ 
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/RuntimeInvisibleAnnotations.java
 Fri Sep 12 11:28:01 2014
@@ -44,8 +44,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(Constants.ATTR_RUNTIME_INVISIBLE_ANNOTATIONS, name_index, length,
                 file, constant_pool);



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