From d32777782173adc5e68fef8ed281b7651c224ee5 Mon Sep 17 00:00:00 2001
From: pTalanov <Pavel.Talanov@jetbrains.com>
Date: Fri, 4 May 2012 18:14:11 +0400
Subject: [PATCH] Verbose parameter treated correctly

Fixes CompilerSmokeTest broken by previous commit
---
 .../cli/src/org/jetbrains/jet/cli/common/CLICompiler.java    | 2 +-
 .../src/org/jetbrains/jet/cli/common/CompilerArguments.java  | 1 +
 .../src/org/jetbrains/jet/cli/js/K2JSCompilerArguments.java  | 5 +++++
 .../org/jetbrains/jet/cli/jvm/K2JVMCompilerArguments.java    | 5 +++++
 .../jet/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.java    | 2 --
 5 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/compiler/cli/src/org/jetbrains/jet/cli/common/CLICompiler.java b/compiler/cli/src/org/jetbrains/jet/cli/common/CLICompiler.java
index 0122c3511c3..313fb21f255 100644
--- a/compiler/cli/src/org/jetbrains/jet/cli/common/CLICompiler.java
+++ b/compiler/cli/src/org/jetbrains/jet/cli/common/CLICompiler.java
@@ -108,7 +108,7 @@ public abstract class CLICompiler<A extends CompilerArguments, C extends Compile
         final MessageRenderer messageRenderer = getMessageRenderer(arguments);
         errStream.print(messageRenderer.renderPreamble());
         printVersionIfNeeded(errStream, arguments, messageRenderer);
-        PrintingMessageCollector messageCollector = new PrintingMessageCollector(errStream, messageRenderer, true);
+        PrintingMessageCollector messageCollector = new PrintingMessageCollector(errStream, messageRenderer, arguments.isVerbose());
         Disposable rootDisposable = CompileEnvironmentUtil.createMockDisposable();
         try {
             return doExecute(arguments, messageCollector, rootDisposable);
diff --git a/compiler/cli/src/org/jetbrains/jet/cli/common/CompilerArguments.java b/compiler/cli/src/org/jetbrains/jet/cli/common/CompilerArguments.java
index ea12b40e35c..525bbc11471 100644
--- a/compiler/cli/src/org/jetbrains/jet/cli/common/CompilerArguments.java
+++ b/compiler/cli/src/org/jetbrains/jet/cli/common/CompilerArguments.java
@@ -44,4 +44,5 @@ public abstract class CompilerArguments {
     public abstract boolean isHelp();
     public abstract boolean isTags();
     public abstract boolean isVersion();
+    public abstract boolean isVerbose();
 }
diff --git a/compiler/cli/src/org/jetbrains/jet/cli/js/K2JSCompilerArguments.java b/compiler/cli/src/org/jetbrains/jet/cli/js/K2JSCompilerArguments.java
index b73666952c5..132f68e811b 100644
--- a/compiler/cli/src/org/jetbrains/jet/cli/js/K2JSCompilerArguments.java
+++ b/compiler/cli/src/org/jetbrains/jet/cli/js/K2JSCompilerArguments.java
@@ -58,4 +58,9 @@ public class K2JSCompilerArguments extends CompilerArguments {
     public boolean isVersion() {
         return version;
     }
+
+    @Override
+    public boolean isVerbose() {
+        return verbose;
+    }
 }
diff --git a/compiler/cli/src/org/jetbrains/jet/cli/jvm/K2JVMCompilerArguments.java b/compiler/cli/src/org/jetbrains/jet/cli/jvm/K2JVMCompilerArguments.java
index 761c2d8bd3e..42abc201d44 100644
--- a/compiler/cli/src/org/jetbrains/jet/cli/jvm/K2JVMCompilerArguments.java
+++ b/compiler/cli/src/org/jetbrains/jet/cli/jvm/K2JVMCompilerArguments.java
@@ -153,6 +153,11 @@ public class K2JVMCompilerArguments extends CompilerArguments {
         return version;
     }
 
+    @Override
+    public boolean isVerbose() {
+        return verbose;
+    }
+
     public void setTags(boolean tags) {
         this.tags = tags;
     }
diff --git a/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.java b/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.java
index 2605ad66056..fa0a13dccfa 100644
--- a/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.java
+++ b/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.java
@@ -83,9 +83,7 @@ public class KotlinToJVMBytecodeCompiler {
 
     public static boolean compileModules(
             K2JVMCompileEnvironmentConfiguration configuration,
-
             @NotNull List<Module> modules,
-
             @NotNull File directory,
             @Nullable String jarPath,
             @Nullable String outputDir,