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

4 files changed, 6 insertions, 6 deletions

diff --git a/bridge/src/org/aspectj/bridge/IMessage.java b/bridge/src/org/aspectj/bridge/IMessage.java
index 7f7407e0f..fe2a2124d 100644
--- a/bridge/src/org/aspectj/bridge/IMessage.java
+++ b/bridge/src/org/aspectj/bridge/IMessage.java
@@ -73,7 +73,7 @@ public interface IMessage {
 	Throwable getThrown();
 
 	/** @return source location associated with this message, or null if none */
-	ISourceLocation getISourceLocation();
+	ISourceLocation getSourceLocation();
 
 	public static final class Kind implements Comparable {
 		public static final Comparator COMPARATOR = new Comparator() {
diff --git a/bridge/src/org/aspectj/bridge/Message.java b/bridge/src/org/aspectj/bridge/Message.java
index 56e2275b7..ada78629a 100644
--- a/bridge/src/org/aspectj/bridge/Message.java
+++ b/bridge/src/org/aspectj/bridge/Message.java
@@ -126,7 +126,7 @@ public class Message implements IMessage { // XXX toString or renderer?
     }
 
     /** @return ISourceLocation associated with this message, or null if none */
-    final public ISourceLocation getISourceLocation() {
+    final public ISourceLocation getSourceLocation() {
         return sourceLocation;
     }
     
@@ -135,7 +135,7 @@ public class Message implements IMessage { // XXX toString or renderer?
     }
     
     public static String renderToString(IMessage message) { 
-        ISourceLocation loc = message.getISourceLocation();
+        ISourceLocation loc = message.getSourceLocation();
         String locString = (null == loc ? "" : " at " + loc);
         Throwable thrown = message.getThrown();
         return message.getKind() + locString + ": " + message.getMessage()
diff --git a/bridge/src/org/aspectj/bridge/MessageUtil.java b/bridge/src/org/aspectj/bridge/MessageUtil.java
index 31f72ed94..9dbb09e44 100644
--- a/bridge/src/org/aspectj/bridge/MessageUtil.java
+++ b/bridge/src/org/aspectj/bridge/MessageUtil.java
@@ -770,7 +770,7 @@ public class MessageUtil {
             result.append(" ");
         }
 
-        ISourceLocation loc = message.getISourceLocation();
+        ISourceLocation loc = message.getSourceLocation();
         if ((null != loc) && (loc != ISourceLocation.EMPTY)) {
             result.append("at " + renderSourceLocation(loc));
         }
@@ -849,7 +849,7 @@ public class MessageUtil {
 
         String text = message.getMessage();
         Throwable thrown = message.getThrown();
-        ISourceLocation sl = message.getISourceLocation();
+        ISourceLocation sl = message.getSourceLocation();
         IMessage.Kind kind = message.getKind();
         StringBuffer result = new StringBuffer();
         result.append(kind.toString());
diff --git a/bridge/testsrc/org/aspectj/bridge/MessageTest.java b/bridge/testsrc/org/aspectj/bridge/MessageTest.java
index 8688f44b4..19cbc50ef 100644
--- a/bridge/testsrc/org/aspectj/bridge/MessageTest.java
+++ b/bridge/testsrc/org/aspectj/bridge/MessageTest.java
@@ -223,7 +223,7 @@ public class MessageTest extends TestCase {
             assertTrue(""+kind, kind == m.getKind());
             assertTrue(""+thrown, equals(thrown, m.getThrown()));
             assertTrue(""+sourceLocation, 
-                equals(sourceLocation, m.getISourceLocation()));
+                equals(sourceLocation, m.getSourceLocation()));
             String err = new KindTest().testKindSet(message, kind);
             if (null != err) {
                 assertTrue(err, false);