From 594be97b275fe928854e69674490276c5305d9b8 Mon Sep 17 00:00:00 2001 From: nik Date: Fri, 3 Dec 2010 16:49:43 +0300 Subject: [PATCH] disable 'run' action for ruby and python remote debug configurations [rev by A. Pegov] --- .../impl/DefaultJavaProgramRunner.java | 3 +-- .../execution/remote/RemoteConfiguration.java | 4 +++- .../execution/runners/BasicProgramRunner.java | 2 +- ...urationWithSuppressedDefaultRunAction.java | 22 +++++++++++++++++++ 4 files changed, 27 insertions(+), 4 deletions(-) create mode 100644 platform/lang-impl/src/com/intellij/execution/runners/RunConfigurationWithSuppressedDefaultRunAction.java diff --git a/java/execution/impl/src/com/intellij/execution/impl/DefaultJavaProgramRunner.java b/java/execution/impl/src/com/intellij/execution/impl/DefaultJavaProgramRunner.java index ca73da57b4ac..cb3c772dd223 100644 --- a/java/execution/impl/src/com/intellij/execution/impl/DefaultJavaProgramRunner.java +++ b/java/execution/impl/src/com/intellij/execution/impl/DefaultJavaProgramRunner.java @@ -24,7 +24,6 @@ import com.intellij.execution.executors.DefaultRunExecutor; import com.intellij.execution.process.ProcessAdapter; import com.intellij.execution.process.ProcessEvent; import com.intellij.execution.process.ProcessHandler; -import com.intellij.execution.remote.RemoteConfiguration; import com.intellij.execution.runners.*; import com.intellij.execution.ui.ExecutionConsole; import com.intellij.execution.ui.RunContentDescriptor; @@ -50,7 +49,7 @@ public class DefaultJavaProgramRunner extends JavaPatchableProgramRunner { public boolean canRun(@NotNull final String executorId, @NotNull final RunProfile profile) { return executorId.equals(DefaultRunExecutor.EXECUTOR_ID) && profile instanceof ModuleRunProfile && - !(profile instanceof RemoteConfiguration); + !(profile instanceof RunConfigurationWithSuppressedDefaultRunAction); } public JDOMExternalizable createConfigurationData(ConfigurationInfoProvider settingsProvider) { diff --git a/java/execution/impl/src/com/intellij/execution/remote/RemoteConfiguration.java b/java/execution/impl/src/com/intellij/execution/remote/RemoteConfiguration.java index 336a138c4d3a..c78ff88efd28 100644 --- a/java/execution/impl/src/com/intellij/execution/remote/RemoteConfiguration.java +++ b/java/execution/impl/src/com/intellij/execution/remote/RemoteConfiguration.java @@ -28,6 +28,7 @@ import com.intellij.execution.ExecutionException; import com.intellij.execution.Executor; import com.intellij.execution.configurations.*; import com.intellij.execution.runners.ExecutionEnvironment; +import com.intellij.execution.runners.RunConfigurationWithSuppressedDefaultRunAction; import com.intellij.openapi.module.Module; import com.intellij.openapi.options.SettingsEditor; import com.intellij.openapi.options.SettingsEditorGroup; @@ -40,7 +41,8 @@ import org.jetbrains.annotations.NotNull; import java.util.Collection; -public class RemoteConfiguration extends ModuleBasedConfiguration { +public class RemoteConfiguration extends ModuleBasedConfiguration implements + RunConfigurationWithSuppressedDefaultRunAction { public void writeExternal(final Element element) throws WriteExternalException { super.writeExternal(element); diff --git a/platform/lang-impl/src/com/intellij/execution/runners/BasicProgramRunner.java b/platform/lang-impl/src/com/intellij/execution/runners/BasicProgramRunner.java index 5f4f081070c7..1fd4a0631cce 100644 --- a/platform/lang-impl/src/com/intellij/execution/runners/BasicProgramRunner.java +++ b/platform/lang-impl/src/com/intellij/execution/runners/BasicProgramRunner.java @@ -32,6 +32,6 @@ public class BasicProgramRunner extends DefaultProgramRunner { } public boolean canRun(@NotNull String executorId, @NotNull RunProfile profile) { - return DefaultRunExecutor.EXECUTOR_ID.equals(executorId); + return DefaultRunExecutor.EXECUTOR_ID.equals(executorId) && !(profile instanceof RunConfigurationWithSuppressedDefaultRunAction); } } diff --git a/platform/lang-impl/src/com/intellij/execution/runners/RunConfigurationWithSuppressedDefaultRunAction.java b/platform/lang-impl/src/com/intellij/execution/runners/RunConfigurationWithSuppressedDefaultRunAction.java new file mode 100644 index 000000000000..0284649ca48e --- /dev/null +++ b/platform/lang-impl/src/com/intellij/execution/runners/RunConfigurationWithSuppressedDefaultRunAction.java @@ -0,0 +1,22 @@ +/* + * Copyright 2000-2010 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. + */ +package com.intellij.execution.runners; + +/** + * @author nik + */ +public interface RunConfigurationWithSuppressedDefaultRunAction { +}