From aa7e7a63ee3ac1ab1c3cab155539231aa0e42260 Mon Sep 17 00:00:00 2001
From: acolyer <acolyer>
Date: Wed, 26 Feb 2003 16:19:14 +0000
Subject: Improved formatting of toString for LinkNodes

---
 asm/src/org/aspectj/asm/LinkNode.java | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

(limited to 'asm/src/org')

diff --git a/asm/src/org/aspectj/asm/LinkNode.java b/asm/src/org/aspectj/asm/LinkNode.java
index 72f02cb1b..5f43f0426 100644
--- a/asm/src/org/aspectj/asm/LinkNode.java
+++ b/asm/src/org/aspectj/asm/LinkNode.java
@@ -44,11 +44,22 @@ public class LinkNode extends StructureNode {
         if (programElementNode.getProgramElementKind().equals(ProgramElementNode.Kind.ADVICE) ||
             programElementNode.getProgramElementKind().equals(ProgramElementNode.Kind.INTRODUCTION) ||
             programElementNode.getProgramElementKind().equals(ProgramElementNode.Kind.CODE)) {
-            return programElementNode.parent.toString() + ": " + programElementNode.getName();
+            name = programElementNode.parent.toString() + ": " + programElementNode.getName();
+			StructureNode grandparent = programElementNode.parent.parent;
+            if ( grandparent instanceof ProgramElementNode ) {
+            	ProgramElementNode pe_grandparent = (ProgramElementNode)grandparent;
+            	if ( pe_grandparent.getProgramElementKind().equals(ProgramElementNode.Kind.CLASS) ||
+					 pe_grandparent.getProgramElementKind().equals(ProgramElementNode.Kind.INTERFACE)
+            	    ) {
+            		name = pe_grandparent.toString() + "." + name;	
+            	}
+            }
+            
         } else if (programElementNode.isMemberKind()) {
-            return programElementNode.parent.toString() + '.' + programElementNode.getName(); 
+            name = programElementNode.parent.toString() + '.' + programElementNode.getName(); 
         } else {
-            return programElementNode.toString();
+            name = programElementNode.toString();
         }
+        return name;
     }
 }
-- 
cgit v1.2.3