From 146eb941d0babe160c0ee0e5f09600ce3d2f9145 Mon Sep 17 00:00:00 2001
From: pTalanov <talanov.pavel@gmail.com>
Date: Thu, 1 Mar 2012 17:34:34 +0400
Subject: [PATCH] Config refactoring.

---
 .../k2js/{test => config}/TestConfig.java     | 32 ++-----------------
 .../src/org/jetbrains/k2js/config/Config.java | 31 ++++++++++++++++--
 .../org/jetbrains/k2js/config/IDEAConfig.java | 11 +------
 3 files changed, 32 insertions(+), 42 deletions(-)
 rename js/js.tests/test/org/jetbrains/k2js/{test => config}/TestConfig.java (74%)

diff --git a/js/js.tests/test/org/jetbrains/k2js/test/TestConfig.java b/js/js.tests/test/org/jetbrains/k2js/config/TestConfig.java
similarity index 74%
rename from js/js.tests/test/org/jetbrains/k2js/test/TestConfig.java
rename to js/js.tests/test/org/jetbrains/k2js/config/TestConfig.java
index 189e4b8b049..c918ad28789 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/TestConfig.java
+++ b/js/js.tests/test/org/jetbrains/k2js/config/TestConfig.java
@@ -14,14 +14,13 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test;
+package org.jetbrains.k2js.config;
 
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.io.FileUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.lang.psi.JetFile;
-import org.jetbrains.k2js.config.Config;
 import org.jetbrains.k2js.utils.JetFileUtils;
 
 import java.io.FileInputStream;
@@ -29,7 +28,6 @@ import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -38,38 +36,12 @@ import java.util.List;
 //TODO: review/refactor
 public final class TestConfig extends Config {
 
-    @NotNull
-    private static final List<String> LIB_FILE_NAMES = Arrays.asList(
-            "/core/annotations.kt",
-            "/jquery/common.kt",
-            "/jquery/ui.kt",
-            "/core/javautil.kt",
-            "/core/javalang.kt",
-            "/core/core.kt",
-            "/core/math.kt",
-            "/core/json.kt",
-            "/raphael/raphael.kt",
-            "/html5/canvas.kt",
-            "/html5/files.kt",
-            "/html5/image.kt"
-    );
-
-    private static final String LIBRARIES_LOCATION = "js.libraries/src";
 
     @Nullable
     private /*var*/ List<JetFile> jsLibFiles = null;
 
-    @NotNull
-    private final Project project;
-
     public TestConfig(@NotNull Project project) {
-        this.project = project;
-    }
-
-    @NotNull
-    @Override
-    public Project getProject() {
-        return project;
+        super(project);
     }
 
     @NotNull
diff --git a/js/js.translator/src/org/jetbrains/k2js/config/Config.java b/js/js.translator/src/org/jetbrains/k2js/config/Config.java
index 9bef13e1220..269ac50498f 100644
--- a/js/js.translator/src/org/jetbrains/k2js/config/Config.java
+++ b/js/js.translator/src/org/jetbrains/k2js/config/Config.java
@@ -20,6 +20,7 @@ import com.intellij.openapi.project.Project;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.lang.psi.JetFile;
 
+import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -30,9 +31,35 @@ import java.util.List;
 public abstract class Config {
 
     @NotNull
-    public abstract Project getProject();
+    protected static final List<String> LIB_FILE_NAMES = Arrays.asList(
+            "/core/annotations.kt",
+            "/jquery/common.kt",
+            "/jquery/ui.kt",
+            "/core/javautil.kt",
+            "/core/javalang.kt",
+            "/core/core.kt",
+            "/core/math.kt",
+            "/core/json.kt",
+            "/raphael/raphael.kt",
+            "/html5/canvas.kt",
+            "/html5/files.kt",
+            "/html5/image.kt"
+    );
+
+    protected static final String LIBRARIES_LOCATION = "js.libraries/src";
+
+    @NotNull
+    private final Project project;
+
+    public Config(@NotNull Project project) {
+        this.project = project;
+    }
+
+    @NotNull
+    public Project getProject() {
+        return project;
+    }
 
     @NotNull
     public abstract List<JetFile> getLibFiles();
-
 }
diff --git a/js/js.translator/src/org/jetbrains/k2js/config/IDEAConfig.java b/js/js.translator/src/org/jetbrains/k2js/config/IDEAConfig.java
index b421601c274..6788dec178c 100644
--- a/js/js.translator/src/org/jetbrains/k2js/config/IDEAConfig.java
+++ b/js/js.translator/src/org/jetbrains/k2js/config/IDEAConfig.java
@@ -28,17 +28,8 @@ import java.util.List;
  */
 public final class IDEAConfig extends Config {
 
-    @NotNull
-    private final Project project;
-
     public IDEAConfig(@NotNull Project project) {
-        this.project = project;
-    }
-
-    @NotNull
-    @Override
-    public Project getProject() {
-        return project;
+        super(project);
     }
 
     @NotNull