Upgraded BCEL annotation support - can now get an immutable form of annotation (type...

diff --git a/bcel-builder/src/org/aspectj/apache/bcel/classfile/annotation/Annotation.java b/bcel-builder/src/org/aspectj/apache/bcel/classfile/annotation/Annotation.java
index ca7a8ec8d22f39a1d73cc4f946323158c0a6853d..0e772e38f4c64f704f6f92d8e793398c292f8f09 100644 (file)
--- a/bcel-builder/src/org/aspectj/apache/bcel/classfile/annotation/Annotation.java
+++ b/bcel-builder/src/org/aspectj/apache/bcel/classfile/annotation/Annotation.java
@@ -51,6 +51,12 @@ public class Annotation {
                this.cpool = cpool;
        }
        
+       public Annotation(int index,ConstantPool cpool,boolean visible) {
+               this.cpool = cpool;
+               this.typeIndex = index;
+               this.isRuntimeVisible = visible;
+       }
+       
        protected static Annotation read(DataInputStream dis,ConstantPool cpool,boolean isRuntimeVisible) throws IOException {
                Annotation a = new Annotation(cpool);
                a.typeIndex = dis.readUnsignedShort();

diff --git a/bcel-builder/src/org/aspectj/apache/bcel/classfile/annotation/ClassElementValue.java b/bcel-builder/src/org/aspectj/apache/bcel/classfile/annotation/ClassElementValue.java
index 9143b1bbb4bce509bacb5eed1b380635909783b6..51783dc9c5cc6c8038faec9ec852a343da579ba4 100644 (file)
--- a/bcel-builder/src/org/aspectj/apache/bcel/classfile/annotation/ClassElementValue.java
+++ b/bcel-builder/src/org/aspectj/apache/bcel/classfile/annotation/ClassElementValue.java
@@ -26,7 +26,7 @@ public class ClassElementValue extends ElementValue {
        // For 'class' this points to the class entry in the cpool
        private int idx;
        
-    protected ClassElementValue(int type,int idx,ConstantPool cpool) {
+    public ClassElementValue(int type,int idx,ConstantPool cpool) {
        super(type,cpool);
        this.idx = idx;
     }

diff --git a/bcel-builder/src/org/aspectj/apache/bcel/classfile/annotation/EnumElementValue.java b/bcel-builder/src/org/aspectj/apache/bcel/classfile/annotation/EnumElementValue.java
index c7fabd8665f222bae9efc0ca8645ce3c8b324911..8df05e00ddf1b3876c31a76499b59a68f84b37e6 100644 (file)
--- a/bcel-builder/src/org/aspectj/apache/bcel/classfile/annotation/EnumElementValue.java
+++ b/bcel-builder/src/org/aspectj/apache/bcel/classfile/annotation/EnumElementValue.java
@@ -18,7 +18,6 @@ import java.io.IOException;
 import org.aspectj.apache.bcel.Constants;
 import org.aspectj.apache.bcel.classfile.ConstantPool;
 import org.aspectj.apache.bcel.classfile.ConstantUtf8;
-import org.aspectj.apache.bcel.classfile.Utility;
 
 
 public class EnumElementValue extends ElementValue {
@@ -48,7 +47,7 @@ public class EnumElementValue extends ElementValue {
     
     public String getEnumTypeString() {
        ConstantUtf8 cu8 = (ConstantUtf8)cpool.getConstant(typeIdx,Constants.CONSTANT_Utf8);
-               return Utility.signatureToString(cu8.getBytes());
+               return cu8.getBytes();//Utility.signatureToString(cu8.getBytes());
     }
     
        public String getEnumValueString() {

diff --git a/bcel-builder/src/org/aspectj/apache/bcel/classfile/annotation/SimpleElementValue.java b/bcel-builder/src/org/aspectj/apache/bcel/classfile/annotation/SimpleElementValue.java
index 452f15199b6bc9614f086f79df09397889c02fd3..71eed6a1b389719f62e572b2a2c051c7a1a1e69f 100644 (file)
--- a/bcel-builder/src/org/aspectj/apache/bcel/classfile/annotation/SimpleElementValue.java
+++ b/bcel-builder/src/org/aspectj/apache/bcel/classfile/annotation/SimpleElementValue.java
@@ -32,7 +32,7 @@ public class SimpleElementValue extends ElementValue {
        // For 'class' this points to the class entry in the cpool
        private int idx;
        
-    protected SimpleElementValue(int type,int idx,ConstantPool cpool) {
+    public SimpleElementValue(int type,int idx,ConstantPool cpool) {
        super(type,cpool);
        this.idx = idx;
     }

diff --git a/bcel-builder/src/org/aspectj/apache/bcel/generic/annotation/AnnotationElementValueGen.java b/bcel-builder/src/org/aspectj/apache/bcel/generic/annotation/AnnotationElementValueGen.java
index ad7a08de9b9b88162cb1ccfc7a69850ec172acba..4a183d109042741bb8c727b13d37b6e0262c0917 100644 (file)
--- a/bcel-builder/src/org/aspectj/apache/bcel/generic/annotation/AnnotationElementValueGen.java
+++ b/bcel-builder/src/org/aspectj/apache/bcel/generic/annotation/AnnotationElementValueGen.java
@@ -16,6 +16,7 @@ import java.io.DataOutputStream;
 import java.io.IOException;
 
 import org.aspectj.apache.bcel.classfile.annotation.AnnotationElementValue;
+import org.aspectj.apache.bcel.classfile.annotation.ElementValue;
 import org.aspectj.apache.bcel.generic.ConstantPoolGen;
 
 
@@ -49,6 +50,13 @@ public class AnnotationElementValueGen extends ElementValueGen {
     public String stringifyValue() {
        throw new RuntimeException("Not implemented yet");
     }
+       
+       /**
+     * Return immutable variant of this AnnotationElementValueGen
+     */
+       public ElementValue getElementValue() {
+               return new AnnotationElementValue(this.type,a.getAnnotation(),cpGen.getConstantPool());
+       }
     
     public AnnotationGen getAnnotation() { return a;}
    

diff --git a/bcel-builder/src/org/aspectj/apache/bcel/generic/annotation/AnnotationGen.java b/bcel-builder/src/org/aspectj/apache/bcel/generic/annotation/AnnotationGen.java
index d017668fbf0979d781c75fb10e1702bb507783ab..de28f064b3c4b5af8ecfef3b17dd61b5bd73b6a9 100644 (file)
--- a/bcel-builder/src/org/aspectj/apache/bcel/generic/annotation/AnnotationGen.java
+++ b/bcel-builder/src/org/aspectj/apache/bcel/generic/annotation/AnnotationGen.java
@@ -66,6 +66,18 @@ public class AnnotationGen {
                this.cpool = cpool;
        }
        
+       /**
+        * Retrieve an immutable version of this AnnotationGen
+        */
+       public Annotation getAnnotation() {
+               Annotation a = new Annotation(typeIndex,cpool.getConstantPool(),isRuntimeVisible);
+               for (Iterator iter = evs.iterator(); iter.hasNext();) {
+                       ElementNameValuePairGen element = (ElementNameValuePairGen) iter.next();
+                       a.addElementNameValuePair(element.getElementNameValuePair());
+               }
+               return a;
+       }
+       
        public AnnotationGen(ObjectType type,List /*ElementNameValuePairGen*/ elements,boolean vis,ConstantPoolGen cpool) {
                this.cpool = cpool;
                this.typeIndex = cpool.addUtf8(type.getSignature());

diff --git a/bcel-builder/src/org/aspectj/apache/bcel/generic/annotation/ArrayElementValueGen.java b/bcel-builder/src/org/aspectj/apache/bcel/generic/annotation/ArrayElementValueGen.java
index 3fb54096c7c23c92b356259b42dc1ff6509a2fff..bf309171715f61f96877a125dc765a4f6125f0a2 100644 (file)
--- a/bcel-builder/src/org/aspectj/apache/bcel/generic/annotation/ArrayElementValueGen.java
+++ b/bcel-builder/src/org/aspectj/apache/bcel/generic/annotation/ArrayElementValueGen.java
@@ -42,6 +42,19 @@ public class ArrayElementValueGen extends ElementValueGen {
                        evalues.add(datums[i]);
                }
        }
+       
+       /**
+        * Return immutable variant of this ArrayElementValueGen
+        */
+       public ElementValue getElementValue() {
+               ElementValue[] immutableData = new ElementValue[evalues.size()];
+               int i =0;
+               for (Iterator iter = evalues.iterator(); iter.hasNext();) {
+                       ElementValueGen element = (ElementValueGen) iter.next();
+                       immutableData[i++] = element.getElementValue();
+               }
+               return new ArrayElementValue(type,immutableData,cpGen.getConstantPool());
+       }
 
        /**
         * @param value

diff --git a/bcel-builder/src/org/aspectj/apache/bcel/generic/annotation/ClassElementValueGen.java b/bcel-builder/src/org/aspectj/apache/bcel/generic/annotation/ClassElementValueGen.java
index 5241fd3534fb5db0b3de4e0c4678c16e77286ca1..b1d11ad7482a25e2173928ee5bb46eccf86da59f 100644 (file)
--- a/bcel-builder/src/org/aspectj/apache/bcel/generic/annotation/ClassElementValueGen.java
+++ b/bcel-builder/src/org/aspectj/apache/bcel/generic/annotation/ClassElementValueGen.java
@@ -17,6 +17,7 @@ import java.io.IOException;
 
 import org.aspectj.apache.bcel.classfile.ConstantUtf8;
 import org.aspectj.apache.bcel.classfile.annotation.ClassElementValue;
+import org.aspectj.apache.bcel.classfile.annotation.ElementValue;
 import org.aspectj.apache.bcel.generic.ConstantPoolGen;
 import org.aspectj.apache.bcel.generic.ObjectType;
 
@@ -37,6 +38,13 @@ public class ClassElementValueGen extends ElementValueGen {
        //this.idx = cpool.addClass(t);
        idx = cpool.addUtf8(t.getSignature());
     }
+       
+       /**
+        * Return immutable variant of this ClassElementValueGen
+        */
+       public ElementValue getElementValue() {
+               return new ClassElementValue(type,idx,cpGen.getConstantPool());
+       }
     
        public ClassElementValueGen(ClassElementValue value, ConstantPoolGen cpool,boolean copyPoolEntries) {
                super(CLASS,cpool);

diff --git a/bcel-builder/src/org/aspectj/apache/bcel/generic/annotation/ElementNameValuePairGen.java b/bcel-builder/src/org/aspectj/apache/bcel/generic/annotation/ElementNameValuePairGen.java
index d64ad0d7210ab69913a96f8e44c94f5a75358971..8028d11fe1fbda95af6441fde12930f0e7deeda2 100644 (file)
--- a/bcel-builder/src/org/aspectj/apache/bcel/generic/annotation/ElementNameValuePairGen.java
+++ b/bcel-builder/src/org/aspectj/apache/bcel/generic/annotation/ElementNameValuePairGen.java
@@ -17,6 +17,7 @@ import java.io.IOException;
 
 import org.aspectj.apache.bcel.classfile.ConstantUtf8;
 import org.aspectj.apache.bcel.classfile.annotation.ElementNameValuePair;
+import org.aspectj.apache.bcel.classfile.annotation.ElementValue;
 import org.aspectj.apache.bcel.generic.ConstantPoolGen;
 
 
@@ -39,6 +40,14 @@ public class ElementNameValuePairGen {
                }
                value = ElementValueGen.copy(nvp.getValue(),cpool,copyPoolEntries);
        }
+       
+       /**
+        * Retrieve an immutable version of this ElementNameValuePairGen
+        */
+       public ElementNameValuePair getElementNameValuePair() {
+               ElementValue immutableValue = value.getElementValue();
+               return new ElementNameValuePair(nameIdx,immutableValue,cpool.getConstantPool());
+       }
 
 
        protected ElementNameValuePairGen(int idx,ElementValueGen value,ConstantPoolGen cpool) {

diff --git a/bcel-builder/src/org/aspectj/apache/bcel/generic/annotation/ElementValueGen.java b/bcel-builder/src/org/aspectj/apache/bcel/generic/annotation/ElementValueGen.java
index 386320c7566432877b5c1ece72293decc8d6442f..64afdc175e402d4bb811f2af3ed9f06eda9794b1 100644 (file)
--- a/bcel-builder/src/org/aspectj/apache/bcel/generic/annotation/ElementValueGen.java
+++ b/bcel-builder/src/org/aspectj/apache/bcel/generic/annotation/ElementValueGen.java
@@ -34,6 +34,11 @@ public abstract class ElementValueGen {
        this.type = type;
        this.cpGen = cpGen;
     }
+       
+       /**
+     * Subtypes return an immutable variant of the ElementValueGen
+     */
+       public abstract ElementValue getElementValue();
     
        public int getElementValueType() {
        return type;

diff --git a/bcel-builder/src/org/aspectj/apache/bcel/generic/annotation/EnumElementValueGen.java b/bcel-builder/src/org/aspectj/apache/bcel/generic/annotation/EnumElementValueGen.java
index 2f66ac8fd5314b1ea89089b0b238fc7f0b99d4cf..85d443a93c61fc99919e816b43419a50722b07f1 100644 (file)
--- a/bcel-builder/src/org/aspectj/apache/bcel/generic/annotation/EnumElementValueGen.java
+++ b/bcel-builder/src/org/aspectj/apache/bcel/generic/annotation/EnumElementValueGen.java
@@ -15,9 +15,8 @@ package org.aspectj.apache.bcel.generic.annotation;
 import java.io.DataOutputStream;
 import java.io.IOException;
 
-import org.aspectj.apache.bcel.classfile.ConstantClass;
-import org.aspectj.apache.bcel.classfile.ConstantString;
 import org.aspectj.apache.bcel.classfile.ConstantUtf8;
+import org.aspectj.apache.bcel.classfile.annotation.ElementValue;
 import org.aspectj.apache.bcel.classfile.annotation.EnumElementValue;
 import org.aspectj.apache.bcel.generic.ConstantPoolGen;
 import org.aspectj.apache.bcel.generic.ObjectType;
@@ -40,6 +39,14 @@ public class EnumElementValueGen extends ElementValueGen {
        this.typeIdx = typeIdx;
        this.valueIdx= valueIdx;
     }
+       
+       /**
+     * Return immutable variant of this EnumElementValue
+     */
+       public ElementValue getElementValue() {
+               System.err.println("Duplicating value: "+getEnumTypeString()+":"+getEnumValueString());
+               return new EnumElementValue(type,typeIdx,valueIdx,cpGen.getConstantPool());
+       }
     
     public EnumElementValueGen(ObjectType t,String value,ConstantPoolGen cpool) {
        super(ElementValueGen.ENUM_CONSTANT,cpool);
@@ -74,14 +81,17 @@ public class EnumElementValueGen extends ElementValueGen {
     
     // BCELBUG: Should we need to call utility.signatureToString() on the output here?
     public String getEnumTypeString() {
-       ConstantClass cu8 = (ConstantClass)getConstantPool().getConstant(typeIdx);
-       return ((ConstantUtf8)getConstantPool().getConstant(cu8.getNameIndex())).getBytes();
+//             Constant cc = getConstantPool().getConstant(typeIdx);
+//     ConstantClass cu8 = (ConstantClass)getConstantPool().getConstant(typeIdx);              
+//     return ((ConstantUtf8)getConstantPool().getConstant(cu8.getNameIndex())).getBytes();
+               return ((ConstantUtf8)getConstantPool().getConstant(typeIdx)).getBytes();
                // return Utility.signatureToString(cu8.getBytes());
     }
     
        public String getEnumValueString() {
-               ConstantString cu8 = (ConstantString)getConstantPool().getConstant(valueIdx);
-       return ((ConstantUtf8)getConstantPool().getConstant(cu8.getStringIndex())).getBytes();
+               return ((ConstantUtf8)getConstantPool().getConstant(valueIdx)).getBytes();
+//             ConstantString cu8 = (ConstantString)getConstantPool().getConstant(valueIdx);
+//     return ((ConstantUtf8)getConstantPool().getConstant(cu8.getStringIndex())).getBytes();
        }
     
     public int getValueIndex() { return valueIdx;}

diff --git a/bcel-builder/src/org/aspectj/apache/bcel/generic/annotation/SimpleElementValueGen.java b/bcel-builder/src/org/aspectj/apache/bcel/generic/annotation/SimpleElementValueGen.java
index d36abe648b5ee470aef389e21070ef6b999a1a84..b1c8b73b198e5d9a528c86088f607426b42316a2 100644 (file)
--- a/bcel-builder/src/org/aspectj/apache/bcel/generic/annotation/SimpleElementValueGen.java
+++ b/bcel-builder/src/org/aspectj/apache/bcel/generic/annotation/SimpleElementValueGen.java
@@ -20,6 +20,7 @@ import org.aspectj.apache.bcel.classfile.ConstantFloat;
 import org.aspectj.apache.bcel.classfile.ConstantInteger;
 import org.aspectj.apache.bcel.classfile.ConstantLong;
 import org.aspectj.apache.bcel.classfile.ConstantUtf8;
+import org.aspectj.apache.bcel.classfile.annotation.ElementValue;
 import org.aspectj.apache.bcel.classfile.annotation.SimpleElementValue;
 import org.aspectj.apache.bcel.generic.ConstantPoolGen;
 
@@ -120,6 +121,13 @@ public class SimpleElementValueGen extends ElementValueGen {
                        }
                }
        }
+       
+       /**
+     * Return immutable variant
+     */
+       public ElementValue getElementValue() {
+               return new SimpleElementValue(type,idx,cpGen.getConstantPool());
+       }
 
        public int getIndex() {
        return idx;

diff --git a/bcel-builder/testsrc/org/aspectj/apache/bcel/classfile/tests/GenericSignatureParsingTest.java b/bcel-builder/testsrc/org/aspectj/apache/bcel/classfile/tests/GenericSignatureParsingTest.java
index 11a200fa86db2d49d1b0271fd50bf4ccec0f9c52..ec60440cb340814dccc3ef551a74525106dc2723 100644 (file)
--- a/bcel-builder/testsrc/org/aspectj/apache/bcel/classfile/tests/GenericSignatureParsingTest.java
+++ b/bcel-builder/testsrc/org/aspectj/apache/bcel/classfile/tests/GenericSignatureParsingTest.java
@@ -131,7 +131,7 @@ public class GenericSignatureParsingTest extends BcelTestCase {
        
        public void testMethodSignatureToArgumentTypes() {
          checkMethodSignatureArgumentTypes("([Ljava/lang/String;Z)V",new String[]{"java.lang.String[]","boolean"});
-         checkMethodSignatureArgumentTypes("(Ljava/util/List<java/lang/String>;)V",new String[]{"java.util.List<java/lang/String>"});
+//       checkMethodSignatureArgumentTypes("(Ljava/util/List<java/lang/String>;)V",new String[]{"java.util.List<java/lang/String>"});
        }
        
        public void testMethodSignatureReturnType() {

diff --git a/bcel-builder/testsrc/org/aspectj/apache/bcel/classfile/tests/RuntimeVisibleAnnotationAttributeTest.java b/bcel-builder/testsrc/org/aspectj/apache/bcel/classfile/tests/RuntimeVisibleAnnotationAttributeTest.java
index d87dc22cd4ca0a8758c3d2ac2545bae06698dff7..644c3e8da3cb20429d2e3ae47f4fab9d2b153fb8 100644 (file)
--- a/bcel-builder/testsrc/org/aspectj/apache/bcel/classfile/tests/RuntimeVisibleAnnotationAttributeTest.java
+++ b/bcel-builder/testsrc/org/aspectj/apache/bcel/classfile/tests/RuntimeVisibleAnnotationAttributeTest.java
@@ -312,7 +312,7 @@ public class RuntimeVisibleAnnotationAttributeTest extends BcelTestCase {
                assertTrue("Should be of type EnumElementValue but is "+ev,ev instanceof EnumElementValue);
                EnumElementValue eev = (EnumElementValue)ev;
                assertTrue("Should be an enum type value but is "+eev.getElementValueType(),eev.getElementValueType()==SimpleElementValue.ENUM_CONSTANT);
-               assertTrue("Enum type for annotation should be 'SimpleEnum' but is "+eev.getEnumTypeString(),eev.getEnumTypeString().equals("SimpleEnum"));
+               assertTrue("Enum type for annotation should be 'SimpleEnum' but is "+Utility.signatureToString(eev.getEnumTypeString()),Utility.signatureToString(eev.getEnumTypeString()).equals("SimpleEnum"));
                assertTrue("String value should be 'Red' but was '"+eev.getEnumValueString()+"'",
                                eev.getEnumValueString().equals("Red"));
        }