From fa2fb667e6e8a69f18b607f6ec670075e7773170 Mon Sep 17 00:00:00 2001 From: Vladimir Dolzhenko Date: Mon, 20 Apr 2020 21:51:03 +0200 Subject: [PATCH] Kotlinify JvmPluginStartupComponent p.2 Relates to #KT-38407 --- .../kotlin/idea/JvmPluginStartupComponent.kt | 44 ++++++++----------- 1 file changed, 19 insertions(+), 25 deletions(-) diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/JvmPluginStartupComponent.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/JvmPluginStartupComponent.kt index 5ff1c09a176..270a8943ea6 100644 --- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/JvmPluginStartupComponent.kt +++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/JvmPluginStartupComponent.kt @@ -13,34 +13,28 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +package org.jetbrains.kotlin.idea -package org.jetbrains.kotlin.idea; +import com.intellij.openapi.application.ApplicationManager +import com.intellij.openapi.components.BaseComponent +import org.jetbrains.kotlin.idea.ThreadTrackerPatcherForTeamCityTesting.patchThreadTracker +import org.jetbrains.kotlin.idea.debugger.filter.addKotlinStdlibDebugFilterIfNeeded +import org.jetbrains.kotlin.idea.util.application.isUnitTestMode -import com.intellij.openapi.application.ApplicationManager; -import com.intellij.openapi.components.BaseComponent; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.idea.debugger.filter.DebuggerFiltersUtilKt; +class JvmPluginStartupComponent : BaseComponent { + override fun getComponentName(): String = JvmPluginStartupComponent::class.java.name -public class JvmPluginStartupComponent implements BaseComponent { - public static JvmPluginStartupComponent getInstance() { - return ApplicationManager.getApplication().getComponent(JvmPluginStartupComponent.class); - } - - @Override - @NotNull - public String getComponentName() { - return JvmPluginStartupComponent.class.getName(); - } - - @Override - public void initComponent() { - if (ApplicationManager.getApplication().isUnitTestMode()) { - ThreadTrackerPatcherForTeamCityTesting.INSTANCE.patchThreadTracker(); + override fun initComponent() { + if (isUnitTestMode()) { + patchThreadTracker() } - - DebuggerFiltersUtilKt.addKotlinStdlibDebugFilterIfNeeded(); + addKotlinStdlibDebugFilterIfNeeded() } - @Override - public void disposeComponent() {} -} + override fun disposeComponent() {} + + companion object { + fun getInstance(): JvmPluginStartupComponent = + ApplicationManager.getApplication().getComponent(JvmPluginStartupComponent::class.java) + } +} \ No newline at end of file