- Added method AbstractFile.toString and used it

5 files changed, 9 insertions, 4 deletions

diff --git a/sources/scala/tools/util/AbstractFile.java b/sources/scala/tools/util/AbstractFile.java
index e53eb5a680..ab4705d085 100644
--- a/sources/scala/tools/util/AbstractFile.java
+++ b/sources/scala/tools/util/AbstractFile.java
@@ -61,6 +61,11 @@ public abstract class AbstractFile {
         return new ByteArrayInputStream(read());
     }
 
+    /** Returns the path of this file. */
+    public String toString() {
+        return getPath();
+    }
+
     /** open file 'name' in directory 'dirname'
      */
     public static AbstractFile open(String dirname, String name) {
diff --git a/sources/scala/tools/util/SourceFile.java b/sources/scala/tools/util/SourceFile.java
index 520dc23099..403b3011ff 100644
--- a/sources/scala/tools/util/SourceFile.java
+++ b/sources/scala/tools/util/SourceFile.java
@@ -93,7 +93,7 @@ public class SourceFile {
 
     /** Returns the path of the underlying file. */
     public String toString() {
-        return file.getPath();
+        return file.toString();
     }
 
     //########################################################################
diff --git a/sources/scalac/symtab/SourceCompleter.java b/sources/scalac/symtab/SourceCompleter.java
index 9fd3ebb468..e70023c935 100644
--- a/sources/scalac/symtab/SourceCompleter.java
+++ b/sources/scalac/symtab/SourceCompleter.java
@@ -42,7 +42,7 @@ public class SourceCompleter extends SymbolLoader {
         global.currentPhase = global.PHASE.ANALYZER.phase();
         ((AnalyzerPhase)global.PHASE.ANALYZER.phase()).lateEnter(global, unit, clasz);
         global.currentPhase = phase;
-        return "source file '" + source.getFile() + "'";
+        return "source file '" + source + "'";
     }
 
 }
diff --git a/sources/scalac/symtab/classfile/ClassParser.java b/sources/scalac/symtab/classfile/ClassParser.java
index e1d782a2a7..4aba202cff 100644
--- a/sources/scalac/symtab/classfile/ClassParser.java
+++ b/sources/scalac/symtab/classfile/ClassParser.java
@@ -25,7 +25,7 @@ public class ClassParser extends SymbolLoader {
         AbstractFile file = global.classPath.openFile(
             SourceRepresentation.externalizeFileName(clasz, ".class"));
         ClassfileParser.parse(global, new AbstractFileReader(file), clasz);
-        return "class file '" + file.getPath() + "'";
+        return "class file '" + file + "'";
     }
 
 }
diff --git a/sources/scalac/symtab/classfile/SymblParser.java b/sources/scalac/symtab/classfile/SymblParser.java
index fb826d853d..ae0dc4f5d8 100644
--- a/sources/scalac/symtab/classfile/SymblParser.java
+++ b/sources/scalac/symtab/classfile/SymblParser.java
@@ -27,6 +27,6 @@ public class SymblParser extends ClassParser {
         AbstractFile file = global.classPath.openFile(
             SourceRepresentation.externalizeFileName(clasz, ".symbl"));
         UnPickle.parse(global, file, clasz);
-        return "symbol file '" + file.getPath() + "'";
+        return "symbol file '" + file + "'";
     }
 }