equal
deleted
inserted
replaced
28 import java.util.EnumSet; |
28 import java.util.EnumSet; |
29 import java.util.Locale; |
29 import java.util.Locale; |
30 |
30 |
31 import com.sun.tools.javac.api.DiagnosticFormatter.Configuration.*; |
31 import com.sun.tools.javac.api.DiagnosticFormatter.Configuration.*; |
32 import com.sun.tools.javac.api.Formattable; |
32 import com.sun.tools.javac.api.Formattable; |
|
33 import com.sun.tools.javac.file.BaseFileObject; |
33 import com.sun.tools.javac.util.AbstractDiagnosticFormatter.SimpleConfiguration; |
34 import com.sun.tools.javac.util.AbstractDiagnosticFormatter.SimpleConfiguration; |
34 |
35 |
35 import static com.sun.tools.javac.api.DiagnosticFormatter.PositionKind.*; |
36 import static com.sun.tools.javac.api.DiagnosticFormatter.PositionKind.*; |
36 |
37 |
37 /** |
38 /** |
107 @Override |
108 @Override |
108 protected String formatArgument(JCDiagnostic diag, Object arg, Locale l) { |
109 protected String formatArgument(JCDiagnostic diag, Object arg, Locale l) { |
109 String s; |
110 String s; |
110 if (arg instanceof Formattable) |
111 if (arg instanceof Formattable) |
111 s = arg.toString(); |
112 s = arg.toString(); |
|
113 else if (arg instanceof BaseFileObject) |
|
114 s = ((BaseFileObject) arg).getShortName(); |
112 else |
115 else |
113 s = super.formatArgument(diag, arg, null); |
116 s = super.formatArgument(diag, arg, null); |
114 if (arg instanceof JCDiagnostic) |
117 if (arg instanceof JCDiagnostic) |
115 return "(" + s + ")"; |
118 return "(" + s + ")"; |
116 else |
119 else |