From a0b636d561b61f563b436e3dd9ab9d3c6c59f2a5 Mon Sep 17 00:00:00 2001
From: Evgeny Gerashchenko <Evgeny.Gerashchenko@jetbrains.com>
Date: Wed, 4 Jul 2012 17:53:54 +0400
Subject: [PATCH] Moved CompilerSpecialMode.includeXXX() methods into
 configuration generators to make it clear that they are used only during
 initialization.

---
 .../jet/cli/jvm/CompilerConfigurationUtl.java | 20 ++++++++++++++---
 .../resolve/java/CompilerSpecialMode.java     | 12 ----------
 .../jet/CompileCompilerDependenciesTest.java  | 22 ++++++++++++++++---
 3 files changed, 36 insertions(+), 18 deletions(-)

diff --git a/compiler/cli/src/org/jetbrains/jet/cli/jvm/CompilerConfigurationUtl.java b/compiler/cli/src/org/jetbrains/jet/cli/jvm/CompilerConfigurationUtl.java
index 449af0229cd..6c5525b0713 100644
--- a/compiler/cli/src/org/jetbrains/jet/cli/jvm/CompilerConfigurationUtl.java
+++ b/compiler/cli/src/org/jetbrains/jet/cli/jvm/CompilerConfigurationUtl.java
@@ -25,6 +25,8 @@ import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 
+import static org.jetbrains.jet.lang.resolve.java.CompilerSpecialMode.*;
+
 /**
  * @author Evgeny Gerashchenko
  * @since 7/4/12
@@ -33,14 +35,14 @@ public class CompilerConfigurationUtl {
     // TODO merge with similar K2JVMCompiler method
     public static CompilerConfiguration getDefaultConfiguration(@NotNull CompilerSpecialMode compilerSpecialMode) {
         List<File> classpath = new ArrayList<File>();
-        if (compilerSpecialMode.includeJdk()) {
+        if (includeJdk(compilerSpecialMode)) {
             classpath.add(PathUtil.findRtJar());
         }
-        if (compilerSpecialMode.includeKotlinRuntime()) {
+        if (includeKotlinRuntime(compilerSpecialMode)) {
             classpath.add(PathUtil.getDefaultRuntimePath());
         }
         File[] annotationsPath = new File[0];
-        if (compilerSpecialMode.includeJdkAnnotations()) {
+        if (includeJdkAnnotations(compilerSpecialMode)) {
             annotationsPath = new File[]{PathUtil.getJdkAnnotationsPath()};
         }
 
@@ -49,4 +51,16 @@ public class CompilerConfigurationUtl {
         configuration.putUserData(JVMConfigurationKeys.ANNOTATIONS_PATH_KEY, annotationsPath);
         return configuration;
     }
+
+    private static boolean includeJdkAnnotations(@NotNull CompilerSpecialMode mode) {
+        return mode == REGULAR || mode == STDLIB || mode == IDEA;
+    }
+
+    public static boolean includeKotlinRuntime(@NotNull CompilerSpecialMode mode) {
+        return mode == REGULAR;
+    }
+
+    public static boolean includeJdk(@NotNull CompilerSpecialMode mode) {
+        return mode != IDEA;
+    }
 }
diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/CompilerSpecialMode.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/CompilerSpecialMode.java
index bbaf18e7e97..b1314bbcc31 100644
--- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/CompilerSpecialMode.java
+++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/CompilerSpecialMode.java
@@ -28,18 +28,6 @@ public enum CompilerSpecialMode {
     JS,
     ;
 
-    public boolean includeJdkAnnotations() {
-        return this == REGULAR || this == STDLIB || this == IDEA;
-    }
-
-    public boolean includeKotlinRuntime() {
-        return this == REGULAR;
-    }
-
-    public boolean includeJdk() {
-        return this != IDEA;
-    }
-
     public boolean isStubs() {
         return this == BUILTINS || this == JDK_HEADERS;
     }
diff --git a/compiler/tests/org/jetbrains/jet/CompileCompilerDependenciesTest.java b/compiler/tests/org/jetbrains/jet/CompileCompilerDependenciesTest.java
index 00d07cd8669..cbd41c3f31e 100644
--- a/compiler/tests/org/jetbrains/jet/CompileCompilerDependenciesTest.java
+++ b/compiler/tests/org/jetbrains/jet/CompileCompilerDependenciesTest.java
@@ -30,6 +30,10 @@ import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 
+import static org.jetbrains.jet.lang.resolve.java.CompilerSpecialMode.IDEA;
+import static org.jetbrains.jet.lang.resolve.java.CompilerSpecialMode.REGULAR;
+import static org.jetbrains.jet.lang.resolve.java.CompilerSpecialMode.STDLIB;
+
 /**
  * @author Stepan Koltsov
  */
@@ -52,14 +56,14 @@ public class CompileCompilerDependenciesTest {
 
     public static CompilerConfiguration compilerConfigurationForTests(@NotNull CompilerSpecialMode compilerSpecialMode, boolean mockJdk) {
         List<File> classpath = new ArrayList<File>();
-        if (compilerSpecialMode.includeJdk()) {
+        if (includeJdk(compilerSpecialMode)) {
             classpath.add(mockJdk ? JetTestUtils.findMockJdkRtJar() : PathUtil.findRtJar());
         }
-        if (compilerSpecialMode.includeKotlinRuntime()) {
+        if (includeKotlinRuntime(compilerSpecialMode)) {
             classpath.add(ForTestCompileRuntime.runtimeJarForTests());
         }
         File[] annotationsPath = new File[0];
-        if (compilerSpecialMode.includeJdkAnnotations()) {
+        if (includeJdkAnnotations(compilerSpecialMode)) {
             annotationsPath = new File[]{ForTestPackJdkAnnotations.jdkAnnotationsForTests()};
         }
 
@@ -68,4 +72,16 @@ public class CompileCompilerDependenciesTest {
         configuration.putUserData(JVMConfigurationKeys.ANNOTATIONS_PATH_KEY, annotationsPath);
         return configuration;
     }
+
+    private static boolean includeJdkAnnotations(@NotNull CompilerSpecialMode mode) {
+        return mode == REGULAR || mode == STDLIB || mode == IDEA;
+    }
+
+    public static boolean includeKotlinRuntime(@NotNull CompilerSpecialMode mode) {
+        return mode == REGULAR;
+    }
+
+    public static boolean includeJdk(@NotNull CompilerSpecialMode mode) {
+        return mode != IDEA;
+    }
 }