From 19d24c3c5065d0e7c59c3dd77a10f40ddcf3a253 Mon Sep 17 00:00:00 2001
From: Yan Zhulanow <yan.zhulanow@jetbrains.com>
Date: Fri, 27 Feb 2015 15:30:33 +0300
Subject: [PATCH] Rename AndroidExpressionCodegen to
 AndroidExpressionCodegenExtension

---
 .../android-compiler-plugin/src/AndroidComponentRegistrar.kt  | 4 ++--
 .../kotlin/lang/resolve/android/test/CompilerTestUtils.kt     | 4 ++--
 plugins/android-idea-plugin/src/META-INF/plugin.xml           | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/plugins/android-compiler-plugin/src/AndroidComponentRegistrar.kt b/plugins/android-compiler-plugin/src/AndroidComponentRegistrar.kt
index 5098b04e0e1..f609a5e8c56 100644
--- a/plugins/android-compiler-plugin/src/AndroidComponentRegistrar.kt
+++ b/plugins/android-compiler-plugin/src/AndroidComponentRegistrar.kt
@@ -88,7 +88,7 @@ public class CliAndroidDeclarationsProvider(private val project: Project) : Exte
     }
 }
 
-public class AndroidExpressionCodegen : ExpressionCodegenExtension {
+public class AndroidExpressionCodegenExtension : ExpressionCodegenExtension {
     default object {
         private val PROPERTY_NAME = "_\$_findViewCache"
         private val METHOD_NAME = "_\$_findCachedViewById"
@@ -243,7 +243,7 @@ public class AndroidComponentRegistrar : ComponentRegistrar {
             project.registerService(javaClass<AndroidUIXmlProcessor>(), CliAndroidUIXmlProcessor(project, androidManifest, androidResPath))
 
             ExternalDeclarationsProvider.registerExtension(project, CliAndroidDeclarationsProvider(project))
-            ExpressionCodegenExtension.registerExtension(project, AndroidExpressionCodegen())
+            ExpressionCodegenExtension.registerExtension(project, AndroidExpressionCodegenExtension())
         }
     }
 }
\ No newline at end of file
diff --git a/plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/CompilerTestUtils.kt b/plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/CompilerTestUtils.kt
index d71068db0eb..4345437b070 100644
--- a/plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/CompilerTestUtils.kt
+++ b/plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/CompilerTestUtils.kt
@@ -20,7 +20,7 @@ import com.intellij.openapi.project.Project
 import org.jetbrains.kotlin.extensions.ExternalDeclarationsProvider
 import org.jetbrains.kotlin.android.AndroidConfigurationKeys
 import org.jetbrains.kotlin.codegen.extensions.ExpressionCodegenExtension
-import org.jetbrains.kotlin.android.AndroidExpressionCodegen
+import org.jetbrains.kotlin.android.AndroidExpressionCodegenExtension
 import com.intellij.testFramework.UsefulTestCase
 import org.jetbrains.kotlin.analyzer.ModuleInfo
 import org.jetbrains.kotlin.psi.JetFile
@@ -50,6 +50,6 @@ fun UsefulTestCase.createAndroidTestEnvironment(
     val myEnvironment = JetCoreEnvironment.createForTests(getTestRootDisposable()!!, configuration, EnvironmentConfigFiles.JVM_CONFIG_FILES)
     val project = myEnvironment.getProject()
     ExternalDeclarationsProvider.registerExtension(project, AndroidTestExternalDeclarationsProvider(project, resPath, manifestPath))
-    ExpressionCodegenExtension.registerExtension(project, AndroidExpressionCodegen())
+    ExpressionCodegenExtension.registerExtension(project, AndroidExpressionCodegenExtension())
     return myEnvironment
 }
diff --git a/plugins/android-idea-plugin/src/META-INF/plugin.xml b/plugins/android-idea-plugin/src/META-INF/plugin.xml
index 21d7312cd05..6e41fbe2ca6 100644
--- a/plugins/android-idea-plugin/src/META-INF/plugin.xml
+++ b/plugins/android-idea-plugin/src/META-INF/plugin.xml
@@ -23,7 +23,7 @@
 
   <extensions defaultExtensionNs="org.jetbrains.kotlin">
       <externalDeclarationsProvider implementation="org.jetbrains.kotlin.plugin.android.IDEAndroidExternalDeclarationsProvider"/>
-      <expressionCodegenExtension implementation="org.jetbrains.kotlin.android.AndroidExpressionCodegen"/>
+      <expressionCodegenExtension implementation="org.jetbrains.kotlin.android.AndroidExpressionCodegenExtension"/>
       <findUsagesHandlerDecorator implementation="org.jetbrains.kotlin.plugin.android.AndroidFindUsageHandlerDecorator"/>
       <simpleNameReferenceExtension implementation="org.jetbrains.kotlin.plugin.android.AndroidSimpleNameReferenceExtension"/>
   </extensions>