From 527777d4fd10d3ebc540a44dac23a4687ddb2b79 Mon Sep 17 00:00:00 2001 From: "Vassiliy.Kudryashov" Date: Tue, 21 Feb 2017 10:06:50 +0300 Subject: [PATCH] Add 'Stop' action to toolbar just after 'Run/Debug/...' actions This action should stop run configurations only, otherwise it's too confusing --- .../intellij/execution/actions/StopAction.java | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 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 490d5c7f0f80..a01bc1951013 100644 --- a/platform/lang-impl/src/com/intellij/execution/actions/StopAction.java +++ b/platform/lang-impl/src/com/intellij/execution/actions/StopAction.java @@ -33,14 +33,9 @@ import com.intellij.openapi.ui.popup.JBPopupFactory; import com.intellij.openapi.ui.popup.ListItemDescriptorAdapter; import com.intellij.openapi.util.Pair; import com.intellij.openapi.util.text.StringUtil; -import com.intellij.openapi.wm.IdeFrame; -import com.intellij.openapi.wm.WindowManager; -import com.intellij.openapi.wm.ex.StatusBarEx; -import com.intellij.openapi.wm.ex.WindowManagerEx; import com.intellij.ui.components.JBList; import com.intellij.ui.popup.list.GroupedItemsListRenderer; import com.intellij.util.IconUtil; -import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -191,12 +186,13 @@ class StopAction extends DumbAwareAction implements AnAction.TransparentUpdate { @NotNull private static List> getCancellableProcesses(@Nullable Project project) { - IdeFrame frame = ((WindowManagerEx)WindowManager.getInstance()).findFrameFor(project); - StatusBarEx statusBar = frame == null ? null : (StatusBarEx)frame.getStatusBar(); - if (statusBar == null) return Collections.emptyList(); - - return ContainerUtil.findAll(statusBar.getBackgroundProcesses(), - pair -> pair.first.isCancellable() && !pair.second.isCanceled()); + return Collections.emptyList();//Don't confuse users with 'Stop Everything' toolbar button + //IdeFrame frame = ((WindowManagerEx)WindowManager.getInstance()).findFrameFor(project); + //StatusBarEx statusBar = frame == null ? null : (StatusBarEx)frame.getStatusBar(); + //if (statusBar == null) return Collections.emptyList(); + // + //return ContainerUtil.findAll(statusBar.getBackgroundProcesses(), + // pair -> pair.first.isCancellable() && !pair.second.isCanceled()); } @Nullable