From 75db407208dbaf63ffa7ccfebe95c587e1e9a1af Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Mon, 11 Aug 2014 17:33:10 +0400 Subject: [PATCH] Minor, reuse existing constant --- .../messages/MessageCollectorPlainTextToStream.java | 3 +-- .../common/messages/PrintingMessageCollector.java | 13 ++----------- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/compiler/cli/cli-common/src/org/jetbrains/jet/cli/common/messages/MessageCollectorPlainTextToStream.java b/compiler/cli/cli-common/src/org/jetbrains/jet/cli/common/messages/MessageCollectorPlainTextToStream.java index f2e75d5f942..52212ad7e9e 100644 --- a/compiler/cli/cli-common/src/org/jetbrains/jet/cli/common/messages/MessageCollectorPlainTextToStream.java +++ b/compiler/cli/cli-common/src/org/jetbrains/jet/cli/common/messages/MessageCollectorPlainTextToStream.java @@ -23,8 +23,7 @@ import java.util.EnumSet; import java.util.Set; public class MessageCollectorPlainTextToStream implements MessageCollector { - public static final EnumSet VERBOSE = EnumSet.of(CompilerMessageSeverity.LOGGING, CompilerMessageSeverity.OUTPUT); - public static final EnumSet NON_VERBOSE = EnumSet.complementOf(VERBOSE); + public static final EnumSet NON_VERBOSE = EnumSet.complementOf(CompilerMessageSeverity.VERBOSE); public static final MessageCollector PLAIN_TEXT_TO_SYSTEM_ERR = new MessageCollectorPlainTextToStream(System.err, NON_VERBOSE); diff --git a/compiler/cli/cli-common/src/org/jetbrains/jet/cli/common/messages/PrintingMessageCollector.java b/compiler/cli/cli-common/src/org/jetbrains/jet/cli/common/messages/PrintingMessageCollector.java index 5eee76d7a14..faeeb7d5ea5 100644 --- a/compiler/cli/cli-common/src/org/jetbrains/jet/cli/common/messages/PrintingMessageCollector.java +++ b/compiler/cli/cli-common/src/org/jetbrains/jet/cli/common/messages/PrintingMessageCollector.java @@ -20,20 +20,12 @@ import org.jetbrains.annotations.NotNull; import java.io.PrintStream; -import static org.jetbrains.jet.cli.common.messages.CompilerMessageSeverity.LOGGING; -import static org.jetbrains.jet.cli.common.messages.CompilerMessageSeverity.OUTPUT; - public class PrintingMessageCollector implements MessageCollector { - private final boolean verbose; private final PrintStream errStream; private final MessageRenderer messageRenderer; - public PrintingMessageCollector( - @NotNull PrintStream errStream, - @NotNull MessageRenderer messageRenderer, - boolean verbose - ) { + public PrintingMessageCollector(@NotNull PrintStream errStream, @NotNull MessageRenderer messageRenderer, boolean verbose) { this.verbose = verbose; this.errStream = errStream; this.messageRenderer = messageRenderer; @@ -45,8 +37,7 @@ public class PrintingMessageCollector implements MessageCollector { @NotNull String message, @NotNull CompilerMessageLocation location ) { - boolean verboseMessage = severity == LOGGING || severity == OUTPUT; - if (!verbose && verboseMessage) return; + if (!verbose && CompilerMessageSeverity.VERBOSE.contains(severity)) return; errStream.println(messageRenderer.render(severity, message, location)); }