From afa4ee898c63d59a195134ae79a9e601b9c07990 Mon Sep 17 00:00:00 2001
From: Andrey Breslav <andrey.breslav@jetbrains.com>
Date: Mon, 12 Nov 2012 21:18:19 +0400
Subject: [PATCH] Rename

---
 .../jetbrains/jet/plugin/compiler/JetCompiler.java    |  4 ++--
 .../jetbrains/jet/plugin/compiler/K2JSCompiler.java   |  4 ++--
 ...mpilerUtils.java => TranslatingCompilerUtils.java} | 11 ++++-------
 3 files changed, 8 insertions(+), 11 deletions(-)
 rename idea/src/org/jetbrains/jet/plugin/compiler/{CompilerUtils.java => TranslatingCompilerUtils.java} (90%)

diff --git a/idea/src/org/jetbrains/jet/plugin/compiler/JetCompiler.java b/idea/src/org/jetbrains/jet/plugin/compiler/JetCompiler.java
index ffb83bad9c1..b77c4828bd7 100644
--- a/idea/src/org/jetbrains/jet/plugin/compiler/JetCompiler.java
+++ b/idea/src/org/jetbrains/jet/plugin/compiler/JetCompiler.java
@@ -106,7 +106,7 @@ public class JetCompiler implements TranslatingCompiler {
 
         MessageCollector messageCollector = new MessageCollectorAdapter(compileContext);
 
-        CompilerEnvironment environment = CompilerUtils.getEnvironmentFor(compileContext, module, tests);
+        CompilerEnvironment environment = TranslatingCompilerUtils.getEnvironmentFor(compileContext, module, tests);
         if (!environment.success()) {
             environment.reportErrorsTo(messageCollector);
             return;
@@ -129,7 +129,7 @@ public class JetCompiler implements TranslatingCompiler {
         };
         runCompiler(messageCollector, environment, scriptFile, collector);
 
-        CompilerUtils.reportOutputs(outputSink, outputDir, collector);
+        TranslatingCompilerUtils.reportOutputs(outputSink, outputDir, collector);
     }
 
     private static void runCompiler(
diff --git a/idea/src/org/jetbrains/jet/plugin/compiler/K2JSCompiler.java b/idea/src/org/jetbrains/jet/plugin/compiler/K2JSCompiler.java
index 7016a3d5e9b..875e73861f1 100644
--- a/idea/src/org/jetbrains/jet/plugin/compiler/K2JSCompiler.java
+++ b/idea/src/org/jetbrains/jet/plugin/compiler/K2JSCompiler.java
@@ -82,7 +82,7 @@ public final class K2JSCompiler implements TranslatingCompiler {
 
         MessageCollector messageCollector = new MessageCollectorAdapter(context);
 
-        CompilerEnvironment environment = CompilerUtils.getEnvironmentFor(context, module, /*tests = */ false);
+        CompilerEnvironment environment = TranslatingCompilerUtils.getEnvironmentFor(context, module, /*tests = */ false);
         if (!environment.success()) {
             environment.reportErrorsTo(messageCollector);
             return;
@@ -100,7 +100,7 @@ public final class K2JSCompiler implements TranslatingCompiler {
                 return execInProcess(messageCollector, environment, stream, module);
             }
         });
-        CompilerUtils.reportOutputs(sink, environment.getOutput(), collector);
+        TranslatingCompilerUtils.reportOutputs(sink, environment.getOutput(), collector);
     }
 
     @Nullable
diff --git a/idea/src/org/jetbrains/jet/plugin/compiler/CompilerUtils.java b/idea/src/org/jetbrains/jet/plugin/compiler/TranslatingCompilerUtils.java
similarity index 90%
rename from idea/src/org/jetbrains/jet/plugin/compiler/CompilerUtils.java
rename to idea/src/org/jetbrains/jet/plugin/compiler/TranslatingCompilerUtils.java
index 23dff238cbd..0736101050a 100644
--- a/idea/src/org/jetbrains/jet/plugin/compiler/CompilerUtils.java
+++ b/idea/src/org/jetbrains/jet/plugin/compiler/TranslatingCompilerUtils.java
@@ -34,22 +34,19 @@ import java.io.File;
 import java.util.List;
 import java.util.Set;
 
-/**
- * @author Pavel Talanov
- */
-public final class CompilerUtils {
-    private CompilerUtils() {
+public final class TranslatingCompilerUtils {
+    private TranslatingCompilerUtils() {
     }
 
     @NotNull
     public static CompilerEnvironment getEnvironmentFor(@NotNull CompileContext compileContext, @NotNull Module module, boolean tests) {
         VirtualFile mainOutput = compileContext.getModuleOutputDirectory(module);
         VirtualFile outputDirectoryForTests = compileContext.getModuleOutputDirectoryForTests(module);
-        return CompilerEnvironment.getEnvironmentFor(tests, toIoFile(mainOutput), toIoFile(outputDirectoryForTests));
+        return CompilerEnvironment.getEnvironmentFor(tests, toNullableIoFile(mainOutput), toNullableIoFile(outputDirectoryForTests));
     }
 
     @Nullable
-    public static File toIoFile(@Nullable VirtualFile file) {
+    public static File toNullableIoFile(@Nullable VirtualFile file) {
         if (file == null) return null;
         return new File(file.getPath());
     }