Rename jet to kotlin in android-compiler-plugin

generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt

@@ -147,9 +147,9 @@ import org.jetbrains.jet.android.AbstractAndroidGotoTest
 import org.jetbrains.jet.jps.build.android.AbstractAndroidJpsTestCase
 import org.jetbrains.jet.android.AbstractAndroidRenameTest
 import org.jetbrains.jet.android.AbstractAndroidFindUsagesTest
-import org.jetbrains.jet.lang.resolve.android.test.AbstractAndroidBytecodeShapeTest
-import org.jetbrains.jet.lang.resolve.android.test.AbstractAndroidXml2KConversionTest
-import org.jetbrains.jet.lang.resolve.android.test.AbstractAndroidBoxTest
+import org.jetbrains.kotlin.lang.resolve.android.test.AbstractAndroidBytecodeShapeTest
+import org.jetbrains.kotlin.lang.resolve.android.test.AbstractAndroidXml2KConversionTest
+import org.jetbrains.kotlin.lang.resolve.android.test.AbstractAndroidBoxTest
 import org.jetbrains.jet.android.AbstractParserResultEqualityTest
 
 fun main(args: Array<String>) {

plugins/android-compiler-plugin/src/AndroidComponentRegistrar.kt

@@ -22,7 +22,6 @@ import org.jetbrains.kotlin.compiler.plugin.CommandLineProcessor
 import org.jetbrains.kotlin.compiler.plugin.CliOption
 import org.jetbrains.kotlin.compiler.plugin.CliOptionProcessingException
 import org.jetbrains.kotlin.extensions.ExternalDeclarationsProvider
-import org.jetbrains.jet.lang.resolve.android.*
 import com.intellij.openapi.components.ServiceManager
 import com.intellij.openapi.project.Project
 import org.jetbrains.jet.codegen.extensions.ExpressionCodegenExtension
@@ -49,6 +48,9 @@ import org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmDeclarationOrigin
 import org.jetbrains.kotlin.codegen.FunctionCodegen
 import org.jetbrains.kotlin.config.CompilerConfiguration
 import org.jetbrains.kotlin.config.CompilerConfigurationKey
+import org.jetbrains.kotlin.lang.resolve.android.AndroidConst
+import org.jetbrains.kotlin.lang.resolve.android.AndroidUIXmlProcessor
+import org.jetbrains.kotlin.lang.resolve.android.CliAndroidUIXmlProcessor
 
 public object AndroidConfigurationKeys {
 

plugins/android-compiler-plugin/src/org/jetbrains/kotlin/lang/resolve/android/AndroidConst.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.lang.resolve.android
+package org.jetbrains.kotlin.lang.resolve.android
 
 import com.intellij.openapi.util.Key
 

plugins/android-compiler-plugin/src/org/jetbrains/kotlin/lang/resolve/android/AndroidResourceManager.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.lang.resolve.android
+package org.jetbrains.kotlin.lang.resolve.android
 
 import com.intellij.psi.PsiFile
 import com.intellij.psi.PsiElement

plugins/android-compiler-plugin/src/org/jetbrains/kotlin/lang/resolve/android/AndroidUIXmlProcessor.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.lang.resolve.android
+package org.jetbrains.kotlin.lang.resolve.android
 
 import java.util.ArrayList
 import java.util.HashMap

plugins/android-compiler-plugin/src/org/jetbrains/kotlin/lang/resolve/android/AndroidUtil.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.lang.resolve.android
+package org.jetbrains.kotlin.lang.resolve.android
 
 import com.intellij.psi.PsiFile
 import com.intellij.psi.PsiElement

plugins/android-compiler-plugin/src/org/jetbrains/kotlin/lang/resolve/android/AndroidXmlHandler.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.lang.resolve.android
+package org.jetbrains.kotlin.lang.resolve.android
 
 import org.xml.sax.helpers.DefaultHandler
 import org.xml.sax.Attributes

plugins/android-compiler-plugin/src/org/jetbrains/kotlin/lang/resolve/android/CliAndroidResourceManager.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.lang.resolve.android
+package org.jetbrains.kotlin.lang.resolve.android
 
 import com.intellij.openapi.project.Project
 import java.io.File

plugins/android-compiler-plugin/src/org/jetbrains/kotlin/lang/resolve/android/CliAndroidUIXmlProcessor.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.lang.resolve.android
+package org.jetbrains.kotlin.lang.resolve.android
 
 import java.util.ArrayList
 import com.intellij.openapi.project.Project

plugins/android-compiler-plugin/src/org/jetbrains/kotlin/lang/resolve/android/Context.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.lang.resolve.android
+package org.jetbrains.kotlin.lang.resolve.android
 
 import java.util.ArrayList
 

plugins/android-compiler-plugin/src/org/jetbrains/kotlin/lang/resolve/android/KotlinWriter.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.lang.resolve.android
+package org.jetbrains.kotlin.lang.resolve.android
 
 trait KotlinWriter {
     fun toStringBuffer(): StringBuffer

plugins/android-compiler-plugin/src/org/jetbrains/kotlin/lang/resolve/android/androidResources.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.lang.resolve.android
+package org.jetbrains.kotlin.lang.resolve.android
 
 public data class AndroidModuleInfo(val applicationPackage: String, val mainResDirectory: String?)
 

plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/AbstractAndroidBoxTest.kt

@@ -14,20 +14,20 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.lang.resolve.android.test
+package org.jetbrains.kotlin.lang.resolve.android.test
 
+import org.jetbrains.kotlin.codegen.generated.AbstractBlackBoxCodegenTest
+import org.jetbrains.kotlin.config.CompilerConfiguration
 import java.io.File
 import com.intellij.util.Processor
+import org.jetbrains.kotlin.test.ConfigurationKind
+import org.jetbrains.kotlin.test.TestJdkKind
+import org.jetbrains.kotlin.test.JetTestUtils
 import java.util.regex.Pattern
 import com.intellij.openapi.util.io.FileUtil
 import java.util.ArrayList
 import java.util.Collections
 import com.intellij.util.ArrayUtil
-import org.jetbrains.kotlin.codegen.generated.AbstractBlackBoxCodegenTest
-import org.jetbrains.kotlin.test.JetTestUtils
-import org.jetbrains.kotlin.test.ConfigurationKind
-import org.jetbrains.kotlin.test.TestJdkKind
-import org.jetbrains.kotlin.config.CompilerConfiguration
 import org.jetbrains.kotlin.codegen.CodegenTestFiles
 
 public abstract class AbstractAndroidBoxTest : AbstractBlackBoxCodegenTest() {

plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/AbstractAndroidBytecodeShapeTest.kt

@@ -14,16 +14,13 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.lang.resolve.android.test
+package org.jetbrains.kotlin.lang.resolve.android.test
 
-import org.jetbrains.kotlin.android.AndroidConfigurationKeys
-import org.jetbrains.jet.codegen.extensions.ExpressionCodegenExtension
-import org.jetbrains.kotlin.android.AndroidExpressionCodegen
 import org.jetbrains.kotlin.codegen.AbstractBytecodeTextTest
-import org.jetbrains.kotlin.test.JetTestUtils
+import org.jetbrains.kotlin.config.CompilerConfiguration
 import org.jetbrains.kotlin.test.ConfigurationKind
 import org.jetbrains.kotlin.test.TestJdkKind
-import org.jetbrains.kotlin.config.CompilerConfiguration
+import org.jetbrains.kotlin.test.JetTestUtils
 
 public abstract class AbstractAndroidBytecodeShapeTest : AbstractBytecodeTextTest() {
 
@@ -48,4 +45,4 @@ public abstract class AbstractAndroidBytecodeShapeTest : AbstractBytecodeTextTes
         val expected = readExpectedOccurrences(fileName)
         countAndCompareActualOccurrences(expected)
     }
-}
+}

plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/AbstractAndroidXml2KConversionTest.kt

@@ -14,23 +14,18 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.lang.resolve.android.test
+package org.jetbrains.kotlin.lang.resolve.android.test
 
 import com.intellij.testFramework.UsefulTestCase
-import java.io.File
-import java.io.IOException
-import java.util.Scanner
-import java.io.FileWriter
-import org.junit.Assert
-import kotlin.test.fail
-import org.jetbrains.jet.lang.resolve.android.CliAndroidUIXmlProcessor
-import org.jetbrains.jet.lang.resolve.android.AndroidUIXmlProcessor
-import kotlin.test.assertEquals
-import org.jetbrains.kotlin.test.JetTestUtils
 import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment
+import java.io.File
+import org.jetbrains.kotlin.test.JetTestUtils
 import org.jetbrains.kotlin.test.ConfigurationKind
 import org.jetbrains.kotlin.test.TestJdkKind
 import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles
+import org.jetbrains.kotlin.lang.resolve.android.CliAndroidUIXmlProcessor
+import org.jetbrains.kotlin.lang.resolve.android.AndroidUIXmlProcessor
+import kotlin.test.*
 
 public abstract class AbstractAndroidXml2KConversionTest : UsefulTestCase() {
 
@@ -64,4 +59,4 @@ public abstract class AbstractAndroidXml2KConversionTest : UsefulTestCase() {
         val configuration = JetTestUtils.compilerConfigurationForTests(ConfigurationKind.ALL, TestJdkKind.MOCK_JDK)
         return JetCoreEnvironment.createForTests(getTestRootDisposable()!!, configuration, EnvironmentConfigFiles.JVM_CONFIG_FILES)
     }
-}
+}

plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/AndroidBoxTestGenerated.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.lang.resolve.android.test;
+package org.jetbrains.kotlin.lang.resolve.android.test;
 
 import com.intellij.testFramework.TestDataPath;
 import org.jetbrains.kotlin.test.InnerTestClasses;
@@ -26,7 +26,7 @@ import org.junit.runner.RunWith;
 import java.io.File;
 import java.util.regex.Pattern;
 
-/** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
+/** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
 @InnerTestClasses({AndroidBoxTestGenerated.Android.class, AndroidBoxTestGenerated.Invoke.class})
 @RunWith(JUnit3RunnerWithInners.class)

plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/AndroidBytecodeShapeTestGenerated.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,9 +14,10 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.lang.resolve.android.test;
+package org.jetbrains.kotlin.lang.resolve.android.test;
 
 import com.intellij.testFramework.TestDataPath;
+import org.jetbrains.kotlin.test.InnerTestClasses;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
 import org.jetbrains.kotlin.test.JetTestUtils;
 import org.jetbrains.kotlin.test.TestMetadata;
@@ -25,7 +26,7 @@ import org.junit.runner.RunWith;
 import java.io.File;
 import java.util.regex.Pattern;
 
-/** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
+/** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
 @TestMetadata("plugins/android-compiler-plugin/testData/codegen/bytecodeShape")
 @TestDataPath("$PROJECT_ROOT")

plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/AndroidXml2KConversionTestGenerated.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.lang.resolve.android.test;
+package org.jetbrains.kotlin.lang.resolve.android.test;
 
 import com.intellij.testFramework.TestDataPath;
 import org.jetbrains.kotlin.test.InnerTestClasses;
@@ -26,7 +26,7 @@ import org.junit.runner.RunWith;
 import java.io.File;
 import java.util.regex.Pattern;
 
-/** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
+/** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
 @InnerTestClasses({AndroidXml2KConversionTestGenerated.Simple.class, AndroidXml2KConversionTestGenerated.Exceptions.class})
 @RunWith(JUnit3RunnerWithInners.class)

plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/CompilerTestUtils.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.lang.resolve.android.test
+package org.jetbrains.kotlin.lang.resolve.android.test
 
 import com.intellij.openapi.project.Project
 import org.jetbrains.kotlin.extensions.ExternalDeclarationsProvider
@@ -22,12 +22,12 @@ import org.jetbrains.kotlin.android.AndroidConfigurationKeys
 import org.jetbrains.jet.codegen.extensions.ExpressionCodegenExtension
 import org.jetbrains.kotlin.android.AndroidExpressionCodegen
 import com.intellij.testFramework.UsefulTestCase
-import org.jetbrains.jet.lang.resolve.android.CliAndroidUIXmlProcessor
 import org.jetbrains.kotlin.analyzer.ModuleInfo
 import org.jetbrains.kotlin.psi.JetFile
 import org.jetbrains.kotlin.config.CompilerConfiguration
 import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment
 import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles
+import org.jetbrains.kotlin.lang.resolve.android.CliAndroidUIXmlProcessor
 
 private class AndroidTestExternalDeclarationsProvider(
         val project: Project,

plugins/android-idea-plugin/src/org/jetbrains/jet/plugin/android/AndroidRenameProcessor.kt

@@ -18,9 +18,7 @@ package org.jetbrains.jet.plugin.android
 
 import com.intellij.psi.PsiElement
 import com.intellij.refactoring.rename.RenamePsiElementProcessor
-import org.jetbrains.jet.lang.resolve.android.isAndroidSyntheticElement
 import com.intellij.openapi.components.ServiceManager
-import org.jetbrains.jet.lang.resolve.android.AndroidUIXmlProcessor
 import com.intellij.psi.search.SearchScope
 import com.intellij.psi.xml.XmlAttributeValue
 import org.jetbrains.android.dom.wrappers.LazyValueResourceElementWrapper
@@ -29,11 +27,11 @@ import com.intellij.psi.xml.XmlAttribute
 import com.intellij.psi.impl.light.LightElement
 import com.intellij.openapi.module.ModuleServiceManager
 import com.intellij.openapi.module.Module
-import org.jetbrains.jet.lang.resolve.android.nameToIdDeclaration
-import org.jetbrains.jet.lang.resolve.android.idToName
+import org.jetbrains.kotlin.lang.resolve.android.nameToIdDeclaration
+import org.jetbrains.kotlin.lang.resolve.android.idToName
 import com.intellij.psi.PsiField
 import com.intellij.psi.PsiClass
-import org.jetbrains.jet.lang.resolve.android.AndroidConst
+import org.jetbrains.kotlin.lang.resolve.android.AndroidConst
 import com.intellij.openapi.module.ModuleUtil
 import com.intellij.openapi.module.ModuleUtilCore
 import org.jetbrains.kotlin.psi.JetProperty
@@ -42,6 +40,8 @@ import org.jetbrains.kotlin.idea.caches.resolve.getModuleInfo
 import org.jetbrains.kotlin.psi.JetFile
 import org.jetbrains.kotlin.psi.moduleInfo
 import org.jetbrains.kotlin.asJava.namedUnwrappedElement
+import org.jetbrains.kotlin.lang.resolve.android.isAndroidSyntheticElement
+import org.jetbrains.kotlin.lang.resolve.android.AndroidUIXmlProcessor
 
 public class AndroidRenameProcessor : RenamePsiElementProcessor() {
 

plugins/android-idea-plugin/src/org/jetbrains/jet/plugin/android/AndroidXmlVisitor.kt

@@ -22,8 +22,9 @@ import com.intellij.psi.xml.XmlElement
 import com.intellij.psi.xml.XmlTag
 import com.intellij.psi.xml.XmlAttribute
 import org.jetbrains.jet.lang.resolve.android.AndroidResourceManager
-import org.jetbrains.jet.lang.resolve.android.idToName
-import org.jetbrains.jet.lang.resolve.android.AndroidConst
+import org.jetbrains.kotlin.lang.resolve.android.idToName
+import org.jetbrains.kotlin.lang.resolve.android.AndroidConst
+import org.jetbrains.kotlin.lang.resolve.android.AndroidResourceManager
 
 class AndroidXmlVisitor(
         val resourceManager: AndroidResourceManager,