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

[markt]

Author: markt
Date: Wed Sep 17 12:21:05 2014
New Revision: 1625547

URL: http://svn.apache.org/r1625547
Log:
Flatten class hierarchy.  The only subtype of Annotations class is 
RuntimeVisibleAnnotations.
Port of r1624605 from trunk

Removed:
    
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/RuntimeVisibleAnnotations.java
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/Annotations.java
    
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Attribute.java

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

Propchange: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/
------------------------------------------------------------------------------
  Merged /tomcat/trunk/java/org/apache/tomcat/util/bcel:r1624605

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Annotations.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Annotations.java?rev=1625547&r1=1625546&r2=1625547&view=diff
==============================================================================
--- 
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Annotations.java
 (original)
+++ 
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Annotations.java
 Wed Sep 17 12:21:05 2014
@@ -26,7 +26,7 @@ import java.io.IOException;
  * @author  <A HREF="mailto:dbros...@qis.net";>D. Brosius</A>
  * @since 6.0
  */
-public abstract class Annotations extends Attribute {
+public class Annotations extends Attribute {
 
     private final AnnotationEntry[] annotation_table;
     

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Attribute.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Attribute.java?rev=1625547&r1=1625546&r2=1625547&view=diff
==============================================================================
--- 
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Attribute.java 
(original)
+++ 
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Attribute.java 
Wed Sep 17 12:21:05 2014
@@ -65,7 +65,7 @@ public abstract class Attribute {
 
         // Call proper constructor, depending on `name'
         if (name.equals("RuntimeVisibleAnnotations")) {
-            return new RuntimeVisibleAnnotations(file, constant_pool);
+            return new Annotations(file, constant_pool);
         } else {
             // All other attributes are skipped
             Utility.skipFully(file, length);



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