diff --git a/org.eclipse.debug.ui/plugin.xml b/org.eclipse.debug.ui/plugin.xml index 19b7a19..9f0b96a 100644 --- a/org.eclipse.debug.ui/plugin.xml +++ b/org.eclipse.debug.ui/plugin.xml @@ -731,6 +731,156 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/DisconnectCommandAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/DisconnectCommandAction.java index cd5b4ed..35ca23c 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/DisconnectCommandAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/DisconnectCommandAction.java @@ -25,7 +25,9 @@ public class DisconnectCommandAction extends DebugCommandAction{ + public final static String COMMAND_ID = "org.eclipse.debug.ui.commands.Disconnect"; //$NON-NLS-1$ + public DisconnectCommandAction() { - setActionDefinitionId("org.eclipse.debug.ui.commands.Disconnect"); //$NON-NLS-1$ - } + setActionDefinitionId(COMMAND_ID); + } public String getText() { diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/DropToFrameCommandAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/DropToFrameCommandAction.java index e4c11f9..b1f585f 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/DropToFrameCommandAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/DropToFrameCommandAction.java @@ -25,7 +25,9 @@ public class DropToFrameCommandAction extends DebugCommandAction { + public final static String COMMAND_ID = "org.eclipse.debug.ui.commands.DropToFrame"; //$NON-NLS-1$ + public DropToFrameCommandAction() { - setActionDefinitionId("org.eclipse.debug.ui.commands.DropToFrame"); //$NON-NLS-1$ - } + setActionDefinitionId(COMMAND_ID); + } public String getText() { diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/ResumeCommandAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/ResumeCommandAction.java index f7f28ab..d84a55d 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/ResumeCommandAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/ResumeCommandAction.java @@ -25,6 +25,8 @@ public class ResumeCommandAction extends DebugCommandAction{ + public final static String COMMAND_ID = "org.eclipse.debug.ui.commands.Resume"; //$NON-NLS-1$ + public ResumeCommandAction() { - setActionDefinitionId("org.eclipse.debug.ui.commands.Resume"); //$NON-NLS-1$ + setActionDefinitionId(COMMAND_ID); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/StepIntoCommandAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/StepIntoCommandAction.java index f42a2dd..c7691ac 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/StepIntoCommandAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/StepIntoCommandAction.java @@ -25,6 +25,8 @@ public class StepIntoCommandAction extends DebugCommandAction { + public final static String COMMAND_ID = "org.eclipse.debug.ui.commands.StepInto"; //$NON-NLS-1$ + public StepIntoCommandAction() { - setActionDefinitionId("org.eclipse.debug.ui.commands.StepInto"); //$NON-NLS-1$ + setActionDefinitionId(COMMAND_ID); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/StepOverCommandAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/StepOverCommandAction.java index 020e34d..01c3575 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/StepOverCommandAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/StepOverCommandAction.java @@ -26,6 +26,8 @@ public class StepOverCommandAction extends DebugCommandAction { + public final static String COMMAND_ID = "org.eclipse.debug.ui.commands.StepOver"; //$NON-NLS-1$ + public StepOverCommandAction() { - setActionDefinitionId("org.eclipse.debug.ui.commands.StepOver"); //$NON-NLS-1$ + setActionDefinitionId(COMMAND_ID); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/StepReturnCommandAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/StepReturnCommandAction.java index 73aa935..04e3f85 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/StepReturnCommandAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/StepReturnCommandAction.java @@ -25,7 +25,8 @@ public class StepReturnCommandAction extends DebugCommandAction { + public final static String COMMAND_ID = "org.eclipse.debug.ui.commands.StepReturn"; //$NON-NLS-1$ public StepReturnCommandAction() { - setActionDefinitionId("org.eclipse.debug.ui.commands.StepReturn"); //$NON-NLS-1$ + setActionDefinitionId(COMMAND_ID); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/SuspendCommandAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/SuspendCommandAction.java index da1b596..1b56c94 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/SuspendCommandAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/SuspendCommandAction.java @@ -25,7 +25,9 @@ public class SuspendCommandAction extends DebugCommandAction { + public final static String COMMAND_ID = "org.eclipse.debug.ui.commands.Suspend"; //$NON-NLS-1$ + public SuspendCommandAction() { - setActionDefinitionId("org.eclipse.debug.ui.commands.Suspend"); //$NON-NLS-1$ - } + setActionDefinitionId(COMMAND_ID); + } public String getText() { diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/TerminateCommandAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/TerminateCommandAction.java index a8de94b..908088e 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/TerminateCommandAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/TerminateCommandAction.java @@ -25,9 +25,11 @@ public class TerminateCommandAction extends DebugCommandAction { + public final static String COMMAND_ID = "org.eclipse.debug.ui.commands.Terminate"; //$NON-NLS-1$ + public TerminateCommandAction() { - setActionDefinitionId("org.eclipse.debug.ui.commands.Terminate"); //$NON-NLS-1$ + setActionDefinitionId(COMMAND_ID); } - public String getText() { + public String getText() { return ActionMessages.TerminateAction_0; } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/ToggleStepFiltersAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/ToggleStepFiltersAction.java index 845733b..6e580d4 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/ToggleStepFiltersAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/ToggleStepFiltersAction.java @@ -33,4 +33,6 @@ public class ToggleStepFiltersAction extends DebugCommandAction implements IPropertyChangeListener { + public final static String COMMAND_ID = "org.eclipse.debug.ui.commands.ToggleStepFilters"; //$NON-NLS-1$ + private boolean fInitialized = !DebugUITools.isUseStepFilters(); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/LaunchView.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/LaunchView.java index 3a21e01..92e5804 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/LaunchView.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/LaunchView.java @@ -82,7 +82,7 @@ import org.eclipse.debug.ui.contexts.IDebugContextListener; import org.eclipse.debug.ui.contexts.IDebugContextProvider; -import org.eclipse.jface.action.ActionContributionItem; import org.eclipse.jface.action.GroupMarker; import org.eclipse.jface.action.IAction; +import org.eclipse.jface.action.IContributionItem; import org.eclipse.jface.action.IMenuListener; import org.eclipse.jface.action.IMenuManager; @@ -142,20 +142,4 @@ public static final String ID_CONTEXT_ACTIVITY_BINDINGS = "contextActivityBindings"; //$NON-NLS-1$ - - private static final String TERMINATE = "terminate"; //$NON-NLS-1$ - - private static final String DISCONNECT = "disconnect"; //$NON-NLS-1$ - - private static final String SUSPEND = "suspend"; //$NON-NLS-1$ - - private static final String RESUME = "resume"; //$NON-NLS-1$ - - private static final String STEP_RETURN = "step_return"; //$NON-NLS-1$ - - private static final String STEP_OVER = "step_over"; //$NON-NLS-1$ - - private static final String DROP_TO_FRAME = "drop_to_frame"; //$NON-NLS-1$ - - private static final String STEP_INTO = "step_into"; //$NON-NLS-1$ public static final String TERMINATE_AND_REMOVE = "terminate_and_remove"; //$NON-NLS-1$ @@ -537,12 +521,4 @@ setAction(FIND_ACTION, new VirtualFindAction((TreeModelViewer) getViewer())); - addCapabilityAction(new TerminateCommandAction(), TERMINATE); - addCapabilityAction(new DisconnectCommandAction(), DISCONNECT); - addCapabilityAction(new SuspendCommandAction(), SUSPEND); - addCapabilityAction(new ResumeCommandAction(), RESUME); - addCapabilityAction(new StepReturnCommandAction(), STEP_RETURN); - addCapabilityAction(new StepOverCommandAction(), STEP_OVER); - addCapabilityAction(new StepIntoCommandAction(), STEP_INTO); - addCapabilityAction(new DropToFrameCommandAction(), DROP_TO_FRAME); DebugCommandAction action = new TerminateAndRemoveAction(); addCapabilityAction(action, TERMINATE_AND_REMOVE); @@ -993,43 +969,26 @@ if (fDebugToolbarInView) { - addDebugToolbarActions(tbm); + setDebugToolbarActionsVisible(tbm, true); } } - protected void addDebugToolbarActions(IToolBarManager tbm) { - tbm.appendToGroup(IDebugUIConstants.THREAD_GROUP, getAction(RESUME)); - tbm.appendToGroup(IDebugUIConstants.THREAD_GROUP, getAction(SUSPEND)); - tbm.appendToGroup(IDebugUIConstants.THREAD_GROUP, getAction(TERMINATE)); - tbm.appendToGroup(IDebugUIConstants.THREAD_GROUP, getAction(DISCONNECT)); - - tbm.appendToGroup(IDebugUIConstants.STEP_INTO_GROUP, getAction(STEP_INTO)); - tbm.appendToGroup(IDebugUIConstants.STEP_OVER_GROUP, getAction(STEP_OVER)); - tbm.appendToGroup(IDebugUIConstants.STEP_RETURN_GROUP, getAction(STEP_RETURN)); - - tbm.appendToGroup(IDebugUIConstants.EMPTY_STEP_GROUP, getAction(DROP_TO_FRAME)); - - tbm.appendToGroup(IDebugUIConstants.RENDER_GROUP, getAction(TOGGLE_STEP_FILTERS)); + protected void setDebugToolbarActionsVisible(IToolBarManager tbm, boolean visible) { + IContributionItem[] items = tbm.getItems(); + for (int i = 0; i < items.length; i++) { + if (ResumeCommandAction.COMMAND_ID.equals(items[i].getId()) || + SuspendCommandAction.COMMAND_ID.equals(items[i].getId()) || + TerminateCommandAction.COMMAND_ID.equals(items[i].getId()) || + DisconnectCommandAction.COMMAND_ID.equals(items[i].getId()) || + StepIntoCommandAction.COMMAND_ID.equals(items[i].getId()) || + StepOverCommandAction.COMMAND_ID.equals(items[i].getId()) || + StepReturnCommandAction.COMMAND_ID.equals(items[i].getId()) || + DropToFrameCommandAction.COMMAND_ID.equals(items[i].getId()) || + ToggleStepFiltersAction.COMMAND_ID.equals(items[i].getId()) ) + { + items[i].setVisible(visible); + } + } } - - /** - * Removes the toolbar actions contributed by this view from the toolbar - * manager. - * @param tbm - */ - protected void removeDebugToolbarActions(IToolBarManager tbm) { - tbm.remove(new ActionContributionItem(getAction(RESUME))); - tbm.remove(new ActionContributionItem(getAction(SUSPEND))); - tbm.remove(new ActionContributionItem(getAction(TERMINATE))); - tbm.remove(new ActionContributionItem(getAction(DISCONNECT))); - - tbm.remove(new ActionContributionItem(getAction(STEP_INTO))); - tbm.remove(new ActionContributionItem(getAction(STEP_OVER))); - tbm.remove(new ActionContributionItem(getAction(STEP_RETURN))); - - tbm.remove(new ActionContributionItem(getAction(DROP_TO_FRAME))); - - tbm.remove(new ActionContributionItem(getAction(TOGGLE_STEP_FILTERS))); - } - + public boolean isDebugToolbarInView() { return fDebugToolbarInView; @@ -1059,12 +1018,12 @@ IToolBarManager tbm = getViewSite().getActionBars().getToolBarManager(); if (show) { - addDebugToolbarActions(tbm); + setDebugToolbarActionsVisible(tbm, true); } else { - removeDebugToolbarActions(tbm); + setDebugToolbarActionsVisible(tbm, false); } - getViewSite().getActionBars().updateActionBars(); // Update system property used by contributed actions. System.setProperty(IDebugUIConstants.DEBUG_VIEW_TOOBAR_VISIBLE, Boolean.toString(show)); + getViewSite().getActionBars().updateActionBars(); } @@ -1107,12 +1066,4 @@ properties.dispose(); - disposeCommandAction(TERMINATE); - disposeCommandAction(DISCONNECT); - disposeCommandAction(SUSPEND); - disposeCommandAction(RESUME); - disposeCommandAction(STEP_RETURN); - disposeCommandAction(STEP_OVER); - disposeCommandAction(STEP_INTO); - disposeCommandAction(DROP_TO_FRAME); disposeCommandAction(TERMINATE_AND_REMOVE); disposeCommandAction(TERMINATE_AND_RELAUNCH); @@ -1240,18 +1191,7 @@ menu.appendToGroup(IDebugUIConstants.LAUNCH_GROUP, getAction(TERMINATE_ALL)); - menu.appendToGroup(IDebugUIConstants.THREAD_GROUP, getAction(RESUME)); - menu.appendToGroup(IDebugUIConstants.THREAD_GROUP, getAction(SUSPEND)); - menu.appendToGroup(IDebugUIConstants.THREAD_GROUP, getAction(TERMINATE)); - menu.appendToGroup(IDebugUIConstants.THREAD_GROUP, getAction(TERMINATE_AND_RELAUNCH)); if (element instanceof IAdaptable && ((IAdaptable)element).getAdapter(IRestartHandler.class) != null) { menu.appendToGroup(IDebugUIConstants.THREAD_GROUP, getAction(RESTART)); } - menu.appendToGroup(IDebugUIConstants.THREAD_GROUP, getAction(DISCONNECT)); - - menu.appendToGroup(IDebugUIConstants.STEP_INTO_GROUP, getAction(STEP_INTO)); - menu.appendToGroup(IDebugUIConstants.STEP_OVER_GROUP, getAction(STEP_OVER)); - menu.appendToGroup(IDebugUIConstants.STEP_RETURN_GROUP, getAction(STEP_RETURN)); - - menu.appendToGroup(IDebugUIConstants.EMPTY_STEP_GROUP, getAction(DROP_TO_FRAME)); menu.appendToGroup(IDebugUIConstants.RENDER_GROUP, getAction(TOGGLE_STEP_FILTERS));