source locations for declare annos (not persisted) and fqname of handles for itds

diff --git a/asm/src/org/aspectj/asm/IProgramElement.java b/asm/src/org/aspectj/asm/IProgramElement.java
index ccf59247fc778e01db1f5820a973605978c90fdb..eedffc3a2add3414eb3943bc39fb5b31dbe11d76 100644 (file)
--- a/asm/src/org/aspectj/asm/IProgramElement.java
+++ b/asm/src/org/aspectj/asm/IProgramElement.java
@@ -419,4 +419,8 @@ public interface IProgramElement extends Serializable {
        public Map<String, List<String>> getDeclareParentsMap();
 
        public void setDeclareParentsMap(Map<String, List<String>> newmap);
+
+       public void addFullyQualifiedName(String fqname);
+
+       public String getFullyQualifiedName();
 }
\ No newline at end of file

diff --git a/asm/src/org/aspectj/asm/internal/JDTLikeHandleProvider.java b/asm/src/org/aspectj/asm/internal/JDTLikeHandleProvider.java
index bcf8fbf4925cedb092193d2acc04a405a22d2883..7a38eafb577216a604f66ee75bd06347a16981f6 100644 (file)
--- a/asm/src/org/aspectj/asm/internal/JDTLikeHandleProvider.java
+++ b/asm/src/org/aspectj/asm/internal/JDTLikeHandleProvider.java
@@ -109,7 +109,12 @@ public class JDTLikeHandleProvider implements IElementHandleProvider {
                                                // escape the @ (pr249216c9)
                                                handle.append("declare \\@").append(ipe.getName().substring(9)).append(getParameters(ipe));
                                        } else {
-                                               handle.append(ipe.getName()).append(getParameters(ipe));
+                                               if (ipe.getFullyQualifiedName() != null) {
+                                                       handle.append(ipe.getFullyQualifiedName());
+                                               } else {
+                                                       handle.append(ipe.getName());
+                                               }
+                                               handle.append(getParameters(ipe));
                                        }
                                }
                                // }

diff --git a/asm/src/org/aspectj/asm/internal/ProgramElement.java b/asm/src/org/aspectj/asm/internal/ProgramElement.java
index 1462449b74cebaa0922803c8317c706c8f688146..8193acf6d352797fab7a8d0cf1cb48d9b65bf705 100644 (file)
--- a/asm/src/org/aspectj/asm/internal/ProgramElement.java
+++ b/asm/src/org/aspectj/asm/internal/ProgramElement.java
@@ -677,4 +677,13 @@ public class ProgramElement implements IProgramElement {
        public void setDeclareParentsMap(Map<String, List<String>> newmap) {
                kvpairs.put("declareparentsmap", newmap);
        }
+
+       public void addFullyQualifiedName(String fqname) {
+               fixMap();
+               kvpairs.put("itdfqname", fqname);
+       }
+
+       public String getFullyQualifiedName() {
+               return (String) kvpairs.get("itdfqname");
+       }
 }