Attachment 185360 Details for Bug 258767 – patch that handles command framework contribution (used as basis for current active patch)

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] patch that handles command framework contribution (used as basis for current active patch)

332784_debug_actions.patch (text/plain), 13.89 KB, created by Patrick Chuong

on 2010-12-16 14:52:05 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Patrick Chuong

Created: 2010-12-16 14:52:05 EST

Size: 13.89 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.debug.ui
>Index: plugin.properties
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.debug.ui/plugin.properties,v
>retrieving revision 1.254
>diff -u -r1.254 plugin.properties
>--- plugin.properties	18 May 2010 19:38:02 -0000	1.254
>+++ plugin.properties	16 Dec 2010 19:26:27 -0000
>@@ -10,6 +10,7 @@
> #     QNX Software Systems - Mikhail Khodjaiants - Registers View (Bug 53640)
> #     Wind River Systems - Pawel Piech - Added Modules view (bug 211158)
> #     Wind River Systems - Ted Williams -[Memory View] Memory View: Workflow Enhancements (bug 215432)
>+#     Patrick Chuong (Texas Instruments) - Move debug toolbar actions to main window (Bug 332784)
> ###############################################################################
> 
> pluginName=Debug UI
>@@ -129,6 +130,8 @@
> StringVariablePresentationsName=String Variable Presentations
> SuspendAction.label=&Suspend
> TerminateAction.label=&Terminate
>+DropToFrame.label=Drop To Frame
>+Disconnect.label=Disconnect
> ToggleBreakpointAction.label=Toggle Brea&kpoint
> ToggleBreakpointsTargetFactoriesExtension.name=Toggle Breakpoints Target Factories
> ToggleLineBreakpointAction.label=Toggle &Line Breakpoint
>@@ -219,6 +222,12 @@
> ActionDefinition.suspend.name=Suspend
> ActionDefinition.suspend.description=Suspend
> 
>+ActionDefinition.dropToFrame.name=Drop to Frame
>+ActionDefinition.dropToFrame.description=Drop to Frame
>+
>+ActionDefinition.disconnect.name=Disconnect
>+ActionDefinition.disconnect.description=Disconnect
>+
> ActionDefinition.openProfile.name=Profile...
> ActionDefinition.openProfile.description=Open profile launch configuration dialog
> 
>Index: plugin.xml
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.debug.ui/plugin.xml,v
>retrieving revision 1.454
>diff -u -r1.454 plugin.xml
>--- plugin.xml	2 Dec 2010 18:34:44 -0000	1.454
>+++ plugin.xml	16 Dec 2010 19:26:28 -0000
>@@ -10,6 +10,7 @@
>      Contributors:
>          IBM Corporation - initial API and implementation
>          Patrick Chuong (Texas Instruments) - Improve usability of the breakpoint view (Bug 238956)
>+         Patrick Chuong (Texas Instruments) - Move debug toolbar actions to main window (Bug 332784) 
>  -->
> 
> <plugin>
>@@ -302,7 +303,19 @@
>                label="%StepWithFiltersAction.label"
>                menubarPath="org.eclipse.ui.run/emptyStepGroup"
>                style="toggle"
>-               state="false">
>+               state="false"
>+               toolbarPath="org.eclipse.debug.ui.main.toolbar/renderGroup">
>+         </action>
>+         <action
>+               id="org.eclipse.debug.ui.actions.DropToFrame"
>+               hoverIcon="$nl$/icons/full/elcl16/drop_to_frame.gif"
>+               class="org.eclipse.debug.internal.ui.commands.actions.DropToFrameCommandActionDelegate"
>+               definitionId="org.eclipse.debug.ui.commands.DropToFrame"
>+               disabledIcon="$nl$/icons/full/dlcl16/drop_to_frame.gif"
>+               helpContextId="drop_to_frame_action_context"
>+               icon="$nl$/icons/full/elcl16/drop_to_frame.gif"
>+               label="%DropToFrame.label"
>+               toolbarPath="org.eclipse.debug.ui.main.toolbar/emptyStepGroup">
>          </action>
>          <action
>                id="org.eclipse.debug.ui.actions.RunToLine"
>@@ -323,7 +336,8 @@
>                icon="$nl$/icons/full/elcl16/stepreturn_co.gif"
>                helpContextId="step_return_action_context"
>                label="%StepReturnAction.label"
>-               menubarPath="org.eclipse.ui.run/stepReturnGroup">
>+               menubarPath="org.eclipse.ui.run/stepReturnGroup"
>+               toolbarPath="org.eclipse.debug.ui.main.toolbar/stepReturnGroup">
>          </action>
>          <action
>                id="org.eclipse.debug.ui.actions.StepOver"
>@@ -334,7 +348,8 @@
>                icon="$nl$/icons/full/elcl16/stepover_co.gif"
>                helpContextId="step_over_action_context"
>                label="%StepOverAction.label"
>-               menubarPath="org.eclipse.ui.run/stepOverGroup">
>+               menubarPath="org.eclipse.ui.run/stepOverGroup"
>+               toolbarPath="org.eclipse.debug.ui.main.toolbar/stepOverGroup">
>          </action>
>          <action
>                id="org.eclipse.debug.ui.actions.StepInto"
>@@ -345,7 +360,19 @@
>                icon="$nl$/icons/full/elcl16/stepinto_co.gif"
>                helpContextId="step_into_action_context"
>                label="%StepIntoAction.label"
>-               menubarPath="org.eclipse.ui.run/stepIntoGroup">
>+               menubarPath="org.eclipse.ui.run/stepIntoGroup"
>+               toolbarPath="org.eclipse.debug.ui.main.toolbar/stepIntoGroup">
>+         </action>
>+         <action
>+               id="org.eclipse.debug.ui.actions.Disconnect"
>+               hoverIcon="$nl$/icons/full/elcl16/disconnect_co.gif"
>+               class="org.eclipse.debug.internal.ui.commands.actions.DisconnectCommandActionDelegate"
>+               definitionId="org.eclipse.debug.ui.commands.Disconnect"
>+               disabledIcon="$nl$/icons/full/dlcl16/disconnect_co.gif"
>+               icon="$nl$/icons/full/elcl16/disconnect_co.gif"
>+               helpContextId="disconnect_action_context"
>+               label="%Disconnect.label"
>+               toolbarPath="org.eclipse.debug.ui.main.toolbar/threadGroup">
>          </action>
>          <action
>                id="org.eclipse.debug.ui.actions.Terminate"
>@@ -356,7 +383,8 @@
>                icon="$nl$/icons/full/elcl16/terminate_co.gif"
>                helpContextId="terminate_action_context"
>                label="%TerminateAction.label"
>-               menubarPath="org.eclipse.ui.run/stepGroup">
>+               menubarPath="org.eclipse.ui.run/stepGroup"
>+               toolbarPath="org.eclipse.debug.ui.main.toolbar/threadGroup">
>          </action>
>          <action
>                id="org.eclipse.debug.ui.actions.Suspend"
>@@ -367,7 +395,8 @@
>                icon="$nl$/icons/full/elcl16/suspend_co.gif"
>                helpContextId="suspend_action_context"
>                label="%SuspendAction.label"
>-               menubarPath="org.eclipse.ui.run/stepGroup">
>+               menubarPath="org.eclipse.ui.run/stepGroup"
>+               toolbarPath="org.eclipse.debug.ui.main.toolbar/threadGroup">
>          </action>
>          <action
>                id="org.eclipse.debug.ui.actions.Resume"
>@@ -378,7 +407,8 @@
>                icon="$nl$/icons/full/elcl16/resume_co.gif"
>                helpContextId="resume_action_context"
>                label="%ResumeAction.label"
>-               menubarPath="org.eclipse.ui.run/stepGroup">
>+               menubarPath="org.eclipse.ui.run/stepGroup"
>+               toolbarPath="org.eclipse.debug.ui.main.toolbar/threadGroup">
>          </action>
>       </actionSet>
>       <actionSet
>@@ -613,6 +643,41 @@
> 	           </dynamic>
>             </menu>         
>        </menuContribution>
>+       <menuContribution
>+             locationURI="toolbar:org.eclipse.ui.main.toolbar?after=additions">
>+          <toolbar
>+                id="org.eclipse.debug.ui.main.toolbar"
>+                label="%DebugActionSet.label">
>+             <separator
>+                   name="threadGroup"
>+                   visible="true">
>+             </separator>
>+             <separator
>+                   name="stepGroup"
>+                   visible="true">
>+             </separator>
>+             <separator
>+                   name="stepIntoGroup"
>+                   visible="false">
>+             </separator>
>+             <separator
>+                   name="stepOverGroup"
>+                   visible="false">
>+             </separator>
>+             <separator
>+                   name="stepReturnGroup"
>+                   visible="false">
>+             </separator>
>+             <separator
>+                   name="emptyStepGroup"
>+                   visible="false">
>+             </separator>
>+             <separator
>+                   name="renderGroup"
>+                   visible="true">
>+             </separator>
>+          </toolbar>
>+       </menuContribution>
>    </extension>  
>    
>    <extension
>@@ -1614,6 +1679,18 @@
>             id="org.eclipse.debug.ui.commands.ToggleStepFilters">
>       </command>
>       <command
>+            categoryId="org.eclipse.debug.ui.category.run"
>+            description="%ActionDefinition.dropToFrame.description"
>+            id="org.eclipse.debug.ui.commands.DropToFrame"
>+            name="%ActionDefinition.dropToFrame.name">
>+      </command>
>+      <command
>+            categoryId="org.eclipse.debug.ui.category.run"
>+            description="%ActionDefinition.disconnect.discrption"
>+            id="org.eclipse.debug.ui.commands.Disconnect"
>+            name="%ActionDefinition.disconnect.name">
>+      </command>
>+      <command
>             name="%ActionDefinition.stepInto.name"
>             categoryId="org.eclipse.debug.ui.category.run"
>             description="%ActionDefinition.stepInto.description"
>Index: ui/org/eclipse/debug/internal/ui/commands/actions/DisconnectCommandActionDelegate.java
>===================================================================
>RCS file: ui/org/eclipse/debug/internal/ui/commands/actions/DisconnectCommandActionDelegate.java
>diff -N ui/org/eclipse/debug/internal/ui/commands/actions/DisconnectCommandActionDelegate.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ ui/org/eclipse/debug/internal/ui/commands/actions/DisconnectCommandActionDelegate.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,24 @@
>+/*****************************************************************
>+ * Copyright (c) 2010 Texas Instruments 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:
>+ *     Patrick Chuong (Texas Instruments) - Move debug toolbar actions to main window (Bug 332784)
>+ *****************************************************************/
>+package org.eclipse.debug.internal.ui.commands.actions;
>+
>+/**
>+ * Disconnect action delegate.
>+ * 
>+ * @since 3.7
>+ */
>+public class DisconnectCommandActionDelegate extends DebugCommandActionDelegate {
>+	
>+	public DisconnectCommandActionDelegate() {
>+		super();
>+		setAction(new DisconnectCommandAction());
>+	}
>+}
>Index: ui/org/eclipse/debug/internal/ui/commands/actions/DropToFrameCommandActionDelegate.java
>===================================================================
>RCS file: ui/org/eclipse/debug/internal/ui/commands/actions/DropToFrameCommandActionDelegate.java
>diff -N ui/org/eclipse/debug/internal/ui/commands/actions/DropToFrameCommandActionDelegate.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ ui/org/eclipse/debug/internal/ui/commands/actions/DropToFrameCommandActionDelegate.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,24 @@
>+/*****************************************************************
>+ * Copyright (c) 2010 Texas Instruments 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:
>+ *     Patrick Chuong (Texas Instruments) - Move debug toolbar actions to main window (Bug 332784)
>+ *****************************************************************/
>+package org.eclipse.debug.internal.ui.commands.actions;
>+
>+/**
>+ * Drop to Frame action delegate.
>+ * 
>+ * @since 3.7
>+ */
>+public class DropToFrameCommandActionDelegate extends DebugCommandActionDelegate {
>+
>+	public DropToFrameCommandActionDelegate() {
>+		super();
>+		setAction(new DropToFrameCommandAction());
>+	}
>+}
>Index: ui/org/eclipse/debug/internal/ui/views/launch/LaunchView.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/LaunchView.java,v
>retrieving revision 1.203
>diff -u -r1.203 LaunchView.java
>--- ui/org/eclipse/debug/internal/ui/views/launch/LaunchView.java	9 Aug 2010 19:56:10 -0000	1.203
>+++ ui/org/eclipse/debug/internal/ui/views/launch/LaunchView.java	16 Dec 2010 19:26:29 -0000
>@@ -9,6 +9,7 @@
>  *     IBM Corporation - initial API and implementation
>  *     Wind River - Pawel Piech - Busy status while updates in progress (Bug 206822)
>  *     Pawel Piech (Wind River) - added a breadcrumb mode to Debug view (Bug 252677)
>+ *     Patrick Chuong (Texas Instruments) - Move debug toolbar actions to main window (Bug 332784)
>  *******************************************************************************/
> package org.eclipse.debug.internal.ui.views.launch;
> 
>@@ -919,19 +920,6 @@
> 		tbm.add(new GroupMarker(IDebugUIConstants.STEP_RETURN_GROUP));
> 		tbm.add(new GroupMarker(IDebugUIConstants.EMPTY_STEP_GROUP));
> 		tbm.add(new Separator(IDebugUIConstants.RENDER_GROUP));
>-        
>-        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));
> 	}	
> 
> 	/* (non-Javadoc)

Flags:

pawel.1.piech: iplog+

Actions: View | Diff

Attachments on bug 258767: 156298 | 156299 | 185360 | 189627 | 199366 | 203180 | 203431 | 203868