From 93a3d3a4c4f82f0495166545dc2d0adcdb990c93 Mon Sep 17 00:00:00 2001
From: Natalia Ukhorskaya <natalia.ukhorskaya@jetbrains.com>
Date: Thu, 23 Jul 2015 10:42:50 +0300
Subject: [PATCH] Fix compilation error

---
 .../idea/debugger/breakpoints/KotlinFieldBreakpointType.kt    | 2 +-
 .../kotlin/plugin/android/AndroidGotoDeclarationHandler.kt    | 2 +-
 .../jetbrains/kotlin/plugin/android/AndroidRenameProcessor.kt | 4 ++--
 .../plugin/android/IDEAndroidExternalDeclarationsProvider.kt  | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/idea/src/org/jetbrains/kotlin/idea/debugger/breakpoints/KotlinFieldBreakpointType.kt b/idea/src/org/jetbrains/kotlin/idea/debugger/breakpoints/KotlinFieldBreakpointType.kt
index 081fc139635..ec94fc238cf 100644
--- a/idea/src/org/jetbrains/kotlin/idea/debugger/breakpoints/KotlinFieldBreakpointType.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/debugger/breakpoints/KotlinFieldBreakpointType.kt
@@ -52,7 +52,7 @@ import javax.swing.JComponent
 public class KotlinFieldBreakpointType : JavaBreakpointType<KotlinPropertyBreakpointProperties>, XLineBreakpointType<KotlinPropertyBreakpointProperties>(
         "kotlin-field", JetBundle.message("debugger.field.watchpoints.tab.title")
 ) {
-    override fun createJavaBreakpoint(project: Project, breakpoint: XBreakpoint<KotlinPropertyBreakpointProperties>): Breakpoint<*> {
+    override fun createJavaBreakpoint(project: Project, breakpoint: XBreakpoint<KotlinPropertyBreakpointProperties>): Breakpoint<KotlinPropertyBreakpointProperties> {
         return KotlinFieldBreakpoint(project, breakpoint)
     }
 
diff --git a/plugins/android-idea-plugin/src/org/jetbrains/kotlin/plugin/android/AndroidGotoDeclarationHandler.kt b/plugins/android-idea-plugin/src/org/jetbrains/kotlin/plugin/android/AndroidGotoDeclarationHandler.kt
index c9a558af4fc..b4ddb02921a 100644
--- a/plugins/android-idea-plugin/src/org/jetbrains/kotlin/plugin/android/AndroidGotoDeclarationHandler.kt
+++ b/plugins/android-idea-plugin/src/org/jetbrains/kotlin/plugin/android/AndroidGotoDeclarationHandler.kt
@@ -40,7 +40,7 @@ public class AndroidGotoDeclarationHandler : GotoDeclarationHandler {
             val moduleInfo = sourceElement.getModuleInfo()
             if (moduleInfo !is ModuleSourceInfo) return null
 
-            val parser = ModuleServiceManager.getService(moduleInfo.module, javaClass<AndroidUIXmlProcessor>())
+            val parser = ModuleServiceManager.getService(moduleInfo.module, javaClass<AndroidUIXmlProcessor>())!!
             val psiElements = parser.resourceManager.propertyToXmlAttributes(property)
             val valueElements = psiElements.map { (it as? XmlAttribute)?.getValueElement() as? PsiElement }.filterNotNull()
             if (valueElements.isNotEmpty()) return valueElements.toTypedArray()
diff --git a/plugins/android-idea-plugin/src/org/jetbrains/kotlin/plugin/android/AndroidRenameProcessor.kt b/plugins/android-idea-plugin/src/org/jetbrains/kotlin/plugin/android/AndroidRenameProcessor.kt
index 0df89ffb2bc..7bdb59132b8 100644
--- a/plugins/android-idea-plugin/src/org/jetbrains/kotlin/plugin/android/AndroidRenameProcessor.kt
+++ b/plugins/android-idea-plugin/src/org/jetbrains/kotlin/plugin/android/AndroidRenameProcessor.kt
@@ -93,7 +93,7 @@ public class AndroidRenameProcessor : RenamePsiElementProcessor() {
     ) {
         val module = jetProperty.getModule() ?: return
 
-        val processor = ModuleServiceManager.getService(module, javaClass<AndroidUIXmlProcessor>())
+        val processor = ModuleServiceManager.getService(module, javaClass<AndroidUIXmlProcessor>())!!
         val resourceManager = processor.resourceManager
 
         val psiElements = resourceManager.propertyToXmlAttributes(jetProperty).map { it as? XmlAttribute }.filterNotNull()
@@ -120,7 +120,7 @@ public class AndroidRenameProcessor : RenamePsiElementProcessor() {
         val module = attribute.getModule() ?: ModuleUtilCore.findModuleForFile(
                 attribute.getContainingFile().getVirtualFile(), attribute.getProject()) ?: return
 
-        val processor = ModuleServiceManager.getService(module, javaClass<AndroidUIXmlProcessor>())
+        val processor = ModuleServiceManager.getService(module, javaClass<AndroidUIXmlProcessor>())!!
         if (element == null) return
         val oldPropName = AndroidResourceUtil.getResourceNameByReferenceText(attribute.getValue())
         val newPropName = idToName(newName)
diff --git a/plugins/android-idea-plugin/src/org/jetbrains/kotlin/plugin/android/IDEAndroidExternalDeclarationsProvider.kt b/plugins/android-idea-plugin/src/org/jetbrains/kotlin/plugin/android/IDEAndroidExternalDeclarationsProvider.kt
index bdf62868896..b9db07a49fb 100644
--- a/plugins/android-idea-plugin/src/org/jetbrains/kotlin/plugin/android/IDEAndroidExternalDeclarationsProvider.kt
+++ b/plugins/android-idea-plugin/src/org/jetbrains/kotlin/plugin/android/IDEAndroidExternalDeclarationsProvider.kt
@@ -30,7 +30,7 @@ public class IDEAndroidExternalDeclarationsProvider(private val project: Project
         if (moduleInfo !is ModuleSourceInfo) return listOf()
 
         val module = moduleInfo.module
-        val parser = ModuleServiceManager.getService(module, javaClass<AndroidUIXmlProcessor>())
+        val parser = ModuleServiceManager.getService(module, javaClass<AndroidUIXmlProcessor>())!!
         val syntheticFiles = parser.parseToPsi()
         syntheticFiles?.forEach { it.moduleInfo = moduleInfo }