diff options
author | Pawel Piech | 2012-02-28 19:14:46 +0000 |
---|---|---|
committer | Pawel Piech | 2012-02-28 19:14:46 +0000 |
commit | bd4d43e331051fa8d92d990ec2c8d76445225081 (patch) | |
tree | 36cd9bef2db8d12a6f6dfc1b380af4f18eed0137 | |
parent | d9bd6feb323ba509f5ab04b03324c000fa662b11 (diff) | |
download | eclipse.platform.debug-bd4d43e331051fa8d92d990ec2c8d76445225081.tar.gz eclipse.platform.debug-bd4d43e331051fa8d92d990ec2c8d76445225081.tar.xz eclipse.platform.debug-bd4d43e331051fa8d92d990ec2c8d76445225081.zip |
Bug 371130 - 'Delete' key does not work in 'Breakpoints' view in I20120208-2200
4 files changed, 18 insertions, 61 deletions
diff --git a/org.eclipse.debug.ui/plugin.xml b/org.eclipse.debug.ui/plugin.xml index 1bc0af630..3bf72ef9e 100644 --- a/org.eclipse.debug.ui/plugin.xml +++ b/org.eclipse.debug.ui/plugin.xml @@ -748,6 +748,7 @@ </action> <action id="org.eclipse.debug.ui.breakpointsView.toolbar.remove" + definitionId="org.eclipse.ui.edit.delete" toolbarPath="breakpointGroup" hoverIcon="$nl$/icons/full/elcl16/rem_co.gif" class="org.eclipse.debug.internal.ui.actions.breakpoints.RemoveBreakpointAction" @@ -841,6 +842,7 @@ <action id="org.eclipse.debug.ui.expresssionsView.toolbar.remove" toolbarPath="expressionGroup" + definitionId="org.eclipse.ui.edit.delete" hoverIcon="$nl$/icons/full/elcl16/rem_co.gif" class="org.eclipse.debug.internal.ui.actions.expressions.RemoveExpressionAction" disabledIcon="$nl$/icons/full/dlcl16/rem_co.gif" diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/AbstractRemoveActionDelegate.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/AbstractRemoveActionDelegate.java deleted file mode 100644 index b553c9ab9..000000000 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/AbstractRemoveActionDelegate.java +++ /dev/null @@ -1,39 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2011 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.debug.internal.ui.actions; - - -import org.eclipse.debug.ui.IDebugView; -import org.eclipse.ui.IViewPart; - -/** - * Base implementation of the 'remove' action for a debug view - * - * This class is intended to be extended by clients - * @see AbstractSelectionActionDelegate - * @see org.eclipse.ui.IViewActionDelegate - * @see org.eclipse.ui.IActionDelegate2 - * - */ -public abstract class AbstractRemoveActionDelegate extends AbstractSelectionActionDelegate { - - /* (non-Javadoc) - * @see org.eclipse.debug.internal.ui.actions.selection.AbstractSelectionActionDelegate#init(org.eclipse.ui.IViewPart) - */ - public void init(IViewPart view) { - super.init(view); - IDebugView debugView= (IDebugView)getView().getAdapter(IDebugView.class); - if (debugView != null) { - debugView.setAction(IDebugView.REMOVE_ACTION, getAction()); - } - } - -} diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/RemoveBreakpointAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/RemoveBreakpointAction.java index cef9ad853..c30694d23 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/RemoveBreakpointAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/RemoveBreakpointAction.java @@ -15,17 +15,23 @@ package org.eclipse.debug.internal.ui.actions.breakpoints; import java.util.ArrayList; import java.util.Iterator; -import org.eclipse.swt.widgets.Shell; - +import org.eclipse.core.resources.IWorkspaceRunnable; +import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.jobs.Job; - -import org.eclipse.core.resources.IWorkspaceRunnable; -import org.eclipse.core.resources.ResourcesPlugin; - +import org.eclipse.debug.core.DebugPlugin; +import org.eclipse.debug.core.model.IBreakpoint; +import org.eclipse.debug.internal.ui.DebugUIPlugin; +import org.eclipse.debug.internal.ui.actions.AbstractSelectionActionDelegate; +import org.eclipse.debug.internal.ui.actions.ActionMessages; +import org.eclipse.debug.internal.ui.breakpoints.provisional.IBreakpointContainer; +import org.eclipse.debug.internal.ui.preferences.IDebugPreferenceConstants; +import org.eclipse.debug.internal.ui.views.breakpoints.BreakpointsView; +import org.eclipse.debug.internal.ui.views.breakpoints.WorkingSetCategory; +import org.eclipse.debug.ui.DebugUITools; import org.eclipse.jface.action.IAction; import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.jface.dialogs.MessageDialog; @@ -33,24 +39,12 @@ import org.eclipse.jface.dialogs.MessageDialogWithToggle; import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.window.Window; - +import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.IWorkbenchWindow; import org.eclipse.ui.IWorkingSet; import org.eclipse.ui.PlatformUI; -import org.eclipse.debug.core.DebugPlugin; -import org.eclipse.debug.core.model.IBreakpoint; -import org.eclipse.debug.internal.ui.DebugUIPlugin; -import org.eclipse.debug.internal.ui.actions.AbstractRemoveActionDelegate; -import org.eclipse.debug.internal.ui.actions.ActionMessages; -import org.eclipse.debug.internal.ui.breakpoints.provisional.IBreakpointContainer; -import org.eclipse.debug.internal.ui.preferences.IDebugPreferenceConstants; -import org.eclipse.debug.internal.ui.views.breakpoints.BreakpointsView; -import org.eclipse.debug.internal.ui.views.breakpoints.WorkingSetCategory; - -import org.eclipse.debug.ui.DebugUITools; - -public class RemoveBreakpointAction extends AbstractRemoveActionDelegate { +public class RemoveBreakpointAction extends AbstractSelectionActionDelegate { /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction) diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/expressions/RemoveExpressionAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/expressions/RemoveExpressionAction.java index 8ea98abc9..af6b19a8e 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/expressions/RemoveExpressionAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/expressions/RemoveExpressionAction.java @@ -22,13 +22,13 @@ import org.eclipse.core.runtime.Status; import org.eclipse.debug.core.DebugPlugin; import org.eclipse.debug.core.IExpressionManager; import org.eclipse.debug.core.model.IExpression; -import org.eclipse.debug.internal.ui.actions.AbstractRemoveActionDelegate; +import org.eclipse.debug.internal.ui.actions.AbstractSelectionActionDelegate; import org.eclipse.jface.action.IAction; import org.eclipse.jface.viewers.TreePath; import org.eclipse.jface.viewers.TreeSelection; import org.eclipse.ui.progress.WorkbenchJob; -public class RemoveExpressionAction extends AbstractRemoveActionDelegate { +public class RemoveExpressionAction extends AbstractSelectionActionDelegate { protected IExpression[] getExpressions() { TreeSelection selection = (TreeSelection) getSelection(); |