From ab0c922f53f7d326ea4bdd83b3d2cb8470e8cdd2 Mon Sep 17 00:00:00 2001
From: Mikhail Mutcianko <mutcianko.m@gmail.com>
Date: Wed, 23 Jul 2014 18:28:40 +0400
Subject: [PATCH] refactor XmlHandler, optimize imports, remove unused files

---
 compiler/backend/backend.iml                   |  1 -
 .../android/AndroidUIXmlPathProvider.kt        | 12 ------------
 .../lang/resolve/android/AndroidXmlHandler.kt  | 18 +++++++++---------
 .../android/CliAndroidUIXmlPathProvider.kt     | 12 ------------
 .../jvm/TopDownAnalyzerFacadeForJVM.java       |  2 --
 .../android/IDEAndroidUIXmlPathProvider.kt     | 12 ------------
 6 files changed, 9 insertions(+), 48 deletions(-)
 delete mode 100644 compiler/frontend.android/src/org/jetbrains/jet/lang/resolve/android/AndroidUIXmlPathProvider.kt
 delete mode 100644 compiler/frontend.android/src/org/jetbrains/jet/lang/resolve/android/CliAndroidUIXmlPathProvider.kt
 delete mode 100644 idea/src/org/jetbrains/jet/plugin/android/IDEAndroidUIXmlPathProvider.kt

diff --git a/compiler/backend/backend.iml b/compiler/backend/backend.iml
index a2f9907df99..37d5b825d8e 100644
--- a/compiler/backend/backend.iml
+++ b/compiler/backend/backend.iml
@@ -15,6 +15,5 @@
     <orderEntry type="module" module-name="serialization.jvm" />
     <orderEntry type="module" module-name="backend-common" exported="" />
     <orderEntry type="module" module-name="util" />
-    <orderEntry type="module" module-name="frontend.android" />
   </component>
 </module>
diff --git a/compiler/frontend.android/src/org/jetbrains/jet/lang/resolve/android/AndroidUIXmlPathProvider.kt b/compiler/frontend.android/src/org/jetbrains/jet/lang/resolve/android/AndroidUIXmlPathProvider.kt
deleted file mode 100644
index 2cf97c067db..00000000000
--- a/compiler/frontend.android/src/org/jetbrains/jet/lang/resolve/android/AndroidUIXmlPathProvider.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.jetbrains.jet.lang.resolve.android
-
-import java.io.File
-import com.intellij.openapi.project.Project
-import com.intellij.openapi.components.ServiceManager
-
-trait AndroidUIXmlPathProvider {
-    class object {
-        fun getInstance(project: Project) = ServiceManager.getService(project, javaClass<AndroidUIXmlPathProvider>())!!
-    }
-    public fun getPaths(): Collection<File>
-}
diff --git a/compiler/frontend.android/src/org/jetbrains/jet/lang/resolve/android/AndroidXmlHandler.kt b/compiler/frontend.android/src/org/jetbrains/jet/lang/resolve/android/AndroidXmlHandler.kt
index 87183b51cb9..e215f0b4420 100644
--- a/compiler/frontend.android/src/org/jetbrains/jet/lang/resolve/android/AndroidXmlHandler.kt
+++ b/compiler/frontend.android/src/org/jetbrains/jet/lang/resolve/android/AndroidXmlHandler.kt
@@ -26,16 +26,16 @@ class AndroidXmlHandler(val elementCallback: (String, String)-> Unit): DefaultHa
 
     }
 
-    public fun Attributes.toMap(): HashMap<String, String> {
-        val res = HashMap<String, String>()
-        for (index in 0..getLength()-1) {
-            val attrName = getLocalName(index)!!
-            val attrVal = getValue(index)!!
-            res[attrName] = attrVal
-        }
-        return res
+}
+
+public fun Attributes.toMap(): HashMap<String, String> {
+    val res = HashMap<String, String>()
+    for (index in 0..getLength()-1) {
+        val attrName = getLocalName(index)!!
+        val attrVal = getValue(index)!!
+        res[attrName] = attrVal
     }
+    return res
 }
 
 
-
diff --git a/compiler/frontend.android/src/org/jetbrains/jet/lang/resolve/android/CliAndroidUIXmlPathProvider.kt b/compiler/frontend.android/src/org/jetbrains/jet/lang/resolve/android/CliAndroidUIXmlPathProvider.kt
deleted file mode 100644
index 9d6ad36e762..00000000000
--- a/compiler/frontend.android/src/org/jetbrains/jet/lang/resolve/android/CliAndroidUIXmlPathProvider.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.jetbrains.jet.lang.resolve.android
-
-import java.io.File
-import java.util.ArrayList
-
-class CliAndroidUIXmlPathProvider(val searchPath: String?): AndroidUIXmlPathProvider {
-
-    override fun getPaths(): MutableCollection<File> {
-        return if (searchPath != null) arrayListOf(File(searchPath + "/layout/")) else ArrayList()
-    }
-}
-
diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/TopDownAnalyzerFacadeForJVM.java b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/TopDownAnalyzerFacadeForJVM.java
index e73c79e36d5..bcf3314a589 100644
--- a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/TopDownAnalyzerFacadeForJVM.java
+++ b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/TopDownAnalyzerFacadeForJVM.java
@@ -24,7 +24,6 @@ import com.intellij.psi.search.GlobalSearchScope;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.lang.resolve.android.AndroidUIXmlParser;
-import org.jetbrains.jet.lang.resolve.android.AndroidUIXmlPathProvider;
 import org.jetbrains.kotlin.analyzer.AnalysisResult;
 import org.jetbrains.kotlin.builtins.KotlinBuiltIns;
 import org.jetbrains.kotlin.context.GlobalContext;
@@ -45,7 +44,6 @@ import org.jetbrains.kotlin.resolve.ImportPath;
 import org.jetbrains.kotlin.resolve.TopDownAnalysisParameters;
 import org.jetbrains.kotlin.resolve.lazy.declarations.FileBasedDeclarationProviderFactory;
 
-import java.io.File;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
diff --git a/idea/src/org/jetbrains/jet/plugin/android/IDEAndroidUIXmlPathProvider.kt b/idea/src/org/jetbrains/jet/plugin/android/IDEAndroidUIXmlPathProvider.kt
deleted file mode 100644
index 21cf87d8168..00000000000
--- a/idea/src/org/jetbrains/jet/plugin/android/IDEAndroidUIXmlPathProvider.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.jetbrains.jet.plugin.android
-
-import com.intellij.openapi.project.Project
-import org.jetbrains.jet.lang.resolve.android.AndroidUIXmlPathProvider
-import java.io.File
-
-class IDEAndroidUIXmlPathProvider(val project: Project): AndroidUIXmlPathProvider {
-
-    override fun getPaths(): MutableCollection<File> {
-        return arrayListOf(File(project.getBasePath() + "/res/layout/"))
-    }
-}
\ No newline at end of file