added getSimpleName which looks better when used in error and warning messages

1 files changed, 29 insertions, 0 deletions

diff --git a/weaver/src/org/aspectj/weaver/UnresolvedType.java b/weaver/src/org/aspectj/weaver/UnresolvedType.java
index 5efa8c423..aa657244c 100644
--- a/weaver/src/org/aspectj/weaver/UnresolvedType.java
+++ b/weaver/src/org/aspectj/weaver/UnresolvedType.java
@@ -463,6 +463,26 @@ public class UnresolvedType implements TypeVariableDeclaringElement {
         return signatureToName(signature);
     }
     
+    public String getSimpleName() {
+    	String name = getRawName();
+    	int lastDot = name.lastIndexOf('.');
+    	if (lastDot != -1) {
+    		name = name.substring(lastDot+1);
+    	}
+    	if (isParameterizedType()) {
+    		StringBuffer sb = new StringBuffer(name);
+    		sb.append("<");
+    		for (int i = 0; i < (typeParameters.length -1); i++) {
+				sb.append(typeParameters[i].getSimpleName());
+				sb.append(",");
+			}
+    		sb.append(typeParameters[typeParameters.length -1].getSimpleName());
+    		sb.append(">");
+        	name = sb.toString();
+    	}
+    	return name;
+    }
+    
     public String getRawName() {
     	return signatureToName((signatureErasure==null?signature:signatureErasure));
     }
@@ -476,6 +496,15 @@ public class UnresolvedType implements TypeVariableDeclaringElement {
 			return name;
 		}
 	}
+	
+	public String getSimpleBaseName() {
+    	String name = getBaseName();
+    	int lastDot = name.lastIndexOf('.');
+    	if (lastDot != -1) {
+    		name = name.substring(lastDot+1);
+    	}
+    	return name;		
+	}
 
     /**
      * Returns an array of strings representing the java langauge names of