Compiler API refactored:

* exec(messageCollector, arguments) introduced
* exception-catching logic moved closer to the entry point
* PrintingMessageCollector localized

compiler/cli/cli-common/src/org/jetbrains/jet/cli/common/messages/MessageSeverityCollector.java

@@ -0,0 +1,49 @@
+/*
+ * Copyright 2010-2013 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jetbrains.jet.cli.common.messages;
+
+import com.google.common.collect.Sets;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Arrays;
+import java.util.Set;
+
+public class MessageSeverityCollector implements MessageCollector {
+
+    private final MessageCollector delegate;
+
+    private final Set<CompilerMessageSeverity> reportedSeverities = Sets.newHashSet();
+
+    public MessageSeverityCollector(@NotNull MessageCollector delegate) {
+        this.delegate = delegate;
+    }
+
+    @Override
+    public void report(
+            @NotNull CompilerMessageSeverity severity,
+            @NotNull String message,
+            @NotNull CompilerMessageLocation location
+    ) {
+        delegate.report(severity, message, location);
+
+        reportedSeverities.add(severity);
+    }
+
+    public boolean anyReported(@NotNull CompilerMessageSeverity... severities) {
+        return reportedSeverities.containsAll(Arrays.asList(severities));
+    }
+}

compiler/cli/cli-common/src/org/jetbrains/jet/cli/common/messages/PrintingMessageCollector.java

@@ -18,38 +18,36 @@ package org.jetbrains.jet.cli.common.messages;
 
 import com.google.common.collect.LinkedHashMultimap;
 import com.google.common.collect.Multimap;
-import com.google.common.collect.Sets;
 import org.jetbrains.annotations.NotNull;
 
 import java.io.PrintStream;
-import java.util.Arrays;
 import java.util.Collection;
-import java.util.Set;
 
 public class PrintingMessageCollector implements MessageCollector {
 
-    private boolean verbose;
+    private final boolean verbose;
     private final PrintStream errStream;
     private final MessageRenderer messageRenderer;
 
     // File path (nullable) -> error message
     private final Multimap<String, String> groupedMessages = LinkedHashMultimap.create();
 
-    private final Set<CompilerMessageSeverity> reportedSeverities = Sets.newHashSet();
-
-    public PrintingMessageCollector(PrintStream errStream,
-            MessageRenderer messageRenderer,
-            boolean verbose) {
+    public PrintingMessageCollector(
+            @NotNull PrintStream errStream,
+            @NotNull MessageRenderer messageRenderer,
+            boolean verbose
+    ) {
         this.verbose = verbose;
         this.errStream = errStream;
         this.messageRenderer = messageRenderer;
     }
 
     @Override
-    public void report(@NotNull CompilerMessageSeverity severity,
+    public void report(
+            @NotNull CompilerMessageSeverity severity,
             @NotNull String message,
-            @NotNull CompilerMessageLocation location) {
-        reportedSeverities.add(severity);
+            @NotNull CompilerMessageLocation location
+    ) {
 
         String text = messageRenderer.render(severity, message, location);
         if (severity == CompilerMessageSeverity.LOGGING || severity == CompilerMessageSeverity.OUTPUT) {
@@ -73,16 +71,4 @@ public class PrintingMessageCollector implements MessageCollector {
             }
         }
     }
-
-    public boolean isVerbose() {
-        return verbose;
-    }
-
-    public void setVerbose(boolean verbose) {
-        this.verbose = verbose;
-    }
-
-    public boolean anyReported(@NotNull CompilerMessageSeverity... severities) {
-        return reportedSeverities.containsAll(Arrays.asList(severities));
-    }
 }