Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarin Wright2009-04-30 16:23:13 -0400
committerDarin Wright2009-04-30 16:23:13 -0400
commitd6768bb659c95b7a2d269d78fbfac57bd23478da (patch)
treeda76c13d2908689f712163c2cfe59bc13483f524
parent0b5363d33a1941a712e42cf1ac8d02a5e5aa5caf (diff)
downloadeclipse.platform.debug-d6768bb659c95b7a2d269d78fbfac57bd23478da.tar.gz
eclipse.platform.debug-d6768bb659c95b7a2d269d78fbfac57bd23478da.tar.xz
eclipse.platform.debug-d6768bb659c95b7a2d269d78fbfac57bd23478da.zip
rollback of: Bug 220657 - Teminate All in ConsoleView
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/TerminateAllAction.java28
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ProcessConsolePageParticipant.java10
2 files changed, 3 insertions, 35 deletions
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/TerminateAllAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/TerminateAllAction.java
index c4c8fc1bc..90362bd76 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/TerminateAllAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/TerminateAllAction.java
@@ -7,7 +7,6 @@
*
* Contributors:
* IBM Corporation - initial API and implementation
- * Remy Chi Jian Suen <remy.suen@gmail.com> - Bug 220657 Teminate All in ConsoleView.
*******************************************************************************/
package org.eclipse.debug.internal.ui.commands.actions;
@@ -23,7 +22,6 @@ import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.StructuredSelection;
import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.IWorkbenchWindow;
/**
* Terminates all launches.
@@ -48,13 +46,9 @@ public class TerminateAllAction extends DebugCommandAction implements ILaunchesL
getLaunchManager().removeLaunchListener(this);
super.dispose();
}
-
- /**
- * Attaches self to the launch manager for updating the enablement state.
- *
- * @since 3.5
- */
- private void attachSelfToLaunchManager() {
+
+ public void init(IWorkbenchPart part) {
+ super.init(part);
ILaunchManager launchManager = getLaunchManager();
launchManager.addLaunchListener(this);
// heuristic... rather than updating all the time, just assume there's
@@ -62,22 +56,6 @@ public class TerminateAllAction extends DebugCommandAction implements ILaunchesL
setEnabled(launchManager.getLaunches().length > 0);
}
- public void init(IWorkbenchPart part) {
- super.init(part);
- attachSelfToLaunchManager();
- }
-
- /**
- * Initializes this action for the given workbench window.
- *
- * @param window the workbench window that this action is for
- * @since 3.5
- */
- public void init(IWorkbenchWindow window) {
- super.init(window);
- attachSelfToLaunchManager();
- }
-
private ILaunchManager getLaunchManager() {
return DebugPlugin.getDefault().getLaunchManager();
}
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ProcessConsolePageParticipant.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ProcessConsolePageParticipant.java
index 7b7d77bcb..e61655643 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ProcessConsolePageParticipant.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ProcessConsolePageParticipant.java
@@ -7,7 +7,6 @@
*
* Contributors:
* IBM Corporation - initial API and implementation
- * Remy Chi Jian Suen <remy.suen@gmail.com> - Bug 220657 Teminate All in ConsoleView.
*******************************************************************************/
package org.eclipse.debug.internal.ui.views.console;
@@ -25,7 +24,6 @@ import org.eclipse.debug.core.model.IProcess;
import org.eclipse.debug.core.model.IStreamsProxy;
import org.eclipse.debug.core.model.IStreamsProxy2;
import org.eclipse.debug.internal.ui.DebugUIPlugin;
-import org.eclipse.debug.internal.ui.commands.actions.TerminateAllAction;
import org.eclipse.debug.ui.DebugUITools;
import org.eclipse.debug.ui.IDebugUIConstants;
import org.eclipse.debug.ui.contexts.DebugContextEvent;
@@ -58,7 +56,6 @@ public class ProcessConsolePageParticipant implements IConsolePageParticipant, I
// actions
private ConsoleTerminateAction fTerminate;
- private TerminateAllAction fTerminateAll;
private ConsoleRemoveLaunchAction fRemoveTerminated;
private ConsoleRemoveAllTerminatedAction fRemoveAllTerminated;
private ShowWhenContentChangesAction fStdOut;
@@ -102,8 +99,6 @@ public class ProcessConsolePageParticipant implements IConsolePageParticipant, I
fRemoveTerminated = new ConsoleRemoveLaunchAction(fConsole.getProcess().getLaunch());
fRemoveAllTerminated = new ConsoleRemoveAllTerminatedAction();
fTerminate = new ConsoleTerminateAction(page.getSite().getWorkbenchWindow(), fConsole);
- fTerminateAll = new TerminateAllAction();
- fTerminateAll.init(fPage.getSite().getWorkbenchWindow());
fStdOut = new ShowStandardOutAction();
fStdErr = new ShowStandardErrorAction();
@@ -138,10 +133,6 @@ public class ProcessConsolePageParticipant implements IConsolePageParticipant, I
fTerminate.dispose();
fTerminate = null;
}
- if (fTerminateAll != null) {
- fTerminateAll.dispose();
- fTerminateAll = null;
- }
if (fStdOut != null) {
fStdOut.dispose();
fStdOut = null;
@@ -158,7 +149,6 @@ public class ProcessConsolePageParticipant implements IConsolePageParticipant, I
*/
protected void configureToolBar(IToolBarManager mgr) {
mgr.appendToGroup(IConsoleConstants.LAUNCH_GROUP, fTerminate);
- mgr.appendToGroup(IConsoleConstants.LAUNCH_GROUP, fTerminateAll);
mgr.appendToGroup(IConsoleConstants.LAUNCH_GROUP, fRemoveTerminated);
mgr.appendToGroup(IConsoleConstants.LAUNCH_GROUP, fRemoveAllTerminated);
mgr.appendToGroup(IConsoleConstants.OUTPUT_GROUP, fStdOut);

Back to the top