From ddb474ea8e8b57c23b651d80d8653d832491e309 Mon Sep 17 00:00:00 2001
From: Andrey Breslav <andrey.breslav@jetbrains.com>
Date: Mon, 22 Apr 2013 15:35:51 +0400
Subject: [PATCH] Reorder method parameters

---
 .../jet/compiler/runner/CompilerRunnerUtil.java          | 9 +++++----
 .../jet/compiler/runner/KotlinCompilerRunner.java        | 2 +-
 .../org/jetbrains/jet/plugin/compiler/K2JSCompiler.java  | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/ide-compiler-runner/src/org/jetbrains/jet/compiler/runner/CompilerRunnerUtil.java b/ide-compiler-runner/src/org/jetbrains/jet/compiler/runner/CompilerRunnerUtil.java
index 394a9002ad4..bff91dc1e6d 100644
--- a/ide-compiler-runner/src/org/jetbrains/jet/compiler/runner/CompilerRunnerUtil.java
+++ b/ide-compiler-runner/src/org/jetbrains/jet/compiler/runner/CompilerRunnerUtil.java
@@ -88,11 +88,12 @@ public class CompilerRunnerUtil {
         }
     }
 
-    public static Object invokeExecMethod(CompilerEnvironment environment,
-            PrintStream out,
-            MessageCollector messageCollector, String[] arguments, String name) throws Exception {
+    public static Object invokeExecMethod(
+            String className, String[] arguments, CompilerEnvironment environment,
+            MessageCollector messageCollector, PrintStream out
+    ) throws Exception {
         URLClassLoader loader = getOrCreateClassLoader(environment.getKotlinPaths(), messageCollector);
-        Class<?> kompiler = Class.forName(name, true, loader);
+        Class<?> kompiler = Class.forName(className, true, loader);
         Method exec = kompiler.getMethod("exec", PrintStream.class, String[].class);
         return exec.invoke(kompiler.newInstance(), out, arguments);
     }
diff --git a/ide-compiler-runner/src/org/jetbrains/jet/compiler/runner/KotlinCompilerRunner.java b/ide-compiler-runner/src/org/jetbrains/jet/compiler/runner/KotlinCompilerRunner.java
index 7d9c17ddd57..e9afc3f6de3 100644
--- a/ide-compiler-runner/src/org/jetbrains/jet/compiler/runner/KotlinCompilerRunner.java
+++ b/ide-compiler-runner/src/org/jetbrains/jet/compiler/runner/KotlinCompilerRunner.java
@@ -74,7 +74,7 @@ public class KotlinCompilerRunner {
             messageCollector.report(CompilerMessageSeverity.INFO,
                                "Invoking in-process compiler " + compilerClassName + " with arguments " + Arrays.asList(arguments),
                                CompilerMessageLocation.NO_LOCATION);
-            Object rc = CompilerRunnerUtil.invokeExecMethod(environment, out, messageCollector, arguments, compilerClassName);
+            Object rc = CompilerRunnerUtil.invokeExecMethod(compilerClassName, arguments, environment, messageCollector, out);
             // exec() returns a K2JVMCompiler.ExitCode object, that class is not accessible here,
             // so we take it's contents through reflection
             return CompilerRunnerUtil.getReturnCodeFromObject(rc);
diff --git a/idea/src/org/jetbrains/jet/plugin/compiler/K2JSCompiler.java b/idea/src/org/jetbrains/jet/plugin/compiler/K2JSCompiler.java
index 357a47fa834..5be4ece9d5a 100644
--- a/idea/src/org/jetbrains/jet/plugin/compiler/K2JSCompiler.java
+++ b/idea/src/org/jetbrains/jet/plugin/compiler/K2JSCompiler.java
@@ -129,7 +129,7 @@ public final class K2JSCompiler implements TranslatingCompiler {
         File outDir = environment.getOutput();
         File outFile = new File(outDir, module.getName() + ".js");
         String[] commandLineArgs = constructArguments(module, outFile);
-        Object rc = invokeExecMethod(environment, out, messageCollector, commandLineArgs, "org.jetbrains.jet.cli.js.K2JSCompiler");
+        Object rc = invokeExecMethod("org.jetbrains.jet.cli.js.K2JSCompiler", commandLineArgs, environment, messageCollector, out);
 
         if (!ApplicationManager.getApplication().isUnitTestMode()) {
             VirtualFile virtualFile = LocalFileSystem.getInstance().findFileByIoFile(outDir);