From e77a6bd7936bee77cefed4a4d2f6da3d05d00557 Mon Sep 17 00:00:00 2001 From: Dmitry Trofimov Date: Mon, 5 Dec 2011 12:44:02 +0100 Subject: [PATCH] Python: don't kill softly in suspend debug mode (PY-5185). --- .../src/com/intellij/execution/actions/StopAction.java | 2 +- .../src/com/intellij/execution/KillableProcess.java | 2 +- .../execution/process/KillableColoredProcessHandler.java | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/execution/actions/StopAction.java b/platform/lang-impl/src/com/intellij/execution/actions/StopAction.java index ddfa286e16e3..8ea7976017db 100644 --- a/platform/lang-impl/src/com/intellij/execution/actions/StopAction.java +++ b/platform/lang-impl/src/com/intellij/execution/actions/StopAction.java @@ -130,7 +130,7 @@ public class StopAction extends DumbAwareAction implements AnAction.TransparentU if (!processHandler.isProcessTerminating()) { enable = true; } - else if (processHandler instanceof KillableProcess && ((KillableProcess)processHandler).canKillProcess()) { + else if (processHandler instanceof KillableProcess && ((KillableProcess)processHandler).canKillSoftly()) { enable = true; icon = KILL_PROCESS_ICON; description = "Kill process"; diff --git a/platform/platform-impl/src/com/intellij/execution/KillableProcess.java b/platform/platform-impl/src/com/intellij/execution/KillableProcess.java index 041e61fb955e..7710bf277cb1 100644 --- a/platform/platform-impl/src/com/intellij/execution/KillableProcess.java +++ b/platform/platform-impl/src/com/intellij/execution/KillableProcess.java @@ -19,7 +19,7 @@ package com.intellij.execution; * @author nik */ public interface KillableProcess { - boolean canKillProcess(); + boolean canKillSoftly(); void killProcess(); } diff --git a/platform/platform-impl/src/com/intellij/execution/process/KillableColoredProcessHandler.java b/platform/platform-impl/src/com/intellij/execution/process/KillableColoredProcessHandler.java index 1bebb4a56c9d..bcd005c6d6cd 100644 --- a/platform/platform-impl/src/com/intellij/execution/process/KillableColoredProcessHandler.java +++ b/platform/platform-impl/src/com/intellij/execution/process/KillableColoredProcessHandler.java @@ -39,14 +39,14 @@ public class KillableColoredProcessHandler extends ColoredProcessHandler impleme } @Override - public boolean canKillProcess() { + public boolean canKillSoftly() { // soft-kill works on Unix systems return SystemInfo.isUnix; } @Override protected void doDestroyProcess() { - if (!canKillProcess()) { + if (!canKillSoftly()) { // if soft kill isn't supported - use default implementation super.doDestroyProcess(); return;