Changed org.aspectj.bridge.IMessage.getISourceLocation to getSourceLocation in order to match method naming conventions.

3 files changed, 9 insertions, 9 deletions

diff --git a/testing/src/org/aspectj/testing/util/BridgeUtil.java b/testing/src/org/aspectj/testing/util/BridgeUtil.java
index 325656e84..10117c398 100644
--- a/testing/src/org/aspectj/testing/util/BridgeUtil.java
+++ b/testing/src/org/aspectj/testing/util/BridgeUtil.java
@@ -105,7 +105,7 @@ public class BridgeUtil {
             + KIND_DELIM 
             + message.getMessage() 
             + MESSAGE_DELIM
-            + message.getISourceLocation(); // XXX implement
+            + message.getSourceLocation(); // XXX implement
     }
     
 
@@ -247,8 +247,8 @@ public class BridgeUtil {
                 if (0 != result) {
                     return result;
                 }
-                ISourceLocation sl1 = one.getISourceLocation();
-                ISourceLocation sl2 = two.getISourceLocation();
+                ISourceLocation sl1 = one.getSourceLocation();
+                ISourceLocation sl2 = two.getSourceLocation();
                 return WEAK_ISourceLocation.compare(sl1, sl2);
             }
         };       
@@ -267,8 +267,8 @@ public class BridgeUtil {
             }
             IMessage rhs_m= (IMessage) o1;
             IMessage lhs_m = (IMessage) o2;
-            ISourceLocation rhs_sl = rhs_m.getISourceLocation();
-            ISourceLocation lhs_sl = lhs_m.getISourceLocation();
+            ISourceLocation rhs_sl = rhs_m.getSourceLocation();
+            ISourceLocation lhs_sl = lhs_m.getSourceLocation();
             result = MEDIUM_ISourceLocation.compare(lhs_sl, rhs_sl);
             if (0 != result) {
                 return result;
diff --git a/testing/src/org/aspectj/testing/xml/SoftMessage.java b/testing/src/org/aspectj/testing/xml/SoftMessage.java
index d064fa001..c5eb95489 100644
--- a/testing/src/org/aspectj/testing/xml/SoftMessage.java
+++ b/testing/src/org/aspectj/testing/xml/SoftMessage.java
@@ -96,7 +96,7 @@ public class SoftMessage implements IMessage { // XXX mutable dup of Message
        if (null != value) {
            out.printAttribute("message", value);
        }
-       ISourceLocation sl = message.getISourceLocation();
+       ISourceLocation sl = message.getSourceLocation();
        if (null != sl) {
            out.endAttributes();
            SoftSourceLocation.writeXml(out, sl);
@@ -204,7 +204,7 @@ public class SoftMessage implements IMessage { // XXX mutable dup of Message
      * @return ISourceLocation associated with this message, 
      * a mock-up if file or line is available, or null if none 
      */
-    final public ISourceLocation getISourceLocation() {
+    final public ISourceLocation getSourceLocation() {
         if ((null == sourceLocation) 
             && ((null != file) || (line != Integer.MAX_VALUE))) {
             File f = (null == file ? NO_FILE : new File(file));
@@ -270,7 +270,7 @@ public class SoftMessage implements IMessage { // XXX mutable dup of Message
             result.append(messageString);
         }
 
-        ISourceLocation loc = getISourceLocation();
+        ISourceLocation loc = getSourceLocation();
         if ((null != loc) && (loc != ISourceLocation.NO_FILE)) {
             result.append(" at " + loc);
         }
diff --git a/testing/testsrc/org/aspectj/testing/harness/bridge/AjcSpecTest.java b/testing/testsrc/org/aspectj/testing/harness/bridge/AjcSpecTest.java
index 2c3c46e98..c55b0a894 100644
--- a/testing/testsrc/org/aspectj/testing/harness/bridge/AjcSpecTest.java
+++ b/testing/testsrc/org/aspectj/testing/harness/bridge/AjcSpecTest.java
@@ -299,7 +299,7 @@ public class AjcSpecTest extends TestCase {
         assertTrue(lhs.getKind() == rhs.getKind());
         same(lhs.getMessage(), rhs.getMessage(), a);
         assertEquals(lhs.getThrown(), rhs.getThrown());
-        sameSourceLocation(lhs.getISourceLocation(), rhs.getISourceLocation(), a);        
+        sameSourceLocation(lhs.getSourceLocation(), rhs.getSourceLocation(), a);        
 	}
 
 	public static void sameSourceLocation(ISourceLocation lhs, ISourceLocation rhs, Assert a) {