azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename MessageRenderer constants

Browse Source
This commit is contained in:
Alexander Udalov
2014-12-24 17:55:27 +03:00
parent a30a3f1926
commit b8328f9190
4 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/cli/cli-common/src/org/jetbrains/jet/cli/common/messages/MessageCollectorPlainTextToStream.java
+1 -4
View File
@@ -27,9 +27,7 @@ public class MessageCollectorPlainTextToStream implements MessageCollector {
public static final MessageCollector PLAIN_TEXT_TO_SYSTEM_ERR = new MessageCollectorPlainTextToStream(System.err, NON_VERBOSE);
@NotNull
private final PrintStream stream;
@NotNull
private final Set<CompilerMessageSeverity> severitiesToPrint;
public MessageCollectorPlainTextToStream(@NotNull PrintStream stream, @NotNull Set<CompilerMessageSeverity> severities) {
@@ -40,8 +38,7 @@ public class MessageCollectorPlainTextToStream implements MessageCollector {
@Override
public void report(@NotNull CompilerMessageSeverity severity, @NotNull String message, @NotNull CompilerMessageLocation location) {
if (severitiesToPrint.contains(severity)) {
stream.println(MessageRenderer.PLAIN.render(severity, message, location));
stream.println(MessageRenderer.PLAIN_FULL_PATHS.render(severity, message, location));
}
}
}
compiler/cli/cli-common/src/org/jetbrains/jet/cli/common/messages/MessageRenderer.java
+5 -3
View File
@@ -25,7 +25,7 @@ import java.io.File;
public interface MessageRenderer {
MessageRenderer TAGS = new MessageRenderer() {
MessageRenderer XML = new MessageRenderer() {
@Override
public String renderPreamble() {
return "<MESSAGES>";
@@ -58,7 +58,7 @@ public interface MessageRenderer {
}
};
MessageRenderer PLAIN = new PlainText() {
MessageRenderer PLAIN_FULL_PATHS = new PlainText() {
@Nullable
@Override
protected String getPath(@NotNull CompilerMessageLocation location) {
@@ -66,7 +66,7 @@ public interface MessageRenderer {
}
};
MessageRenderer PLAIN_WITH_RELATIVE_PATH = new PlainText() {
MessageRenderer PLAIN_RELATIVE_PATHS = new PlainText() {
private final File cwd = new File(".").getAbsoluteFile();
@Nullable
@@ -102,6 +102,8 @@ public interface MessageRenderer {
}
String renderPreamble();
String render(@NotNull CompilerMessageSeverity severity, @NotNull String message, @NotNull CompilerMessageLocation location);
String renderConclusion();
}