From: aclement <aclement>
Date: Mon, 4 Jul 2005 14:59:57 +0000 (+0000)
Subject: generics: one fix to ensure the class we output says 'class X implement I' rather... 
X-Git-Tag: PRE_ANDY~94
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=47181c22c877e451b362b2a20b9cae0729f498a2;p=aspectj.git

generics: one fix to ensure the class we output says 'class X implement I' rather than 'class X implements I<String>' when the I<String> is added via declare parents.  (I<String> should be captured in the signature attribute on the class X).  Also some placeholder code added (commented out) that we'll need when trying to fix up the signature attribute when binary weaving.
---

diff --git a/weaver/src/org/aspectj/weaver/bcel/LazyClassGen.java b/weaver/src/org/aspectj/weaver/bcel/LazyClassGen.java
index 653da49a0..4989b6483 100644
--- a/weaver/src/org/aspectj/weaver/bcel/LazyClassGen.java
+++ b/weaver/src/org/aspectj/weaver/bcel/LazyClassGen.java
@@ -453,6 +453,27 @@ public final class LazyClassGen {
 			// of attribute are confirmed to be correct.
 			// myGen.addAttribute(getSourceDebugExtensionAttribute());
 		}
+		
+// TODO asc generics, fix up the declared signature attribute (dont need this just yet...)
+//		Attribute sigAttribute = null;
+//		Attribute[] as = myGen.getAttributes();
+//		for (int i = 0; i < as.length; i++) {
+//			Attribute attribute = as[i];
+//			if (attribute.getName().equals("Signature")) sigAttribute = attribute;
+//		}
+//		if (sigAttribute!=null) {
+//			// Got it
+//			myGen.removeAttribute(sigAttribute);
+//			
+//			int nameIndex = constantPoolGen.addUtf8("Signature");
+//			String data = ((Signature)sigAttribute).getSignature()+"LJ<java/"
+//			//System.err.println(data);
+//			byte[] bytes = Utility.stringToUTF(data);
+//			int length = bytes.length;
+//
+//			return new Unknown(nameIndex, length, bytes, constantPoolGen.getConstantPool());	
+//			new org.aspectj.apache.bcel.classfile.Signature((Signature)sigAttribute);
+//		}
     }
 
 	/**
@@ -497,7 +518,7 @@ public final class LazyClassGen {
     }
     
     public void addInterface(TypeX typeX, ISourceLocation sourceLocation) {
-    	myGen.addInterface(typeX.getName());
+    	myGen.addInterface(typeX.getRawName());
         if (!typeX.equals(TypeX.SERIALIZABLE)) 
 		  warnOnAddedInterface(typeX.getName(),sourceLocation);
     }