1.1 --- a/src/share/classes/com/sun/tools/javac/util/RawDiagnosticFormatter.java Wed Sep 23 18:29:41 2009 -0700 1.2 +++ b/src/share/classes/com/sun/tools/javac/util/RawDiagnosticFormatter.java Wed Sep 23 18:48:13 2009 -0700 1.3 @@ -30,6 +30,7 @@ 1.4 1.5 import com.sun.tools.javac.api.DiagnosticFormatter.Configuration.*; 1.6 import com.sun.tools.javac.api.Formattable; 1.7 +import com.sun.tools.javac.file.BaseFileObject; 1.8 import com.sun.tools.javac.util.AbstractDiagnosticFormatter.SimpleConfiguration; 1.9 1.10 import static com.sun.tools.javac.api.DiagnosticFormatter.PositionKind.*; 1.11 @@ -109,6 +110,8 @@ 1.12 String s; 1.13 if (arg instanceof Formattable) 1.14 s = arg.toString(); 1.15 + else if (arg instanceof BaseFileObject) 1.16 + s = ((BaseFileObject) arg).getShortName(); 1.17 else 1.18 s = super.formatArgument(diag, arg, null); 1.19 if (arg instanceof JCDiagnostic)