aboutsummaryrefslogtreecommitdiffstats
path: root/asm
diff options
context:
space:
mode:
Diffstat (limited to 'asm')
-rw-r--r--asm/src/org/aspectj/asm/internal/ProgramElement.java11
1 files changed, 9 insertions, 2 deletions
diff --git a/asm/src/org/aspectj/asm/internal/ProgramElement.java b/asm/src/org/aspectj/asm/internal/ProgramElement.java
index b09bd79d0..9d5217125 100644
--- a/asm/src/org/aspectj/asm/internal/ProgramElement.java
+++ b/asm/src/org/aspectj/asm/internal/ProgramElement.java
@@ -386,6 +386,9 @@ public class ProgramElement implements IProgramElement {
return sb.toString();
}
+ /**
+ * TODO: move the "parent != null"==>injar heuristic to more explicit
+ */
public String toLinkLabelString() {
String label;
if (kind == Kind.CODE || kind == Kind.INITIALIZER) {
@@ -399,8 +402,12 @@ public class ProgramElement implements IProgramElement {
}
} else if (kind == Kind.CLASS || kind == Kind.ASPECT) {
label = "";
- } else {
- label = parent.getName() + '.';
+ } else {
+ if (parent != null) {
+ label = parent.getName() + '.';
+ } else {
+ label = "injar aspect: ";
+ }
}
label += toLabelString();
return label;