Restored original mechanism of getting source location

now that debug info is being generated.

diff --git a/weaver/src/org/aspectj/weaver/AsmAdaptor.java b/weaver/src/org/aspectj/weaver/AsmAdaptor.java
index caeeeaf419509222c2d1d90dc61fe4b5e8d218b3..dc7a9469582391a21c04dc316bfc2ad13186aee9 100644 (file)
--- a/weaver/src/org/aspectj/weaver/AsmAdaptor.java
+++ b/weaver/src/org/aspectj/weaver/AsmAdaptor.java
@@ -23,6 +23,7 @@ import org.aspectj.asm.Relation;
 import org.aspectj.asm.RelationNode;
 import org.aspectj.asm.StructureModel;
 import org.aspectj.bridge.ISourceLocation;
+import org.aspectj.bridge.SourceLocation;
 
 public class AsmAdaptor {
        public static void noteMunger(StructureModel model, Shadow shadow, ShadowMunger munger) {
@@ -149,8 +150,8 @@ public class AsmAdaptor {
                ProgramElementNode peNode = new ProgramElementNode(
                        shadow.toString(),
                        ProgramElementNode.Kind.CODE,
-//                     new SourceLocation(enclosingNode.getSourceLocation().getSourceFile(), sl.getLine()),
-                       enclosingNode.getSourceLocation(),
+                       new SourceLocation(enclosingNode.getSourceLocation().getSourceFile(), sl.getLine()),
+//                     enclosingNode.getSourceLocation(),
                        0,
                        "",
                        new ArrayList());