helens changes for 125295 - should keep AJDT happy.

2 files changed, 31 insertions, 7 deletions

diff --git a/asm/src/org/aspectj/asm/IProgramElement.java b/asm/src/org/aspectj/asm/IProgramElement.java
index 8223c176b..b7ef7e27f 100644
--- a/asm/src/org/aspectj/asm/IProgramElement.java
+++ b/asm/src/org/aspectj/asm/IProgramElement.java
@@ -79,6 +79,7 @@ public interface IProgramElement extends Serializable {
 	public String getCorrespondingType(boolean getFullyQualifiedType);
 	
 	public String toSignatureString();
+	public String toSignatureString(boolean getFullyQualifiedArgTypes);
 	
 	public void setRunnable(boolean value);
 	public boolean isRunnable();
@@ -107,11 +108,13 @@ public interface IProgramElement extends Serializable {
 	 * Includes information about the origin of the node.
 	 */
 	public String toLinkLabelString();
+	public String toLinkLabelString(boolean getFullyQualifiedArgTypes);
 
 	/**
 	 * Includes name, parameter types (if any) and details (if any).
 	 */
 	public String toLabelString();
+	public String toLabelString(boolean getFullyQualifiedArgTypes);
 
 	public List getParameterTypes();
 	public void setParameterTypes(List list);
diff --git a/asm/src/org/aspectj/asm/internal/ProgramElement.java b/asm/src/org/aspectj/asm/internal/ProgramElement.java
index 0c7c8683c..a523b7497 100644
--- a/asm/src/org/aspectj/asm/internal/ProgramElement.java
+++ b/asm/src/org/aspectj/asm/internal/ProgramElement.java
@@ -387,21 +387,34 @@ public class ProgramElement implements IProgramElement {
 	}
 
 	public String toSignatureString() {
+		return toSignatureString(true);
+	}
+
+	public String toSignatureString(boolean getFullyQualifiedArgTypes) {
 		StringBuffer sb = new StringBuffer();
 		sb.append(name);
 		
 		if (parameterTypes != null ) {
 			sb.append('('); 
 			for (Iterator it = parameterTypes.iterator(); it.hasNext(); ) {
-				sb.append((String)it.next());
+				String arg = (String)it.next();
+				if (getFullyQualifiedArgTypes) {
+					sb.append(arg);
+				} else {
+					int index = arg.lastIndexOf(".");
+					if (index != -1) {
+						sb.append(arg.substring(index + 1));
+					} else {
+						sb.append(arg);
+					}
+				}
 				if (it.hasNext()) sb.append(", ");
 			}
 			sb.append(')');
 		}
 		
-		return sb.toString();
+		return sb.toString();		
 	}
-
 	
 	public static boolean shortITDNames = true;
 	
@@ -409,6 +422,10 @@ public class ProgramElement implements IProgramElement {
 	 * TODO: move the "parent != null"==>injar heuristic to more explicit 
 	 */
 	public String toLinkLabelString() {
+		return toLinkLabelString(true);
+	}
+
+	public String toLinkLabelString(boolean getFullyQualifiedArgTypes) {
 		String label;
 		if (kind == Kind.CODE || kind == Kind.INITIALIZER) {
 			label = parent.getParent().getName() + ": ";
@@ -435,18 +452,22 @@ public class ProgramElement implements IProgramElement {
 				label = "injar aspect: ";  
 			}
 		}
-		label += toLabelString();
+		label += toLabelString(getFullyQualifiedArgTypes);
 		return label;
 	}
-
+	
 	public String toLabelString() {
-		String label = toSignatureString();
+		return toLabelString(true);
+	}
+
+	public String toLabelString(boolean getFullyQualifiedArgTypes) {
+		String label = toSignatureString(getFullyQualifiedArgTypes);
 		if (details != null) {
 			label += ": " + details;
 		} 
 		return label;
 	}
-
+	
 	private String handle = null;
 	public String getHandleIdentifier() {
 	    if (null == handle) {