From c5da7e1ea23215eb5a8bd87380104d2a2963eca0 Mon Sep 17 00:00:00 2001 From: Ilya Chernikov Date: Tue, 8 Sep 2015 17:28:31 +0200 Subject: [PATCH] Refactorings, reformatting code, applying code style and other cleanup Original commit: 96558c52ffd2f0bc7548b00bdc9b922ce9c9ab8b --- .../jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.java b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.java index e22c84941b6..3710979bd86 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.java +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.java @@ -165,7 +165,7 @@ public class KotlinCompilerRunner { ArrayList daemonReportMessages = new ArrayList(); - CompileService daemon = KotlinCompilerClient.Companion.connectToCompileService(compilerId, daemonJVMOptions, daemonOptions, new DaemonReportingTargets(null, daemonReportMessages), true, true); + CompileService daemon = KotlinCompilerClient.connectToCompileService(compilerId, daemonJVMOptions, daemonOptions, new DaemonReportingTargets(null, daemonReportMessages), true, true); for (DaemonReportMessage msg: daemonReportMessages) { if (msg.getCategory() == DaemonReportCategory.EXCEPTION && daemon == null) { @@ -182,7 +182,7 @@ public class KotlinCompilerRunner { ByteArrayOutputStream compilerOut = new ByteArrayOutputStream(); ByteArrayOutputStream daemonOut = new ByteArrayOutputStream(); - Integer res = KotlinCompilerClient.Companion.incrementalCompile(daemon, argsArray, incrementalCaches, compilerOut, daemonOut); + Integer res = KotlinCompilerClient.incrementalCompile(daemon, argsArray, incrementalCaches, compilerOut, daemonOut); ProcessCompilerOutput(messageCollector, collector, compilerOut, res.toString()); BufferedReader reader = new BufferedReader(new StringReader(daemonOut.toString()));