refactor XmlHandler, optimize imports, remove unused files

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>

compiler/frontend.android/src/org/jetbrains/jet/lang/resolve/android/AndroidUIXmlPathProvider.kt

@@ -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>
-}

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) {
+public fun Attributes.toMap(): HashMap<String, String> {
-            val attrName = getLocalName(index)!!
+    val res = HashMap<String, String>()
-            val attrVal = getValue(index)!!
+    for (index in 0..getLength()-1) {
-            res[attrName] = attrVal
+        val attrName = getLocalName(index)!!
-        }
+        val attrVal = getValue(index)!!
-        return res
+        res[attrName] = attrVal
     }
+    return res
 }
 
 
-

compiler/frontend.android/src/org/jetbrains/jet/lang/resolve/android/CliAndroidUIXmlPathProvider.kt

@@ -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()
-    }
-}
-

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;

idea/src/org/jetbrains/jet/plugin/android/IDEAndroidUIXmlPathProvider.kt

@@ -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/"))
-    }
-}