move weaving to inside of the compiler.compile loop.

ensure messages are associated with source wherever possible

diff --git a/bridge/src/org/aspectj/bridge/Message.java b/bridge/src/org/aspectj/bridge/Message.java
index bcc38d23c822c3a19984293149acb270b9cbcbf1..af032b6de40b3b3eea8879eaefed24ad460b21ec 100644 (file)
--- a/bridge/src/org/aspectj/bridge/Message.java
+++ b/bridge/src/org/aspectj/bridge/Message.java
@@ -42,6 +42,11 @@ public class Message implements IMessage {
             location);
     }
 
+    public Message(String message, ISourceLocation location, boolean isError, ISourceLocation[] extraSourceLocations) {
+       this(message, "",(isError ? IMessage.ERROR : IMessage.WARNING), location, null, 
+                       (extraSourceLocations.length > 0 ? extraSourceLocations : null));
+    }
+    
        /**
         * Create a message, handling null values for message and kind
         * if thrown is not null.

diff --git a/bridge/src/org/aspectj/bridge/SourceLocation.java b/bridge/src/org/aspectj/bridge/SourceLocation.java
index c44d0b9423e7733ff509b26039abc220c2b211ff..259fc2067bd9a77dc7939a0432158bec032fde36 100644 (file)
--- a/bridge/src/org/aspectj/bridge/SourceLocation.java
+++ b/bridge/src/org/aspectj/bridge/SourceLocation.java
@@ -133,9 +133,11 @@ public class SourceLocation implements ISourceLocation, java.io.Serializable {
         }
         if (sourceFile != ISourceLocation.NO_FILE) {
             sb.append(sourceFile.getPath());
+        }
+        if (startLine > 0) {
             sb.append(":");
+            sb.append(startLine); //"" + startLine + "-" + endLine);           
         }
-        sb.append(startLine); //"" + startLine + "-" + endLine);
         if (!noColumn) {
             sb.append(":" + column);
         }