1.1 --- a/src/share/classes/com/sun/tools/javac/util/Log.java Fri Nov 07 11:45:49 2008 -0800 1.2 +++ b/src/share/classes/com/sun/tools/javac/util/Log.java Wed Nov 12 14:17:03 2008 +0000 1.3 @@ -190,9 +190,9 @@ 1.4 getSource(name).setEndPosTable(table); 1.5 } 1.6 1.7 - /** Return current source name. 1.8 + /** Return current sourcefile. 1.9 */ 1.10 - public JavaFileObject currentSource() { 1.11 + public JavaFileObject currentSourceFile() { 1.12 return source == null ? null : source.getFile(); 1.13 } 1.14 1.15 @@ -395,7 +395,7 @@ 1.16 printLines(errWriter, "error: " + msg); 1.17 } else { 1.18 int line = source.getLineNumber(pos); 1.19 - JavaFileObject file = currentSource(); 1.20 + JavaFileObject file = source.getFile(); 1.21 if (file != null) 1.22 printLines(errWriter, 1.23 JavacFileManager.getJavacFileName(file) + ":" + 1.24 @@ -408,7 +408,7 @@ 1.25 /** report an error: 1.26 */ 1.27 public void rawError(int pos, String msg) { 1.28 - if (nerrors < MaxErrors && shouldReport(currentSource(), pos)) { 1.29 + if (nerrors < MaxErrors && shouldReport(currentSourceFile(), pos)) { 1.30 printRawError(pos, msg); 1.31 prompt(); 1.32 nerrors++;