Revert "Changed error messages to report the URI of the offending file, rather than its "name"."

Review URL: https://chromereviews.googleplex.com/3566013

git-svn-id: https://dart.googlecode.com/svn/branches/bleeding_edge/dart@240 260f80e4-7a28-3924-810f-c04153c831b5
This commit is contained in:
jgw@google.com 2011-10-07 17:23:04 +00:00
parent 340daa5ed0
commit d0cd03b159
4 changed files with 5 additions and 5 deletions

View file

@ -287,9 +287,9 @@ public class DartCompilationError {
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append((source != null) ? source.getUri() : "<unknown source>");
sb.append((source != null) ? source.getName() : "<unknown source>");
sb.append("(" + lineNumber + ":" + columnNumber + "): ");
sb.append(message);
return sb.toString();
}
}
}

View file

@ -21,7 +21,7 @@ public class DefaultErrorFormatter implements ErrorFormatter {
public void format(DartCompilationError event) {
outputStream.printf("%s:%d:%d: %s\n",
(event.getSource() != null)
? event.getSource().getUri() : "<unknown-source-file>",
? event.getSource().getName() : "<unknown-source-file>",
event.getLineNumber(),
event.getColumnNumber(),
event.getMessage());

View file

@ -73,7 +73,7 @@ public class PrettyErrorFormatter extends DefaultErrorFormatter {
StringBuilder buf = new StringBuilder();
buf.append(String.format("%s%s:%d: %s%s\n",
useColor ? RED_BOLD_COLOR : "",
sourceFile.getUri(),
sourceFile.getName(),
event.getLineNumber(),
event.getMessage(),
useColor ? NO_COLOR : ""));

View file

@ -50,7 +50,7 @@ public class DartCompilerListenerTest extends DartCompilerListener {
@Override
public void compilationError(DartCompilationError event) {
String reportedSrcName = (event.getSource() != null)
? event.getSource().getUri().toString()
? event.getSource().getName()
: null;
if (reportedSrcName == null) {
reportedSrcName = "<unknown>";