From 08b5bc7e4cc355b94f190399b684d8a18c78c1bd Mon Sep 17 00:00:00 2001 From: Vladimir Krivosheev Date: Wed, 26 Sep 2018 10:57:45 +0200 Subject: [PATCH] add instanceOrNull because JavaRunConfigurationExtensionManager can be not defined in CLion --- .../JavaRunConfigurationExtensionManager.kt | 5 +++++ .../ExternalSystemRunConfiguration.java | 8 ++++---- .../com/intellij/openapi/components/service.kt | 17 ++--------------- 3 files changed, 11 insertions(+), 19 deletions(-) diff --git a/java/execution/impl/src/com/intellij/execution/JavaRunConfigurationExtensionManager.kt b/java/execution/impl/src/com/intellij/execution/JavaRunConfigurationExtensionManager.kt index c4f1304831f9..d54c862f1c96 100644 --- a/java/execution/impl/src/com/intellij/execution/JavaRunConfigurationExtensionManager.kt +++ b/java/execution/impl/src/com/intellij/execution/JavaRunConfigurationExtensionManager.kt @@ -4,6 +4,7 @@ package com.intellij.execution import com.intellij.execution.configuration.RunConfigurationExtensionsManager import com.intellij.execution.configurations.RunConfigurationBase import com.intellij.openapi.components.service +import com.intellij.openapi.components.serviceOrNull import com.intellij.openapi.diagnostic.logger import com.intellij.openapi.diagnostic.runAndLogException @@ -15,6 +16,10 @@ class JavaRunConfigurationExtensionManager : RunConfigurationExtensionsManager) { LOG.runAndLogException { diff --git a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/execution/ExternalSystemRunConfiguration.java b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/execution/ExternalSystemRunConfiguration.java index a997e2468338..48cad6e0bb6e 100644 --- a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/execution/ExternalSystemRunConfiguration.java +++ b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/execution/ExternalSystemRunConfiguration.java @@ -134,7 +134,7 @@ public class ExternalSystemRunConfiguration extends LocatableConfigurationBase i if (e != null) { mySettings = XmlSerializer.deserialize(e, ExternalSystemTaskExecutionSettings.class); } - JavaRunConfigurationExtensionManager javaRunConfigurationExtensionManager = JavaRunConfigurationExtensionManager.getInstance(); + JavaRunConfigurationExtensionManager javaRunConfigurationExtensionManager = JavaRunConfigurationExtensionManager.getInstanceOrNull(); if (javaRunConfigurationExtensionManager != null) { javaRunConfigurationExtensionManager.readExternal(this, element); } @@ -157,7 +157,7 @@ public class ExternalSystemRunConfiguration extends LocatableConfigurationBase i } } })); - JavaRunConfigurationExtensionManager javaRunConfigurationExtensionManager = JavaRunConfigurationExtensionManager.getInstance(); + JavaRunConfigurationExtensionManager javaRunConfigurationExtensionManager = JavaRunConfigurationExtensionManager.getInstanceOrNull(); if (javaRunConfigurationExtensionManager != null) { javaRunConfigurationExtensionManager.writeExternal(this, element); } @@ -174,7 +174,7 @@ public class ExternalSystemRunConfiguration extends LocatableConfigurationBase i SettingsEditorGroup group = new SettingsEditorGroup<>(); group.addEditor(ExecutionBundle.message("run.configuration.configuration.tab.title"), new ExternalSystemRunConfigurationEditor(getProject(), mySettings.getExternalSystemId())); - JavaRunConfigurationExtensionManager javaRunConfigurationExtensionManager = JavaRunConfigurationExtensionManager.getInstance(); + JavaRunConfigurationExtensionManager javaRunConfigurationExtensionManager = JavaRunConfigurationExtensionManager.getInstanceOrNull(); if (javaRunConfigurationExtensionManager != null) { javaRunConfigurationExtensionManager.appendEditors(this, group); } @@ -327,7 +327,7 @@ public class ExternalSystemRunConfiguration extends LocatableConfigurationBase i progressListener == null || buildOutputParsers.isEmpty() ? null : new BuildOutputInstantReaderImpl(task.getId(), progressListener, buildOutputParsers); - JavaRunConfigurationExtensionManager javaRunConfigurationExtensionManager = JavaRunConfigurationExtensionManager.getInstance(); + JavaRunConfigurationExtensionManager javaRunConfigurationExtensionManager = JavaRunConfigurationExtensionManager.getInstanceOrNull(); if (javaRunConfigurationExtensionManager != null) { javaRunConfigurationExtensionManager.attachExtensionsToProcess(myConfiguration, processHandler, myEnv.getRunnerSettings()); } diff --git a/platform/projectModel-impl/src/com/intellij/openapi/components/service.kt b/platform/projectModel-impl/src/com/intellij/openapi/components/service.kt index ac907bd006b6..bb17353b1afc 100644 --- a/platform/projectModel-impl/src/com/intellij/openapi/components/service.kt +++ b/platform/projectModel-impl/src/com/intellij/openapi/components/service.kt @@ -1,18 +1,4 @@ -/* - * Copyright 2000-2017 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package com.intellij.openapi.components import com.intellij.openapi.components.impl.ComponentManagerImpl @@ -20,6 +6,7 @@ import com.intellij.openapi.components.impl.stores.IComponentStore import com.intellij.openapi.project.Project inline fun service(): T = ServiceManager.getService(T::class.java) +inline fun serviceOrNull(): T? = ServiceManager.getService(T::class.java) inline fun Project.service(): T = ServiceManager.getService(this, T::class.java) val ComponentManager.stateStore: IComponentStore