From 3fe6d5d2dc129cbaf00be2b4813d9e3f9d51bedf Mon Sep 17 00:00:00 2001
From: Leonid Shalupov <shalupov@diverse.org.ru>
Date: Sat, 9 Jun 2012 19:19:41 +0400
Subject: [PATCH] maven fixes

---
 .../src/org/jetbrains/jet/cli/common/CLICompiler.java  |  9 ++++-----
 .../jetbrains/jet/cli/common/CompilerArguments.java    |  3 +--
 .../src/org/jetbrains/jet/cli/jvm/K2JVMCompiler.java   | 10 ++++++++--
 3 files changed, 13 insertions(+), 9 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 432f386f671..3edc16d1cc1 100644
--- a/compiler/cli/src/org/jetbrains/jet/cli/common/CLICompiler.java
+++ b/compiler/cli/src/org/jetbrains/jet/cli/common/CLICompiler.java
@@ -20,12 +20,14 @@ import com.intellij.openapi.Disposable;
 import com.intellij.openapi.util.Disposer;
 import com.sampullara.cli.Args;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.cli.common.messages.*;
+import org.jetbrains.jet.cli.common.messages.CompilerMessageLocation;
+import org.jetbrains.jet.cli.common.messages.CompilerMessageSeverity;
+import org.jetbrains.jet.cli.common.messages.MessageRenderer;
+import org.jetbrains.jet.cli.common.messages.PrintingMessageCollector;
 import org.jetbrains.jet.cli.jvm.compiler.CompileEnvironmentException;
 import org.jetbrains.jet.cli.jvm.compiler.CompileEnvironmentUtil;
 
 import java.io.PrintStream;
-import java.util.Collections;
 import java.util.List;
 
 import static org.jetbrains.jet.cli.common.ExitCode.INTERNAL_ERROR;
@@ -51,9 +53,6 @@ public abstract class CLICompiler<A extends CompilerArguments, C extends Compile
     protected boolean parseArguments(@NotNull PrintStream errStream, @NotNull A arguments, @NotNull String[] args) {
         try {
             arguments.freeArgs = Args.parse(arguments, args);
-            if (arguments.freeArgs == null) {
-                arguments.freeArgs = Collections.emptyList();
-            }
             return true;
         }
         catch (IllegalArgumentException e) {
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 7064c1ab13e..a477beaf459 100644
--- a/compiler/cli/src/org/jetbrains/jet/cli/common/CompilerArguments.java
+++ b/compiler/cli/src/org/jetbrains/jet/cli/common/CompilerArguments.java
@@ -17,7 +17,6 @@
 package org.jetbrains.jet.cli.common;
 
 import com.google.common.collect.Lists;
-import com.sampullara.cli.Argument;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.List;
@@ -41,7 +40,7 @@ public abstract class CompilerArguments {
         this.compilerPlugins = compilerPlugins;
     }
 
-    public List<String> freeArgs;
+    public List<String> freeArgs = Lists.newArrayList();
 
     public abstract boolean isHelp();
     public abstract boolean isTags();
diff --git a/compiler/cli/src/org/jetbrains/jet/cli/jvm/K2JVMCompiler.java b/compiler/cli/src/org/jetbrains/jet/cli/jvm/K2JVMCompiler.java
index 18e6a2eac76..35eee0392b4 100644
--- a/compiler/cli/src/org/jetbrains/jet/cli/jvm/K2JVMCompiler.java
+++ b/compiler/cli/src/org/jetbrains/jet/cli/jvm/K2JVMCompiler.java
@@ -25,9 +25,9 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.cli.common.CLICompiler;
 import org.jetbrains.jet.cli.common.ExitCode;
 import org.jetbrains.jet.cli.common.messages.*;
-import org.jetbrains.jet.cli.jvm.compiler.K2JVMCompileEnvironmentConfiguration;
 import org.jetbrains.jet.cli.jvm.compiler.CompileEnvironmentUtil;
 import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment;
+import org.jetbrains.jet.cli.jvm.compiler.K2JVMCompileEnvironmentConfiguration;
 import org.jetbrains.jet.cli.jvm.compiler.KotlinToJVMBytecodeCompiler;
 import org.jetbrains.jet.cli.jvm.repl.ReplFromTerminal;
 import org.jetbrains.jet.codegen.CompilationException;
@@ -86,7 +86,13 @@ public class K2JVMCompiler extends CLICompiler<K2JVMCompilerArguments, K2JVMComp
 
         CompilerDependencies dependencies = new CompilerDependencies(mode, CompilerDependencies.findRtJar(), jdkHeadersJar, runtimeJar);
 
-        if (!arguments.script && arguments.module == null && arguments.src == null && arguments.freeArgs.isEmpty()) {
+        final List<String> argumentsSourceDirs = arguments.getSourceDirs();
+        if (!arguments.script &&
+            arguments.module == null &&
+            arguments.src == null &&
+            arguments.freeArgs.isEmpty() &&
+            (argumentsSourceDirs == null || argumentsSourceDirs.size() == 0)) {
+
             ReplFromTerminal.run(rootDisposable, dependencies);
             return ExitCode.OK;
         }