Attachment #222852 for bug #381886




         </action>
      </viewContribution>
   </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"
            icon="$nl$/icons/full/elcl16/resume_co.gif"
            label="%ResumeAction.label"
            helpContextId="resume_action_context">
            <visibleWhen checkEnabled="false">
	        	<systemTest property="org.eclipse.debug.ui.debugViewToolbarVisible" value="true"/>
            </visibleWhen>
         </command>
         <command
            commandId="org.eclipse.debug.ui.commands.Suspend"
            icon="$nl$/icons/full/elcl16/suspend_co.gif"
            label="%SuspendAction.label"
            helpContextId="suspend_action_context">
            <visibleWhen checkEnabled="false">
	        	<systemTest property="org.eclipse.debug.ui.debugViewToolbarVisible" value="true"/>
            </visibleWhen>
         </command>
         <command
            commandId="org.eclipse.debug.ui.commands.Terminate"
            icon="$nl$/icons/full/elcl16/terminate_co.gif"
            label="%TerminateAction.label"
            helpContextId="terminate_action_context">
            <visibleWhen checkEnabled="false">
	        	<systemTest property="org.eclipse.debug.ui.debugViewToolbarVisible" value="true"/>
            </visibleWhen>
         </command>
         <command
            commandId="org.eclipse.debug.ui.commands.Disconnect"
            icon="$nl$/icons/full/elcl16/disconnect_co.gif"
            label="%Disconnect.label"
            helpContextId="disconnect_action_context">
            <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"
            icon="$nl$/icons/full/elcl16/stepinto_co.gif"
            label="%StepIntoAction.label"
            helpContextId="step_into_action_context">
            <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"
            icon="$nl$/icons/full/elcl16/stepover_co.gif"
            label="%StepOverAction.label"
            helpContextId="step_over_action_context">
            <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"
            icon="$nl$/icons/full/elcl16/stepreturn_co.gif"
            label="%StepOverAction.label"
            helpContextId="step_return_action_context">
            <visibleWhen checkEnabled="false">
	        	<systemTest property="org.eclipse.debug.ui.debugViewToolbarVisible" value="true"/>
            </visibleWhen>
         </command>
      </menuContribution>
     <!-- Contributions to Debug View Popup menu -->
      <menuContribution locationURI="popup:org.eclipse.debug.ui.DebugView?after=threadGroup">
         <command
            commandId="org.eclipse.debug.ui.commands.Resume"
            icon="$nl$/icons/full/elcl16/resume_co.gif"
            label="%ResumeAction.label"
            helpContextId="resume_action_context">
            <visibleWhen checkEnabled="false">
	        	<systemTest property="org.eclipse.debug.ui.debugViewToolbarVisible" value="true"/>
            </visibleWhen>
         </command>
         <command
            commandId="org.eclipse.debug.ui.commands.Suspend"
            icon="$nl$/icons/full/elcl16/suspend_co.gif"
            label="%SuspendAction.label"
            helpContextId="suspend_action_context">
            <visibleWhen checkEnabled="false">
	        	<systemTest property="org.eclipse.debug.ui.debugViewToolbarVisible" value="true"/>
            </visibleWhen>
         </command>
         <command
            commandId="org.eclipse.debug.ui.commands.Terminate"
            icon="$nl$/icons/full/elcl16/terminate_co.gif"
            label="%TerminateAction.label"
            helpContextId="terminate_action_context">
            <visibleWhen checkEnabled="false">
	        	<systemTest property="org.eclipse.debug.ui.debugViewToolbarVisible" value="true"/>
            </visibleWhen>
         </command>
         <command
            commandId="org.eclipse.debug.ui.commands.Disconnect"
            icon="$nl$/icons/full/elcl16/disconnect_co.gif"
            label="%Disconnect.label"
            helpContextId="disconnect_action_context">
            <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"
            icon="$nl$/icons/full/elcl16/stepinto_co.gif"
            label="%StepIntoAction.label"
            helpContextId="step_into_action_context">
            <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"
            icon="$nl$/icons/full/elcl16/stepover_co.gif"
            label="%StepOverAction.label"
            helpContextId="step_over_action_context">
            <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"
            icon="$nl$/icons/full/elcl16/stepreturn_co.gif"
            label="%StepOverAction.label"
            helpContextId="step_return_action_context">
            <visibleWhen checkEnabled="false">
	        	<systemTest property="org.eclipse.debug.ui.debugViewToolbarVisible" value="true"/>
            </visibleWhen>
         </command>
      </menuContribution>
   </extension>  
     
     
<!-- Contributions to Breakpoints View Toolbar -->
   <extension
         point="org.eclipse.ui.viewActions">
      <viewContribution
            targetID="org.eclipse.debug.ui.BreakpointView"

      </component>
   </extension>

</plugin>

Lines 25-31 Link Here

(-)a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/DisconnectCommandAction.java (-2 / +4 lines)
25	public class DisconnectCommandAction extends DebugCommandAction{	25	public class DisconnectCommandAction extends DebugCommandAction{
26		26
		27	public final static String COMMAND_ID = "org.eclipse.debug.ui.commands.Disconnect"; //$NON-NLS-1$
		28
27	public DisconnectCommandAction() {	29	public DisconnectCommandAction() {
28	setActionDefinitionId("org.eclipse.debug.ui.commands.Disconnect"); //$NON-NLS-1$	30	setActionDefinitionId(COMMAND_ID);
29	}	31	}
30		32
31	public String getText() {	33	public String getText() {

Lines 25-31 Link Here

(-)a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/DropToFrameCommandAction.java (-2 / +4 lines)
25	public class DropToFrameCommandAction extends DebugCommandAction {	25	public class DropToFrameCommandAction extends DebugCommandAction {
26		26
		27	public final static String COMMAND_ID = "org.eclipse.debug.ui.commands.DropToFrame"; //$NON-NLS-1$
		28
27	public DropToFrameCommandAction() {	29	public DropToFrameCommandAction() {
28	setActionDefinitionId("org.eclipse.debug.ui.commands.DropToFrame"); //$NON-NLS-1$	30	setActionDefinitionId(COMMAND_ID);
29	}	31	}
30		32
31	public String getText() {	33	public String getText() {

Lines 25-30 Link Here

(-)a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/ResumeCommandAction.java (-1 / +3 lines)
25	public class ResumeCommandAction extends DebugCommandAction{	25	public class ResumeCommandAction extends DebugCommandAction{
26		26
		27	public final static String COMMAND_ID = "org.eclipse.debug.ui.commands.Resume"; //$NON-NLS-1$
		28
27	public ResumeCommandAction() {	29	public ResumeCommandAction() {
28	setActionDefinitionId("org.eclipse.debug.ui.commands.Resume"); //$NON-NLS-1$	30	setActionDefinitionId(COMMAND_ID);
29	}	31	}
30		32

Lines 25-30 Link Here

(-)a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/StepIntoCommandAction.java (-1 / +3 lines)
25	public class StepIntoCommandAction extends DebugCommandAction {	25	public class StepIntoCommandAction extends DebugCommandAction {
26		26
		27	public final static String COMMAND_ID = "org.eclipse.debug.ui.commands.StepInto"; //$NON-NLS-1$
		28
27	public StepIntoCommandAction() {	29	public StepIntoCommandAction() {
28	setActionDefinitionId("org.eclipse.debug.ui.commands.StepInto"); //$NON-NLS-1$	30	setActionDefinitionId(COMMAND_ID);
29	}	31	}
30		32

Lines 26-31 Link Here

(-)a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/StepOverCommandAction.java (-1 / +3 lines)
26	public class StepOverCommandAction extends DebugCommandAction {	26	public class StepOverCommandAction extends DebugCommandAction {
27		27
		28	public final static String COMMAND_ID = "org.eclipse.debug.ui.commands.StepOver"; //$NON-NLS-1$
		29
28	public StepOverCommandAction() {	30	public StepOverCommandAction() {
29	setActionDefinitionId("org.eclipse.debug.ui.commands.StepOver"); //$NON-NLS-1$	31	setActionDefinitionId(COMMAND_ID);
30	}	32	}
31		33

Lines 25-31 Link Here

(-)a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/StepReturnCommandAction.java (-1 / +2 lines)
25	public class StepReturnCommandAction extends DebugCommandAction {	25	public class StepReturnCommandAction extends DebugCommandAction {
26		26
		27	public final static String COMMAND_ID = "org.eclipse.debug.ui.commands.StepReturn"; //$NON-NLS-1$
27		28
28	public StepReturnCommandAction() {	29	public StepReturnCommandAction() {
29	setActionDefinitionId("org.eclipse.debug.ui.commands.StepReturn"); //$NON-NLS-1$	30	setActionDefinitionId(COMMAND_ID);
30	}	31	}
31		32

Lines 25-31 Link Here

(-)a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/SuspendCommandAction.java (-2 / +4 lines)
25	public class SuspendCommandAction extends DebugCommandAction {	25	public class SuspendCommandAction extends DebugCommandAction {
26		26
		27	public final static String COMMAND_ID = "org.eclipse.debug.ui.commands.Suspend"; //$NON-NLS-1$
		28
27	public SuspendCommandAction() {	29	public SuspendCommandAction() {
28	setActionDefinitionId("org.eclipse.debug.ui.commands.Suspend"); //$NON-NLS-1$	30	setActionDefinitionId(COMMAND_ID);
29	}	31	}
30		32
31	public String getText() {	33	public String getText() {

Lines 25-33 Link Here

(-)a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/TerminateCommandAction.java (-2 / +4 lines)
25	public class TerminateCommandAction extends DebugCommandAction {	25	public class TerminateCommandAction extends DebugCommandAction {
26		26
		27	public final static String COMMAND_ID = "org.eclipse.debug.ui.commands.Terminate"; //$NON-NLS-1$
		28
27	public TerminateCommandAction() {	29	public TerminateCommandAction() {
28	setActionDefinitionId("org.eclipse.debug.ui.commands.Terminate"); //$NON-NLS-1$	30	setActionDefinitionId(COMMAND_ID);
29	}	31	}
30		32
31	public String getText() {	33	public String getText() {
32	return ActionMessages.TerminateAction_0;	34	return ActionMessages.TerminateAction_0;
33	}	35	}

Lines 33-36 Link Here

(-)a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/ToggleStepFiltersAction.java (+2 lines)
33	public class ToggleStepFiltersAction extends DebugCommandAction implements IPropertyChangeListener {	33	public class ToggleStepFiltersAction extends DebugCommandAction implements IPropertyChangeListener {
34		34
		35	public final static String COMMAND_ID = "org.eclipse.debug.ui.commands.ToggleStepFilters"; //$NON-NLS-1$
		36
35	private boolean fInitialized = !DebugUITools.isUseStepFilters();	37	private boolean fInitialized = !DebugUITools.isUseStepFilters();
36		38




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;

	
	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$

		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);


		if (fDebugToolbarInView) {
		    setDebugToolbarActionsVisible(tbm, true);
		}
	}	

	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;

       IToolBarManager tbm = getViewSite().getActionBars().getToolBarManager();
       if (show) {
           setDebugToolbarActionsVisible(tbm, true);
       } else {
           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();
   }
   

        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);

        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));

Return to bug 381886

Lines 731-736 Link Here

(-)a/org.eclipse.debug.ui/plugin.xml (-1 / +150 lines)
731	</action>	731	</action>
732	</viewContribution>	732	</viewContribution>
		733	</extension>
		734
		735	<extension point="org.eclipse.ui.menus">
		736	<menuContribution locationURI="toolbar:org.eclipse.debug.ui.DebugView?after=threadGroup">
		737	<command
		738	commandId="org.eclipse.debug.ui.commands.Resume"
		739	icon="$nl$/icons/full/elcl16/resume_co.gif"
		740	label="%ResumeAction.label"
		741	helpContextId="resume_action_context">
		742	<visibleWhen checkEnabled="false">
		743	<systemTest property="org.eclipse.debug.ui.debugViewToolbarVisible" value="true"/>
		744	</visibleWhen>
		745	</command>
		746	<command
		747	commandId="org.eclipse.debug.ui.commands.Suspend"
		748	icon="$nl$/icons/full/elcl16/suspend_co.gif"
		749	label="%SuspendAction.label"
		750	helpContextId="suspend_action_context">
		751	<visibleWhen checkEnabled="false">
		752	<systemTest property="org.eclipse.debug.ui.debugViewToolbarVisible" value="true"/>
		753	</visibleWhen>
		754	</command>
		755	<command
		756	commandId="org.eclipse.debug.ui.commands.Terminate"
		757	icon="$nl$/icons/full/elcl16/terminate_co.gif"
		758	label="%TerminateAction.label"
		759	helpContextId="terminate_action_context">
		760	<visibleWhen checkEnabled="false">
		761	<systemTest property="org.eclipse.debug.ui.debugViewToolbarVisible" value="true"/>
		762	</visibleWhen>
		763	</command>
		764	<command
		765	commandId="org.eclipse.debug.ui.commands.Disconnect"
		766	icon="$nl$/icons/full/elcl16/disconnect_co.gif"
		767	label="%Disconnect.label"
		768	helpContextId="disconnect_action_context">
		769	<visibleWhen checkEnabled="false">
		770	<systemTest property="org.eclipse.debug.ui.debugViewToolbarVisible" value="true"/>
		771	</visibleWhen>
		772	</command>
		773	</menuContribution>
		774	<menuContribution locationURI="toolbar:org.eclipse.debug.ui.DebugView?after=stepIntoGroup">
		775	<command
		776	commandId="org.eclipse.debug.ui.commands.StepInto"
		777	icon="$nl$/icons/full/elcl16/stepinto_co.gif"
		778	label="%StepIntoAction.label"
		779	helpContextId="step_into_action_context">
		780	<visibleWhen checkEnabled="false">
		781	<systemTest property="org.eclipse.debug.ui.debugViewToolbarVisible" value="true"/>
		782	</visibleWhen>
		783	</command>
		784	</menuContribution>
		785	<menuContribution locationURI="toolbar:org.eclipse.debug.ui.DebugView?after=stepOverGroup">
		786	<command
		787	commandId="org.eclipse.debug.ui.commands.StepOver"
		788	icon="$nl$/icons/full/elcl16/stepover_co.gif"
		789	label="%StepOverAction.label"
		790	helpContextId="step_over_action_context">
		791	<visibleWhen checkEnabled="false">
		792	<systemTest property="org.eclipse.debug.ui.debugViewToolbarVisible" value="true"/>
		793	</visibleWhen>
		794	</command>
		795	</menuContribution>
		796	<menuContribution locationURI="toolbar:org.eclipse.debug.ui.DebugView?after=stepReturnGroup">
797	<command
798	commandId="org.eclipse.debug.ui.commands.StepReturn"
799	icon="$nl$/icons/full/elcl16/stepreturn_co.gif"
800	label="%StepOverAction.label"
801	helpContextId="step_return_action_context">
802	<visibleWhen checkEnabled="false">
803	<systemTest property="org.eclipse.debug.ui.debugViewToolbarVisible" value="true"/>
804	</visibleWhen>
805	</command>
806	</menuContribution>
807	<!-- Contributions to Debug View Popup menu -->
808	<menuContribution locationURI="popup:org.eclipse.debug.ui.DebugView?after=threadGroup">
809	<command
810	commandId="org.eclipse.debug.ui.commands.Resume"
811	icon="$nl$/icons/full/elcl16/resume_co.gif"
812	label="%ResumeAction.label"
813	helpContextId="resume_action_context">
814	<visibleWhen checkEnabled="false">
815	<systemTest property="org.eclipse.debug.ui.debugViewToolbarVisible" value="true"/>
816	</visibleWhen>
817	</command>
818	<command
819	commandId="org.eclipse.debug.ui.commands.Suspend"
820	icon="$nl$/icons/full/elcl16/suspend_co.gif"
821	label="%SuspendAction.label"
822	helpContextId="suspend_action_context">
823	<visibleWhen checkEnabled="false">
824	<systemTest property="org.eclipse.debug.ui.debugViewToolbarVisible" value="true"/>
825	</visibleWhen>
826	</command>
827	<command
828	commandId="org.eclipse.debug.ui.commands.Terminate"
829	icon="$nl$/icons/full/elcl16/terminate_co.gif"
830	label="%TerminateAction.label"
831	helpContextId="terminate_action_context">
832	<visibleWhen checkEnabled="false">
833	<systemTest property="org.eclipse.debug.ui.debugViewToolbarVisible" value="true"/>
834	</visibleWhen>
835	</command>
836	<command
837	commandId="org.eclipse.debug.ui.commands.Disconnect"
838	icon="$nl$/icons/full/elcl16/disconnect_co.gif"
839	label="%Disconnect.label"
840	helpContextId="disconnect_action_context">
841	<visibleWhen checkEnabled="false">
842	<systemTest property="org.eclipse.debug.ui.debugViewToolbarVisible" value="true"/>
843	</visibleWhen>
844	</command>
845	</menuContribution>
846	<menuContribution locationURI="popup:org.eclipse.debug.ui.DebugView?after=stepIntoGroup">
847	<command
848	commandId="org.eclipse.debug.ui.commands.StepInto"
849	icon="$nl$/icons/full/elcl16/stepinto_co.gif"
850	label="%StepIntoAction.label"
851	helpContextId="step_into_action_context">
852	<visibleWhen checkEnabled="false">
853	<systemTest property="org.eclipse.debug.ui.debugViewToolbarVisible" value="true"/>
854	</visibleWhen>
855	</command>
856	</menuContribution>
857	<menuContribution locationURI="popup:org.eclipse.debug.ui.DebugView?after=stepOverGroup">
858	<command
859	commandId="org.eclipse.debug.ui.commands.StepOver"
860	icon="$nl$/icons/full/elcl16/stepover_co.gif"
861	label="%StepOverAction.label"
862	helpContextId="step_over_action_context">
863	<visibleWhen checkEnabled="false">
864	<systemTest property="org.eclipse.debug.ui.debugViewToolbarVisible" value="true"/>
865	</visibleWhen>
866	</command>
867	</menuContribution>
868	<menuContribution locationURI="popup:org.eclipse.debug.ui.DebugView?after=stepReturnGroup">
869	<command
870	commandId="org.eclipse.debug.ui.commands.StepReturn"
871	icon="$nl$/icons/full/elcl16/stepreturn_co.gif"
872	label="%StepOverAction.label"
873	helpContextId="step_return_action_context">
874	<visibleWhen checkEnabled="false">
875	<systemTest property="org.eclipse.debug.ui.debugViewToolbarVisible" value="true"/>
876	</visibleWhen>
877	</command>
878	</menuContribution>
879	</extension>
880
733		881
734	<!-- Contributions to Breakpoints View Toolbar -->	882	<!-- Contributions to Breakpoints View Toolbar -->
		883	<extension
		884	point="org.eclipse.ui.viewActions">
735	<viewContribution	885	<viewContribution
736	targetID="org.eclipse.debug.ui.BreakpointView"	886	targetID="org.eclipse.debug.ui.BreakpointView"
Lines 3147-3150 Link Here
3147	</component>	3297	</component>
3148	</extension>	3298	</extension>
3149
3150	</plugin>	3299	</plugin>

Lines 82-88 Link Here

(-)a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/LaunchView.java (-82 / +22 lines)
82	import org.eclipse.debug.ui.contexts.IDebugContextListener;	82	import org.eclipse.debug.ui.contexts.IDebugContextListener;
83	import org.eclipse.debug.ui.contexts.IDebugContextProvider;	83	import org.eclipse.debug.ui.contexts.IDebugContextProvider;
84	import org.eclipse.jface.action.ActionContributionItem;
85	import org.eclipse.jface.action.GroupMarker;	84	import org.eclipse.jface.action.GroupMarker;
86	import org.eclipse.jface.action.IAction;	85	import org.eclipse.jface.action.IAction;
		86	import org.eclipse.jface.action.IContributionItem;
87	import org.eclipse.jface.action.IMenuListener;	87	import org.eclipse.jface.action.IMenuListener;
88	import org.eclipse.jface.action.IMenuManager;	88	import org.eclipse.jface.action.IMenuManager;
Lines 142-161 Link Here
142		142
143	public static final String ID_CONTEXT_ACTIVITY_BINDINGS = "contextActivityBindings"; //$NON-NLS-1$	143	public static final String ID_CONTEXT_ACTIVITY_BINDINGS = "contextActivityBindings"; //$NON-NLS-1$
144
145	private static final String TERMINATE = "terminate"; //$NON-NLS-1$
146
147	private static final String DISCONNECT = "disconnect"; //$NON-NLS-1$
148
149	private static final String SUSPEND = "suspend"; //$NON-NLS-1$
150
151	private static final String RESUME = "resume"; //$NON-NLS-1$
152
153	private static final String STEP_RETURN = "step_return"; //$NON-NLS-1$
154
155	private static final String STEP_OVER = "step_over"; //$NON-NLS-1$
156
157	private static final String DROP_TO_FRAME = "drop_to_frame"; //$NON-NLS-1$
158
159	private static final String STEP_INTO = "step_into"; //$NON-NLS-1$
160		144
161	public static final String TERMINATE_AND_REMOVE = "terminate_and_remove"; //$NON-NLS-1$	145	public static final String TERMINATE_AND_REMOVE = "terminate_and_remove"; //$NON-NLS-1$
Lines 537-548 Link Here
537	setAction(FIND_ACTION, new VirtualFindAction((TreeModelViewer) getViewer()));	521	setAction(FIND_ACTION, new VirtualFindAction((TreeModelViewer) getViewer()));
538		522
539	addCapabilityAction(new TerminateCommandAction(), TERMINATE);
540	addCapabilityAction(new DisconnectCommandAction(), DISCONNECT);
541	addCapabilityAction(new SuspendCommandAction(), SUSPEND);
542	addCapabilityAction(new ResumeCommandAction(), RESUME);
543	addCapabilityAction(new StepReturnCommandAction(), STEP_RETURN);
544	addCapabilityAction(new StepOverCommandAction(), STEP_OVER);
545	addCapabilityAction(new StepIntoCommandAction(), STEP_INTO);
546	addCapabilityAction(new DropToFrameCommandAction(), DROP_TO_FRAME);
547	DebugCommandAction action = new TerminateAndRemoveAction();	523	DebugCommandAction action = new TerminateAndRemoveAction();
548	addCapabilityAction(action, TERMINATE_AND_REMOVE);	524	addCapabilityAction(action, TERMINATE_AND_REMOVE);
Lines 993-1035 Link Here
993		969
994	if (fDebugToolbarInView) {	970	if (fDebugToolbarInView) {
995	addDebugToolbarActions(tbm);	971	setDebugToolbarActionsVisible(tbm, true);
996	}	972	}
997	}	973	}
998		974
999	protected void addDebugToolbarActions(IToolBarManager tbm) {	975	protected void setDebugToolbarActionsVisible(IToolBarManager tbm, boolean visible) {
1000	tbm.appendToGroup(IDebugUIConstants.THREAD_GROUP, getAction(RESUME));	976	IContributionItem[] items = tbm.getItems();
1001	tbm.appendToGroup(IDebugUIConstants.THREAD_GROUP, getAction(SUSPEND));	977	for (int i = 0; i < items.length; i++) {
1002	tbm.appendToGroup(IDebugUIConstants.THREAD_GROUP, getAction(TERMINATE));	978	if (ResumeCommandAction.COMMAND_ID.equals(items[i].getId()) \|\|
1003	tbm.appendToGroup(IDebugUIConstants.THREAD_GROUP, getAction(DISCONNECT));	979	SuspendCommandAction.COMMAND_ID.equals(items[i].getId()) \|\|
1004		980	TerminateCommandAction.COMMAND_ID.equals(items[i].getId()) \|\|
1005	tbm.appendToGroup(IDebugUIConstants.STEP_INTO_GROUP, getAction(STEP_INTO));	981	DisconnectCommandAction.COMMAND_ID.equals(items[i].getId()) \|\|
1006	tbm.appendToGroup(IDebugUIConstants.STEP_OVER_GROUP, getAction(STEP_OVER));	982	StepIntoCommandAction.COMMAND_ID.equals(items[i].getId()) \|\|
1007	tbm.appendToGroup(IDebugUIConstants.STEP_RETURN_GROUP, getAction(STEP_RETURN));	983	StepOverCommandAction.COMMAND_ID.equals(items[i].getId()) \|\|
1008		984	StepReturnCommandAction.COMMAND_ID.equals(items[i].getId()) \|\|
1009	tbm.appendToGroup(IDebugUIConstants.EMPTY_STEP_GROUP, getAction(DROP_TO_FRAME));	985	DropToFrameCommandAction.COMMAND_ID.equals(items[i].getId()) \|\|
1010		986	ToggleStepFiltersAction.COMMAND_ID.equals(items[i].getId()) )
1011	tbm.appendToGroup(IDebugUIConstants.RENDER_GROUP, getAction(TOGGLE_STEP_FILTERS));	987	{
		988	items[i].setVisible(visible);
		989	}
		990	}
1012	}	991	}
1013		992
1014	/**
1015	* Removes the toolbar actions contributed by this view from the toolbar
1016	* manager.
1017	* @param tbm
1018	*/
1019	protected void removeDebugToolbarActions(IToolBarManager tbm) {
1020	tbm.remove(new ActionContributionItem(getAction(RESUME)));
1021	tbm.remove(new ActionContributionItem(getAction(SUSPEND)));
1022	tbm.remove(new ActionContributionItem(getAction(TERMINATE)));
1023	tbm.remove(new ActionContributionItem(getAction(DISCONNECT)));
1024
1025	tbm.remove(new ActionContributionItem(getAction(STEP_INTO)));
1026	tbm.remove(new ActionContributionItem(getAction(STEP_OVER)));
1027	tbm.remove(new ActionContributionItem(getAction(STEP_RETURN)));
1028
1029	tbm.remove(new ActionContributionItem(getAction(DROP_TO_FRAME)));
1030
1031	tbm.remove(new ActionContributionItem(getAction(TOGGLE_STEP_FILTERS)));
1032	}
1033
1034	public boolean isDebugToolbarInView() {	993	public boolean isDebugToolbarInView() {
1035	return fDebugToolbarInView;	994	return fDebugToolbarInView;
Lines 1059-1070 Link Here
1059	IToolBarManager tbm = getViewSite().getActionBars().getToolBarManager();	1018	IToolBarManager tbm = getViewSite().getActionBars().getToolBarManager();
1060	if (show) {	1019	if (show) {
1061	addDebugToolbarActions(tbm);	1020	setDebugToolbarActionsVisible(tbm, true);
1062	} else {	1021	} else {
1063	removeDebugToolbarActions(tbm);	1022	setDebugToolbarActionsVisible(tbm, false);
1064	}	1023	}
1065	getViewSite().getActionBars().updateActionBars();
1066		1024
1067	// Update system property used by contributed actions.	1025	// Update system property used by contributed actions.
1068	System.setProperty(IDebugUIConstants.DEBUG_VIEW_TOOBAR_VISIBLE, Boolean.toString(show));	1026	System.setProperty(IDebugUIConstants.DEBUG_VIEW_TOOBAR_VISIBLE, Boolean.toString(show));
		1027	getViewSite().getActionBars().updateActionBars();
1069	}	1028	}
1070		1029
Lines 1107-1118 Link Here
1107	properties.dispose();	1066	properties.dispose();
1108		1067
1109	disposeCommandAction(TERMINATE);
1110	disposeCommandAction(DISCONNECT);
1111	disposeCommandAction(SUSPEND);
1112	disposeCommandAction(RESUME);
1113	disposeCommandAction(STEP_RETURN);
1114	disposeCommandAction(STEP_OVER);
1115	disposeCommandAction(STEP_INTO);
1116	disposeCommandAction(DROP_TO_FRAME);
1117	disposeCommandAction(TERMINATE_AND_REMOVE);	1068	disposeCommandAction(TERMINATE_AND_REMOVE);
1118	disposeCommandAction(TERMINATE_AND_RELAUNCH);	1069	disposeCommandAction(TERMINATE_AND_RELAUNCH);
Lines 1240-1257 Link Here
1240	menu.appendToGroup(IDebugUIConstants.LAUNCH_GROUP, getAction(TERMINATE_ALL));	1191	menu.appendToGroup(IDebugUIConstants.LAUNCH_GROUP, getAction(TERMINATE_ALL));
1241		1192
1242	menu.appendToGroup(IDebugUIConstants.THREAD_GROUP, getAction(RESUME));
1243	menu.appendToGroup(IDebugUIConstants.THREAD_GROUP, getAction(SUSPEND));
1244	menu.appendToGroup(IDebugUIConstants.THREAD_GROUP, getAction(TERMINATE));
1245	menu.appendToGroup(IDebugUIConstants.THREAD_GROUP, getAction(TERMINATE_AND_RELAUNCH));
1246	if (element instanceof IAdaptable && ((IAdaptable)element).getAdapter(IRestartHandler.class) != null) {	1193	if (element instanceof IAdaptable && ((IAdaptable)element).getAdapter(IRestartHandler.class) != null) {
1247	menu.appendToGroup(IDebugUIConstants.THREAD_GROUP, getAction(RESTART));	1194	menu.appendToGroup(IDebugUIConstants.THREAD_GROUP, getAction(RESTART));
1248	}	1195	}
1249	menu.appendToGroup(IDebugUIConstants.THREAD_GROUP, getAction(DISCONNECT));
1250
1251	menu.appendToGroup(IDebugUIConstants.STEP_INTO_GROUP, getAction(STEP_INTO));
1252	menu.appendToGroup(IDebugUIConstants.STEP_OVER_GROUP, getAction(STEP_OVER));
1253	menu.appendToGroup(IDebugUIConstants.STEP_RETURN_GROUP, getAction(STEP_RETURN));
1254
1255	menu.appendToGroup(IDebugUIConstants.EMPTY_STEP_GROUP, getAction(DROP_TO_FRAME));
1256		1196
1257	menu.appendToGroup(IDebugUIConstants.RENDER_GROUP, getAction(TOGGLE_STEP_FILTERS));	1197	menu.appendToGroup(IDebugUIConstants.RENDER_GROUP, getAction(TOGGLE_STEP_FILTERS));