From 79793a4bda4eafd94571e4fc6114dee7fb7306e6 Mon Sep 17 00:00:00 2001 From: Dmitry Gridin Date: Wed, 17 Apr 2019 18:10:26 +0700 Subject: [PATCH] Replace deprecated classes with parent --- .../idea/JvmPluginStartupComponent.java | 4 ++-- .../idea/compiler/KotlinCompilerManager.java | 5 ++--- .../KotlinNativeLoadingMetadataCache.kt | 4 ++-- .../kotlin/idea/PluginStartupComponent.java | 4 ++-- .../ImplementAbstractMemberIntention.kt | 21 ++++++++++--------- .../versions/KotlinUpdatePluginComponent.kt | 4 ++-- 6 files changed, 21 insertions(+), 21 deletions(-) diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/JvmPluginStartupComponent.java b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/JvmPluginStartupComponent.java index 33a65544438..5ff1c09a176 100644 --- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/JvmPluginStartupComponent.java +++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/JvmPluginStartupComponent.java @@ -17,11 +17,11 @@ package org.jetbrains.kotlin.idea; import com.intellij.openapi.application.ApplicationManager; -import com.intellij.openapi.components.ApplicationComponent; +import com.intellij.openapi.components.BaseComponent; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.idea.debugger.filter.DebuggerFiltersUtilKt; -public class JvmPluginStartupComponent implements ApplicationComponent { +public class JvmPluginStartupComponent implements BaseComponent { public static JvmPluginStartupComponent getInstance() { return ApplicationManager.getApplication().getComponent(JvmPluginStartupComponent.class); } diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/compiler/KotlinCompilerManager.java b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/compiler/KotlinCompilerManager.java index 50f71771bb0..7bdeb86784b 100644 --- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/compiler/KotlinCompilerManager.java +++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/compiler/KotlinCompilerManager.java @@ -20,7 +20,7 @@ import com.intellij.diagnostic.PluginException; import com.intellij.ide.plugins.PluginManagerCore; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.compiler.*; -import com.intellij.openapi.components.AbstractProjectComponent; +import com.intellij.openapi.components.ProjectComponent; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.io.FileUtilRt; @@ -38,7 +38,7 @@ import java.util.Set; import static org.jetbrains.kotlin.config.CompilerRunnerConstants.INTERNAL_ERROR_PREFIX; import static org.jetbrains.kotlin.config.CompilerRunnerConstants.KOTLIN_COMPILER_NAME; -public class KotlinCompilerManager extends AbstractProjectComponent { +public class KotlinCompilerManager implements ProjectComponent { private static final Logger LOG = Logger.getInstance(KotlinCompilerManager.class); // Comes from external make @@ -46,7 +46,6 @@ public class KotlinCompilerManager extends AbstractProjectComponent { private static final Set FILE_EXTS_WHICH_NEEDS_REFRESH = ContainerUtil.immutableSet(JavaScript.DOT_EXTENSION, ".map"); public KotlinCompilerManager(Project project, CompilerManager manager) { - super(project); manager.addCompilableFileType(KotlinFileType.INSTANCE); manager.addCompilationStatusListener(new CompilationStatusListener() { @Override diff --git a/idea/idea-native/src/org/jetbrains/kotlin/ide/konan/decompiler/KotlinNativeLoadingMetadataCache.kt b/idea/idea-native/src/org/jetbrains/kotlin/ide/konan/decompiler/KotlinNativeLoadingMetadataCache.kt index 1d308c743ec..5421031314c 100644 --- a/idea/idea-native/src/org/jetbrains/kotlin/ide/konan/decompiler/KotlinNativeLoadingMetadataCache.kt +++ b/idea/idea-native/src/org/jetbrains/kotlin/ide/konan/decompiler/KotlinNativeLoadingMetadataCache.kt @@ -6,7 +6,7 @@ package org.jetbrains.kotlin.ide.konan.decompiler import com.intellij.openapi.application.ApplicationManager -import com.intellij.openapi.components.ApplicationComponent +import com.intellij.openapi.components.BaseComponent import com.intellij.openapi.vfs.VirtualFile import com.intellij.util.containers.ContainerUtil.createConcurrentWeakValueMap import org.jetbrains.kotlin.konan.library.KLIB_METADATA_FILE_EXTENSION @@ -15,7 +15,7 @@ import org.jetbrains.kotlin.metadata.konan.KonanProtoBuf import org.jetbrains.kotlin.serialization.konan.parseModuleHeader import org.jetbrains.kotlin.serialization.konan.parsePackageFragment -class KotlinNativeLoadingMetadataCache : ApplicationComponent { +class KotlinNativeLoadingMetadataCache : BaseComponent { companion object { @JvmStatic diff --git a/idea/src/org/jetbrains/kotlin/idea/PluginStartupComponent.java b/idea/src/org/jetbrains/kotlin/idea/PluginStartupComponent.java index 1b8fa218aa2..1f51bfad486 100644 --- a/idea/src/org/jetbrains/kotlin/idea/PluginStartupComponent.java +++ b/idea/src/org/jetbrains/kotlin/idea/PluginStartupComponent.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.application.PathMacros; -import com.intellij.openapi.components.ApplicationComponent; +import com.intellij.openapi.components.BaseComponent; import com.intellij.openapi.components.ServiceManager; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.editor.EditorFactory; @@ -38,7 +38,7 @@ import java.io.IOException; import static org.jetbrains.kotlin.idea.TestResourceBundleKt.registerAdditionalResourceBundleInTests; -public class PluginStartupComponent implements ApplicationComponent { +public class PluginStartupComponent implements BaseComponent { private static final Logger LOG = Logger.getInstance(PluginStartupComponent.class); private static final String KOTLIN_BUNDLED = "KOTLIN_BUNDLED"; diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/ImplementAbstractMemberIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/ImplementAbstractMemberIntention.kt index 199bb073586..6bd5769ffdd 100644 --- a/idea/src/org/jetbrains/kotlin/idea/intentions/ImplementAbstractMemberIntention.kt +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/ImplementAbstractMemberIntention.kt @@ -26,6 +26,7 @@ import com.intellij.openapi.diagnostic.Logger import com.intellij.openapi.editor.Editor import com.intellij.openapi.fileEditor.FileEditorManager import com.intellij.openapi.fileEditor.OpenFileDescriptor +import com.intellij.openapi.ui.popup.IPopupChooserBuilder import com.intellij.openapi.ui.popup.PopupChooserBuilder import com.intellij.openapi.util.TextRange import com.intellij.psi.PsiClass @@ -214,17 +215,17 @@ abstract class ImplementAbstractMemberIntentionBase : cellRenderer = renderer } val builder = PopupChooserBuilder(list) - renderer.installSpeedSearch(builder) + renderer.installSpeedSearch(builder as IPopupChooserBuilder<*>) builder - .setTitle(CodeInsightBundle.message("intention.implement.abstract.method.class.chooser.title")) - .setItemChoosenCallback { - val index = list.selectedIndex - if (index < 0) return@setItemChoosenCallback - @Suppress("UNCHECKED_CAST") - implementInClass(element, list.selectedValues.toList() as List) - } - .createPopup() - .showInBestPositionFor(editor) + .setTitle(CodeInsightBundle.message("intention.implement.abstract.method.class.chooser.title")) + .setItemChoosenCallback { + val index = list.selectedIndex + if (index < 0) return@setItemChoosenCallback + @Suppress("UNCHECKED_CAST") + implementInClass(element, list.selectedValues.toList() as List) + } + .createPopup() + .showInBestPositionFor(editor) } } diff --git a/idea/src/org/jetbrains/kotlin/idea/versions/KotlinUpdatePluginComponent.kt b/idea/src/org/jetbrains/kotlin/idea/versions/KotlinUpdatePluginComponent.kt index 064d37a5230..66a5f1c702b 100644 --- a/idea/src/org/jetbrains/kotlin/idea/versions/KotlinUpdatePluginComponent.kt +++ b/idea/src/org/jetbrains/kotlin/idea/versions/KotlinUpdatePluginComponent.kt @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.versions import com.intellij.ide.util.PropertiesComponent import com.intellij.openapi.application.ApplicationManager -import com.intellij.openapi.components.ApplicationComponent +import com.intellij.openapi.components.BaseComponent import com.intellij.openapi.vfs.JarFileSystem import com.intellij.openapi.vfs.LocalFileSystem import com.intellij.openapi.vfs.VfsUtilCore @@ -33,7 +33,7 @@ private val INSTALLED_KOTLIN_VERSION = "installed.kotlin.plugin.version" * Component forces update for built-in libraries in plugin directory. They are ignored because of * com.intellij.util.indexing.FileBasedIndex.isUnderConfigOrSystem() */ -class KotlinUpdatePluginComponent : ApplicationComponent { +class KotlinUpdatePluginComponent : BaseComponent { override fun initComponent() { if (ApplicationManager.getApplication()?.isUnitTestMode == true) { return