280380: don't include package name in itds

diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AsmElementFormatter.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AsmElementFormatter.java
index 20d74a724bec5600d8252d9f66a86b4a7cded599..ba5fe5b49f15b8cd9758bbb89cc0de15192dc1f1 100644 (file)
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AsmElementFormatter.java
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AsmElementFormatter.java
@@ -168,7 +168,11 @@ public class AsmElementFormatter {
 
                } else if (methodDeclaration instanceof InterTypeDeclaration) {
                        InterTypeDeclaration itd = (InterTypeDeclaration) methodDeclaration;
-                       String name = itd.getOnType().toString() + "." + new String(itd.getDeclaredSelector());
+                       String fqname = itd.getOnType().toString();
+                       if (fqname.indexOf(".") != -1) {
+                               fqname = fqname.substring(fqname.lastIndexOf(".") + 1);
+                       }
+                       String name = fqname + "." + new String(itd.getDeclaredSelector());
                        if (methodDeclaration instanceof InterTypeFieldDeclaration) {
                                node.setKind(IProgramElement.Kind.INTER_TYPE_FIELD);
                                node.setName(name);