Attachment 223052 Details for Bug 381886 – Updated patch to convert debug action set to command contributions

[patch] Updated patch to convert debug action set to command contributions

Converted-debug-view-toolbar-to-command-contribution.patch (text/plain), 41.90 KB, created by Pawel Piech

on 2012-10-31 16:20:23 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Pawel Piech

Created: 2012-10-31 16:20:23 EDT

Size: 41.90 KB

patch

obsolete

>338433d4f467e671f135b4dab81df97bec74ed71 Converted debug view toolbar to command contributions.
>diff --git a/org.eclipse.debug.ui/plugin.xml b/org.eclipse.debug.ui/plugin.xml
>index 19b7a19..0d9bdec 100644
>--- a/org.eclipse.debug.ui/plugin.xml
>+++ b/org.eclipse.debug.ui/plugin.xml
>@@ -297,118 +296,0 @@
>-         <action
>-               id="org.eclipse.debug.ui.actions.ToggleStepFilters"
>-               hoverIcon="$nl$/icons/full/elcl16/stepbystep_co.gif"
>-               class="org.eclipse.debug.internal.ui.commands.actions.ToggleStepFiltersCommandActionDelegate"
>-               definitionId="org.eclipse.debug.ui.commands.ToggleStepFilters"
>-               disabledIcon="$nl$/icons/full/dlcl16/stepbystep_co.gif"
>-               icon="$nl$/icons/full/elcl16/stepbystep_co.gif"
>-               helpContextId="step_with_filters_action_context"
>-               label="%StepWithFiltersAction.label"
>-               menubarPath="org.eclipse.ui.run/emptyStepGroup"
>-               toolbarPath="org.eclipse.debug.ui.main.toolbar/renderGroup"
>-               style="toggle"
>-               state="false">
>-         </action>
>-         <action
>-               id="org.eclipse.debug.ui.actions.DropToFrame"
>-               class="org.eclipse.debug.internal.ui.commands.actions.DropToFrameCommandActionDelegate"
>-               definitionId="org.eclipse.debug.ui.commands.DropToFrame"
>-               icon="$nl$/icons/full/elcl16/drop_to_frame.gif"
>-               helpContextId="org.eclipse.debug.ui.drop_to_frame_action_context"
>-               label="%DropToFrame.label"
>-               toolbarPath="org.eclipse.debug.ui.main.toolbar/renderGroup">
>-         </action>
>-         <action
>-               id="org.eclipse.debug.ui.actions.RunToLine"
>-               class="org.eclipse.debug.internal.ui.actions.RetargetRunToLineAction"
>-               definitionId="org.eclipse.debug.ui.commands.RunToLine"
>-               helpContextId="run_to_line_action_context"
>-               disabledIcon="$nl$/icons/full/dlcl16/runtoline_co.gif"
>-               icon="$nl$/icons/full/elcl16/runtoline_co.gif"
>-               label="%RunToLine.label"
>-               menubarPath="org.eclipse.ui.run/emptyStepGroup"
>-               toolbarPath="org.eclipse.debug.ui.main.toolbar/emptyStepGroup">
>-         </action>                  
>-         <action
>-               id="org.eclipse.debug.ui.actions.StepReturn"
>-               hoverIcon="$nl$/icons/full/elcl16/stepreturn_co.gif"
>-               class="org.eclipse.debug.internal.ui.commands.actions.StepReturnCommandActionDelegate"
>-               definitionId="org.eclipse.debug.ui.commands.StepReturn"
>-               disabledIcon="$nl$/icons/full/dlcl16/stepreturn_co.gif"
>-               icon="$nl$/icons/full/elcl16/stepreturn_co.gif"
>-               helpContextId="step_return_action_context"
>-               label="%StepReturnAction.label"
>-               menubarPath="org.eclipse.ui.run/stepReturnGroup"
>-               toolbarPath="org.eclipse.debug.ui.main.toolbar/stepReturnGroup">
>-         </action>
>-         <action
>-               id="org.eclipse.debug.ui.actions.StepOver"
>-               hoverIcon="$nl$/icons/full/elcl16/stepover_co.gif"
>-               class="org.eclipse.debug.internal.ui.commands.actions.StepOverCommandActionDelegate"
>-               definitionId="org.eclipse.debug.ui.commands.StepOver"
>-               disabledIcon="$nl$/icons/full/dlcl16/stepover_co.gif"
>-               icon="$nl$/icons/full/elcl16/stepover_co.gif"
>-               helpContextId="step_over_action_context"
>-               label="%StepOverAction.label"
>-               menubarPath="org.eclipse.ui.run/stepOverGroup"
>-               toolbarPath="org.eclipse.debug.ui.main.toolbar/stepOverGroup">
>-         </action>
>-         <action
>-               id="org.eclipse.debug.ui.actions.StepInto"
>-               hoverIcon="$nl$/icons/full/elcl16/stepinto_co.gif"
>-               class="org.eclipse.debug.internal.ui.commands.actions.StepIntoCommandActionDelegate"
>-               definitionId="org.eclipse.debug.ui.commands.StepInto"
>-               disabledIcon="$nl$/icons/full/dlcl16/stepinto_co.gif"
>-               icon="$nl$/icons/full/elcl16/stepinto_co.gif"
>-               helpContextId="step_into_action_context"
>-               label="%StepIntoAction.label"
>-               menubarPath="org.eclipse.ui.run/stepIntoGroup"
>-               toolbarPath="org.eclipse.debug.ui.main.toolbar/stepIntoGroup">               
>-         </action>
>-         <action
>-               id="org.eclipse.debug.ui.actions.toolbar.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"
>-               menubarPath="org.eclipse.ui.run/stepGroup"
>-               toolbarPath="org.eclipse.debug.ui.main.toolbar/threadGroup">
>-         </action>
>-         <action
>-               id="org.eclipse.debug.ui.actions.Terminate"
>-               hoverIcon="$nl$/icons/full/elcl16/terminate_co.gif"
>-               class="org.eclipse.debug.internal.ui.commands.actions.TerminateCommandActionDelegate"
>-               definitionId="org.eclipse.debug.ui.commands.Terminate"
>-               disabledIcon="$nl$/icons/full/dlcl16/terminate_co.gif"
>-               icon="$nl$/icons/full/elcl16/terminate_co.gif"
>-               helpContextId="terminate_action_context"
>-               label="%TerminateAction.label"
>-               menubarPath="org.eclipse.ui.run/stepGroup"
>-               toolbarPath="org.eclipse.debug.ui.main.toolbar/threadGroup">
>-         </action>
>-         <action
>-               id="org.eclipse.debug.ui.actions.Suspend"
>-               hoverIcon="$nl$/icons/full/elcl16/suspend_co.gif"
>-               class="org.eclipse.debug.internal.ui.commands.actions.SuspendCommandActionDelegate"
>-               definitionId="org.eclipse.debug.ui.commands.Suspend"
>-               disabledIcon="$nl$/icons/full/dlcl16/suspend_co.gif"
>-               icon="$nl$/icons/full/elcl16/suspend_co.gif"
>-               helpContextId="suspend_action_context"
>-               label="%SuspendAction.label"
>-               menubarPath="org.eclipse.ui.run/stepGroup"
>-               toolbarPath="org.eclipse.debug.ui.main.toolbar/threadGroup">
>-         </action>
>-         <action
>-               id="org.eclipse.debug.ui.actions.Resume"
>-               hoverIcon="$nl$/icons/full/elcl16/resume_co.gif"
>-               class="org.eclipse.debug.internal.ui.commands.actions.ResumeCommandActionDelegate"
>-               definitionId="org.eclipse.debug.ui.commands.Resume"
>-               disabledIcon="$nl$/icons/full/dlcl16/resume_co.gif"
>-               icon="$nl$/icons/full/elcl16/resume_co.gif"
>-               helpContextId="resume_action_context"
>-               label="%ResumeAction.label"
>-               menubarPath="org.eclipse.ui.run/stepGroup"
>-               toolbarPath="org.eclipse.debug.ui.main.toolbar/threadGroup">
>-         </action>
>@@ -600,0 +483,17 @@
>+   <extension point="org.eclipse.core.expressions.definitions">
>+      <definition id="org.eclipse.debug.ui.debugActionSetActive">
>+         <and>
>+            <with variable="org.eclipse.core.runtime.Platform">
>+               <test property="org.eclipse.core.runtime.bundleState"
>+                     args="org.eclipse.debug.ui"
>+                     value="ACTIVE"/>
>+            </with>
>+            <with variable="activeContexts">
>+                 <iterate operator="or">
>+                   <equals value="org.eclipse.debug.ui.debugActionSet"/>
>+                 </iterate>
>+            </with>
>+          </and>
>+      </definition>
>+   </extension>
>+   
>@@ -615,0 +515 @@
>+            <separator name="renderGroup"/>            
>@@ -624,0 +525,123 @@
>+       </menuContribution>
>+       <menuContribution
>+            locationURI="menu:org.eclipse.ui.run?after=threadGroup">
>+         <command
>+               commandId="org.eclipse.debug.ui.commands.StepInto"
>+               disabledIcon="$nl$/icons/full/dlcl16/stepinto_co.gif"
>+               helpContextId="step_into_action_context"
>+               icon="$nl$/icons/full/elcl16/stepinto_co.gif"
>+               label="%StepIntoAction.label">
>+           <visibleWhen checkEnabled="false">
>+              <reference definitionId="org.eclipse.debug.ui.debugActionSetActive"/>
>+           </visibleWhen>            
>+         </command>
>+        <command
>+               commandId="org.eclipse.debug.ui.commands.Resume"
>+               disabledIcon="$nl$/icons/full/dlcl16/resume_co.gif"
>+               helpContextId="resume_action_context"
>+               icon="$nl$/icons/full/elcl16/resume_co.gif"
>+               label="%ResumeAction.label">
>+           <visibleWhen checkEnabled="false">
>+              <reference definitionId="org.eclipse.debug.ui.debugActionSetActive"/>
>+           </visibleWhen>            
>+         </command>
>+         <command
>+               commandId="org.eclipse.debug.ui.commands.Suspend"
>+               disabledIcon="$nl$/icons/full/dlcl16/suspend_co.gif"
>+               helpContextId="suspend_action_context"
>+               icon="$nl$/icons/full/elcl16/suspend_co.gif"
>+               label="%SuspendAction.label">
>+           <visibleWhen checkEnabled="false">
>+              <reference definitionId="org.eclipse.debug.ui.debugActionSetActive"/>
>+           </visibleWhen>            
>+         </command>
>+         <command
>+               commandId="org.eclipse.debug.ui.commands.Terminate"
>+               disabledIcon="$nl$/icons/full/dlcl16/terminate_co.gif"
>+               helpContextId="terminate_action_context"
>+               icon="$nl$/icons/full/elcl16/terminate_co.gif"
>+               label="%TerminateAction.label">
>+           <visibleWhen checkEnabled="false">
>+              <reference definitionId="org.eclipse.debug.ui.debugActionSetActive"/>
>+           </visibleWhen>            
>+         </command>
>+         <command
>+               commandId="org.eclipse.debug.ui.commands.Disconnect"
>+               disabledIcon="$nl$/icons/full/dlcl16/disconnect_co.gif"
>+               helpContextId="disconnect_action_context"
>+               icon="$nl$/icons/full/elcl16/disconnect_co.gif"
>+               label="%Disconnect.label">
>+           <visibleWhen checkEnabled="false">
>+              <reference definitionId="org.eclipse.debug.ui.debugActionSetActive"/>
>+           </visibleWhen>            
>+         </command>
>+      </menuContribution>
>+      <menuContribution locationURI="menu:org.eclipse.ui.run?after=stepIntoGroup">
>+         <command
>+               commandId="org.eclipse.debug.ui.commands.StepInto"
>+               disabledIcon="$nl$/icons/full/dlcl16/stepinto_co.gif"
>+               helpContextId="step_into_action_context"
>+               icon="$nl$/icons/full/elcl16/stepinto_co.gif"
>+               label="%StepIntoAction.label">
>+           <visibleWhen checkEnabled="false">
>+              <reference definitionId="org.eclipse.debug.ui.debugActionSetActive"/>
>+           </visibleWhen>            
>+         </command>
>+      </menuContribution>
>+      <menuContribution locationURI="menu:org.eclipse.ui.run?after=stepOverGroup">
>+         <command
>+               commandId="org.eclipse.debug.ui.commands.StepOver"
>+               disabledIcon="$nl$/icons/full/dlcl16/stepover_co.gif"
>+               helpContextId="step_over_action_context"
>+               icon="$nl$/icons/full/elcl16/stepover_co.gif"
>+               label="%StepOverAction.label">
>+           <visibleWhen checkEnabled="false">
>+              <reference definitionId="org.eclipse.debug.ui.debugActionSetActive"/>
>+           </visibleWhen>            
>+         </command>
>+       </menuContribution>
>+       <menuContribution locationURI="menu:org.eclipse.ui.run?after=stepReturnGroup">
>+         <command
>+               commandId="org.eclipse.debug.ui.commands.StepReturn"
>+               disabledIcon="$nl$/icons/full/dlcl16/stepreturn_co.gif"
>+               helpContextId="step_return_action_context"
>+               icon="$nl$/icons/full/elcl16/stepreturn_co.gif"
>+               label="%StepReturnAction.label">
>+           <visibleWhen checkEnabled="false">
>+              <reference definitionId="org.eclipse.debug.ui.debugActionSetActive"/>
>+           </visibleWhen>            
>+         </command>         
>+       </menuContribution>
>+       <menuContribution locationURI="menu:org.eclipse.ui.run?after=renderGroup">
>+         <command
>+               commandId="org.eclipse.debug.ui.commands.ToggleStepFilters"
>+               disabledIcon="$nl$/icons/full/dlcl16/stepbystep_co.gif"
>+               helpContextId="step_with_filters_action_context"
>+               icon="$nl$/icons/full/elcl16/stepbystep_co.gif"
>+               label="%StepWithFiltersAction.label"
>+               style="toggle">
>+           <visibleWhen checkEnabled="false">
>+              <reference definitionId="org.eclipse.debug.ui.debugActionSetActive"/>
>+           </visibleWhen>            
>+         </command>         
>+         <command
>+               commandId="org.eclipse.debug.ui.commands.DropToFrame"
>+               helpContextId="org.eclipse.debug.ui.drop_to_frame_action_context"
>+               icon="$nl$/icons/full/elcl16/drop_to_frame.gif"
>+               label="%DropToFrame.label">
>+           <visibleWhen checkEnabled="false">
>+              <reference definitionId="org.eclipse.debug.ui.debugActionSetActive"/>
>+           </visibleWhen>            
>+         </command>         
>+       </menuContribution>
>+       <menuContribution locationURI="menu:org.eclipse.ui.run?after=emptyStepGroup">
>+         <command
>+               commandId="org.eclipse.debug.ui.commands.RunToLine"
>+               disabledIcon="$nl$/icons/full/dlcl16/runtoline_co.gif"
>+               helpContextId="run_to_line_action_context"
>+               icon="$nl$/icons/full/elcl16/runtoline_co.gif"
>+               label="%RunToLine.label">
>+           <visibleWhen checkEnabled="false">
>+              <reference definitionId="org.eclipse.debug.ui.debugActionSetActive"/>
>+           </visibleWhen>            
>+         </command>         
>@@ -701,0 +725,123 @@
>+       <menuContribution
>+            locationURI="toolbar:org.eclipse.debug.ui.main.toolbar?after=threadGroup">
>+         <command
>+               commandId="org.eclipse.debug.ui.commands.StepInto"
>+               disabledIcon="$nl$/icons/full/dlcl16/stepinto_co.gif"
>+               helpContextId="step_into_action_context"
>+               icon="$nl$/icons/full/elcl16/stepinto_co.gif"
>+               label="%StepIntoAction.label">
>+           <visibleWhen checkEnabled="false">
>+              <reference definitionId="org.eclipse.debug.ui.debugActionSetActive"/>
>+           </visibleWhen>            
>+         </command>
>+        <command
>+               commandId="org.eclipse.debug.ui.commands.Resume"
>+               disabledIcon="$nl$/icons/full/dlcl16/resume_co.gif"
>+               helpContextId="resume_action_context"
>+               icon="$nl$/icons/full/elcl16/resume_co.gif"
>+               label="%ResumeAction.label">
>+           <visibleWhen checkEnabled="false">
>+              <reference definitionId="org.eclipse.debug.ui.debugActionSetActive"/>
>+           </visibleWhen>            
>+         </command>
>+         <command
>+               commandId="org.eclipse.debug.ui.commands.Suspend"
>+               disabledIcon="$nl$/icons/full/dlcl16/suspend_co.gif"
>+               helpContextId="suspend_action_context"
>+               icon="$nl$/icons/full/elcl16/suspend_co.gif"
>+               label="%SuspendAction.label">
>+           <visibleWhen checkEnabled="false">
>+              <reference definitionId="org.eclipse.debug.ui.debugActionSetActive"/>
>+           </visibleWhen>            
>+         </command>
>+         <command
>+               commandId="org.eclipse.debug.ui.commands.Terminate"
>+               disabledIcon="$nl$/icons/full/dlcl16/terminate_co.gif"
>+               helpContextId="terminate_action_context"
>+               icon="$nl$/icons/full/elcl16/terminate_co.gif"
>+               label="%TerminateAction.label">
>+           <visibleWhen checkEnabled="false">
>+              <reference definitionId="org.eclipse.debug.ui.debugActionSetActive"/>
>+           </visibleWhen>            
>+         </command>
>+         <command
>+               commandId="org.eclipse.debug.ui.commands.Disconnect"
>+               disabledIcon="$nl$/icons/full/dlcl16/disconnect_co.gif"
>+               helpContextId="disconnect_action_context"
>+               icon="$nl$/icons/full/elcl16/disconnect_co.gif"
>+               label="%Disconnect.label">
>+           <visibleWhen checkEnabled="false">
>+              <reference definitionId="org.eclipse.debug.ui.debugActionSetActive"/>
>+           </visibleWhen>            
>+         </command>
>+      </menuContribution>
>+      <menuContribution locationURI="toolbar:org.eclipse.debug.ui.main.toolbar?after=stepIntoGroup">
>+         <command
>+               commandId="org.eclipse.debug.ui.commands.StepInto"
>+               disabledIcon="$nl$/icons/full/dlcl16/stepinto_co.gif"
>+               helpContextId="step_into_action_context"
>+               icon="$nl$/icons/full/elcl16/stepinto_co.gif"
>+               label="%StepIntoAction.label">
>+           <visibleWhen checkEnabled="false">
>+              <reference definitionId="org.eclipse.debug.ui.debugActionSetActive"/>
>+           </visibleWhen>            
>+         </command>
>+      </menuContribution>
>+      <menuContribution locationURI="toolbar:org.eclipse.debug.ui.main.toolbar?after=stepOverGroup">
>+         <command
>+               commandId="org.eclipse.debug.ui.commands.StepOver"
>+               disabledIcon="$nl$/icons/full/dlcl16/stepover_co.gif"
>+               helpContextId="step_over_action_context"
>+               icon="$nl$/icons/full/elcl16/stepover_co.gif"
>+               label="%StepOverAction.label">
>+           <visibleWhen checkEnabled="false">
>+              <reference definitionId="org.eclipse.debug.ui.debugActionSetActive"/>
>+           </visibleWhen>            
>+         </command>
>+       </menuContribution>
>+       <menuContribution locationURI="toolbar:org.eclipse.debug.ui.main.toolbar?after=stepReturnGroup">
>+         <command
>+               commandId="org.eclipse.debug.ui.commands.StepReturn"
>+               disabledIcon="$nl$/icons/full/dlcl16/stepreturn_co.gif"
>+               helpContextId="step_return_action_context"
>+               icon="$nl$/icons/full/elcl16/stepreturn_co.gif"
>+               label="%StepReturnAction.label">
>+           <visibleWhen checkEnabled="false">
>+              <reference definitionId="org.eclipse.debug.ui.debugActionSetActive"/>
>+           </visibleWhen>            
>+         </command>         
>+       </menuContribution>
>+       <menuContribution locationURI="toolbar:org.eclipse.debug.ui.main.toolbar?after=renderGroup">
>+         <command
>+               commandId="org.eclipse.debug.ui.commands.ToggleStepFilters"
>+               disabledIcon="$nl$/icons/full/dlcl16/stepbystep_co.gif"
>+               helpContextId="step_with_filters_action_context"
>+               icon="$nl$/icons/full/elcl16/stepbystep_co.gif"
>+               label="%StepWithFiltersAction.label"
>+               style="toggle">
>+           <visibleWhen checkEnabled="false">
>+              <reference definitionId="org.eclipse.debug.ui.debugActionSetActive"/>
>+           </visibleWhen>            
>+         </command>         
>+         <command
>+               commandId="org.eclipse.debug.ui.commands.DropToFrame"
>+               helpContextId="org.eclipse.debug.ui.drop_to_frame_action_context"
>+               icon="$nl$/icons/full/elcl16/drop_to_frame.gif"
>+               label="%DropToFrame.label">
>+           <visibleWhen checkEnabled="false">
>+              <reference definitionId="org.eclipse.debug.ui.debugActionSetActive"/>
>+           </visibleWhen>            
>+         </command>         
>+       </menuContribution>
>+       <menuContribution locationURI="toolbar:org.eclipse.debug.ui.main.toolbar?after=emptyStepGroup">
>+         <command
>+               commandId="org.eclipse.debug.ui.commands.RunToLine"
>+               disabledIcon="$nl$/icons/full/dlcl16/runtoline_co.gif"
>+               helpContextId="run_to_line_action_context"
>+               icon="$nl$/icons/full/elcl16/runtoline_co.gif"
>+               label="%RunToLine.label">
>+           <visibleWhen checkEnabled="false">
>+              <reference definitionId="org.eclipse.debug.ui.debugActionSetActive"/>
>+           </visibleWhen>            
>+         </command>         
>+       </menuContribution>       
>@@ -732,0 +879,159 @@
>+   </extension>  
>+      
>+   <extension point="org.eclipse.ui.menus">
>+      <menuContribution locationURI="toolbar:org.eclipse.debug.ui.DebugView?after=threadGroup">
>+         <command
>+               commandId="org.eclipse.debug.ui.commands.Resume"
>+               disabledIcon="$nl$/icons/full/dlcl16/resume_co.gif"
>+               helpContextId="resume_action_context"
>+               icon="$nl$/icons/full/elcl16/resume_co.gif"
>+               label="%ResumeAction.label">
>+         </command>
>+         <command
>+               commandId="org.eclipse.debug.ui.commands.Suspend"
>+               disabledIcon="$nl$/icons/full/dlcl16/suspend_co.gif"
>+               helpContextId="suspend_action_context"
>+               icon="$nl$/icons/full/elcl16/suspend_co.gif"
>+               label="%SuspendAction.label">
>+            <visibleWhen checkEnabled="false">
>+	        	<systemTest property="org.eclipse.debug.ui.debugViewToolbarVisible" value="true"/>
>+            </visibleWhen>
>+         </command>
>+         <command
>+               commandId="org.eclipse.debug.ui.commands.Terminate"
>+               disabledIcon="$nl$/icons/full/dlcl16/terminate_co.gif"
>+               helpContextId="terminate_action_context"
>+               icon="$nl$/icons/full/elcl16/terminate_co.gif"
>+               label="%TerminateAction.label">
>+            <visibleWhen checkEnabled="false">
>+	        	<systemTest property="org.eclipse.debug.ui.debugViewToolbarVisible" value="true"/>
>+            </visibleWhen>
>+         </command>
>+         <command
>+               commandId="org.eclipse.debug.ui.commands.Disconnect"
>+               disabledIcon="$nl$/icons/full/dlcl16/disconnect_co.gif"
>+               helpContextId="disconnect_action_context"
>+               icon="$nl$/icons/full/elcl16/disconnect_co.gif"
>+               label="%Disconnect.label">
>+            <visibleWhen checkEnabled="false">
>+	        	<systemTest property="org.eclipse.debug.ui.debugViewToolbarVisible" value="true"/>
>+            </visibleWhen>
>+         </command>
>+      </menuContribution>
>+      <menuContribution locationURI="toolbar:org.eclipse.debug.ui.DebugView?after=stepIntoGroup">
>+         <command
>+               commandId="org.eclipse.debug.ui.commands.StepInto"
>+               disabledIcon="$nl$/icons/full/dlcl16/stepinto_co.gif"
>+               helpContextId="step_into_action_context"
>+               icon="$nl$/icons/full/elcl16/stepinto_co.gif"
>+               label="%StepIntoAction.label">
>+            <visibleWhen checkEnabled="false">
>+	        	<systemTest property="org.eclipse.debug.ui.debugViewToolbarVisible" value="true"/>
>+            </visibleWhen>
>+         </command>
>+      </menuContribution>
>+      <menuContribution locationURI="toolbar:org.eclipse.debug.ui.DebugView?after=stepOverGroup">
>+         <command
>+               commandId="org.eclipse.debug.ui.commands.StepOver"
>+               disabledIcon="$nl$/icons/full/dlcl16/stepover_co.gif"
>+               helpContextId="step_over_action_context"
>+               icon="$nl$/icons/full/elcl16/stepover_co.gif"
>+               label="%StepOverAction.label">
>+            <visibleWhen checkEnabled="false">
>+	        	<systemTest property="org.eclipse.debug.ui.debugViewToolbarVisible" value="true"/>
>+            </visibleWhen>
>+         </command>
>+      </menuContribution>
>+      <menuContribution locationURI="toolbar:org.eclipse.debug.ui.DebugView?after=stepReturnGroup">
>+         <command
>+               commandId="org.eclipse.debug.ui.commands.StepReturn"
>+               disabledIcon="$nl$/icons/full/dlcl16/stepreturn_co.gif"
>+               helpContextId="step_return_action_context"
>+               icon="$nl$/icons/full/elcl16/stepreturn_co.gif"
>+               label="%StepReturnAction.label">
>+            <visibleWhen checkEnabled="false">
>+	        	<systemTest property="org.eclipse.debug.ui.debugViewToolbarVisible" value="true"/>
>+            </visibleWhen>
>+         </command>
>+      </menuContribution>
>+     
>+      <menuContribution locationURI="popup:org.eclipse.debug.ui.DebugView?after=threadGroup">
>+         <command
>+               commandId="org.eclipse.debug.ui.commands.Resume"
>+               disabledIcon="$nl$/icons/full/dlcl16/resume_co.gif"
>+               helpContextId="resume_action_context"
>+               icon="$nl$/icons/full/elcl16/resume_co.gif"
>+               label="%ResumeAction.label">
>+            <visibleWhen checkEnabled="false">
>+	        	<systemTest property="org.eclipse.debug.ui.debugViewToolbarVisible" value="true"/>
>+            </visibleWhen>
>+         </command>
>+         <command
>+               commandId="org.eclipse.debug.ui.commands.Suspend"
>+               disabledIcon="$nl$/icons/full/dlcl16/suspend_co.gif"
>+               helpContextId="suspend_action_context"
>+               icon="$nl$/icons/full/elcl16/suspend_co.gif"
>+               label="%SuspendAction.label">
>+            <visibleWhen checkEnabled="false">
>+	        	<systemTest property="org.eclipse.debug.ui.debugViewToolbarVisible" value="true"/>
>+            </visibleWhen>
>+         </command>
>+         <command
>+               commandId="org.eclipse.debug.ui.commands.Terminate"
>+               disabledIcon="$nl$/icons/full/dlcl16/terminate_co.gif"
>+               helpContextId="terminate_action_context"
>+               icon="$nl$/icons/full/elcl16/terminate_co.gif"
>+               label="%TerminateAction.label">
>+            <visibleWhen checkEnabled="false">
>+	        	<systemTest property="org.eclipse.debug.ui.debugViewToolbarVisible" value="true"/>
>+            </visibleWhen>
>+         </command>
>+         <command
>+               commandId="org.eclipse.debug.ui.commands.Disconnect"
>+               disabledIcon="$nl$/icons/full/dlcl16/disconnect_co.gif"
>+               helpContextId="disconnect_action_context"
>+               icon="$nl$/icons/full/elcl16/disconnect_co.gif"
>+               label="%Disconnect.label">
>+            <visibleWhen checkEnabled="false">
>+	        	<systemTest property="org.eclipse.debug.ui.debugViewToolbarVisible" value="true"/>
>+            </visibleWhen>
>+         </command>
>+      </menuContribution>
>+      <menuContribution locationURI="popup:org.eclipse.debug.ui.DebugView?after=stepIntoGroup">
>+         <command
>+               commandId="org.eclipse.debug.ui.commands.StepInto"
>+               disabledIcon="$nl$/icons/full/dlcl16/stepinto_co.gif"
>+               helpContextId="step_into_action_context"
>+               icon="$nl$/icons/full/elcl16/stepinto_co.gif"
>+               label="%StepIntoAction.label">
>+            <visibleWhen checkEnabled="false">
>+	        	<systemTest property="org.eclipse.debug.ui.debugViewToolbarVisible" value="true"/>
>+            </visibleWhen>
>+         </command>
>+      </menuContribution>
>+      <menuContribution locationURI="popup:org.eclipse.debug.ui.DebugView?after=stepOverGroup">
>+         <command
>+               commandId="org.eclipse.debug.ui.commands.StepOver"
>+               disabledIcon="$nl$/icons/full/dlcl16/stepover_co.gif"
>+               helpContextId="step_over_action_context"
>+               icon="$nl$/icons/full/elcl16/stepover_co.gif"
>+               label="%StepOverAction.label">
>+            <visibleWhen checkEnabled="false">
>+	        	<systemTest property="org.eclipse.debug.ui.debugViewToolbarVisible" value="true"/>
>+            </visibleWhen>
>+         </command>
>+      </menuContribution>
>+      <menuContribution locationURI="popup:org.eclipse.debug.ui.DebugView?after=stepReturnGroup">
>+         <command
>+               commandId="org.eclipse.debug.ui.commands.StepReturn"
>+               disabledIcon="$nl$/icons/full/dlcl16/stepreturn_co.gif"
>+               helpContextId="step_return_action_context"
>+               icon="$nl$/icons/full/elcl16/stepreturn_co.gif"
>+               label="%StepReturnAction.label">
>+            <visibleWhen checkEnabled="false">
>+	        	<systemTest property="org.eclipse.debug.ui.debugViewToolbarVisible" value="true"/>
>+            </visibleWhen>
>+         </command>
>+      </menuContribution>
>+   </extension>  
>+     
>@@ -734,0 +1040,2 @@
>+   <extension
>+         point="org.eclipse.ui.viewActions">
>@@ -3149 +3455,0 @@
>-
>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
>@@ -26,0 +27,2 @@
>+	public final static String COMMAND_ID = "org.eclipse.debug.ui.commands.Disconnect";  //$NON-NLS-1$
>+	
>@@ -28,2 +30,2 @@
>-        setActionDefinitionId("org.eclipse.debug.ui.commands.Disconnect"); //$NON-NLS-1$
>-    }
>+		setActionDefinitionId(COMMAND_ID);
>+	}
>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
>@@ -26,0 +27,2 @@
>+	public final static String COMMAND_ID = "org.eclipse.debug.ui.commands.DropToFrame";  //$NON-NLS-1$
>+	
>@@ -28,2 +30,2 @@
>-        setActionDefinitionId("org.eclipse.debug.ui.commands.DropToFrame"); //$NON-NLS-1$
>-    }
>+		setActionDefinitionId(COMMAND_ID);
>+	}
>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
>@@ -26,0 +27,2 @@
>+	public final static String COMMAND_ID = "org.eclipse.debug.ui.commands.Resume";  //$NON-NLS-1$
>+	
>@@ -28 +30 @@
>-		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
>@@ -26,0 +27,2 @@
>+	public final static String COMMAND_ID = "org.eclipse.debug.ui.commands.StepInto";  //$NON-NLS-1$
>+	
>@@ -28 +30 @@
>-		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/StepIntoCommandHandler.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/StepIntoCommandHandler.java
>index 2158b10..5917b6b 100644
>--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/StepIntoCommandHandler.java
>+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/StepIntoCommandHandler.java
>@@ -27,0 +28,5 @@
>+    public boolean isEnabled() {
>+        // TODO Auto-generated method stub
>+        return super.isEnabled();
>+    }
>+    
>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
>@@ -27,0 +28,2 @@
>+	public final static String COMMAND_ID = "org.eclipse.debug.ui.commands.StepOver";  //$NON-NLS-1$
>+
>@@ -29 +31 @@
>-		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/StepOverCommandHandler.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/StepOverCommandHandler.java
>index b93551e..18bd258 100644
>--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/StepOverCommandHandler.java
>+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/StepOverCommandHandler.java
>@@ -27,0 +28,5 @@
>+    public boolean isEnabled() {
>+        // TODO Auto-generated method stub
>+        return super.isEnabled();
>+    }
>+
>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
>@@ -26,0 +27 @@
>+	public final static String COMMAND_ID = "org.eclipse.debug.ui.commands.StepReturn";  //$NON-NLS-1$
>@@ -29 +30 @@
>-		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
>@@ -26,0 +27,2 @@
>+	public final static String COMMAND_ID = "org.eclipse.debug.ui.commands.Suspend";  //$NON-NLS-1$
>+	
>@@ -28,2 +30,2 @@
>-        setActionDefinitionId("org.eclipse.debug.ui.commands.Suspend"); //$NON-NLS-1$
>-    }
>+		setActionDefinitionId(COMMAND_ID);
>+	}
>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
>@@ -26,0 +27,2 @@
>+	public final static String COMMAND_ID = "org.eclipse.debug.ui.commands.Terminate";  //$NON-NLS-1$
>+	
>@@ -28 +30 @@
>-		setActionDefinitionId("org.eclipse.debug.ui.commands.Terminate"); //$NON-NLS-1$
>+		setActionDefinitionId(COMMAND_ID);
>@@ -31 +33 @@
>-    public String getText() {
>+	public String getText() {
>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
>@@ -34,0 +35,2 @@
>+	public final static String COMMAND_ID = "org.eclipse.debug.ui.commands.ToggleStepFilters";  //$NON-NLS-1$
>+	
>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
>@@ -84 +83,0 @@
>-import org.eclipse.jface.action.ActionContributionItem;
>@@ -86,0 +86 @@
>+import org.eclipse.jface.action.IContributionItem;
>@@ -144,16 +143,0 @@
>-
>-    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$
>@@ -539,8 +522,0 @@
>-        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);
>@@ -995 +971 @@
>-		    addDebugToolbarActions(tbm);
>+		    setDebugToolbarActionsVisible(tbm, true);
>@@ -999,13 +975,16 @@
>-   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);
>+			}
>+		}
>@@ -1013,21 +992 @@
>-	
>-   /**
>-    * 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)));
>-   }
>-	   
>+		   
>@@ -1061 +1020 @@
>-           addDebugToolbarActions(tbm);
>+           setDebugToolbarActionsVisible(tbm, true);
>@@ -1063 +1022 @@
>-           removeDebugToolbarActions(tbm);
>+           setDebugToolbarActionsVisible(tbm, false);
>@@ -1065 +1023,0 @@
>-       getViewSite().getActionBars().updateActionBars();
>@@ -1068,0 +1027 @@
>+       getViewSite().getActionBars().updateActionBars();
>@@ -1109,8 +1067,0 @@
>-        disposeCommandAction(TERMINATE);
>-        disposeCommandAction(DISCONNECT);
>-        disposeCommandAction(SUSPEND);
>-        disposeCommandAction(RESUME);
>-        disposeCommandAction(STEP_RETURN);
>-        disposeCommandAction(STEP_OVER);
>-        disposeCommandAction(STEP_INTO);
>-        disposeCommandAction(DROP_TO_FRAME);
>@@ -1242,4 +1192,0 @@
>-        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));
>@@ -1249,7 +1195,0 @@
>-        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));

Actions: View | Diff

Attachments on bug 381886: 222852 | 223052 | 223367