Bug 258767 - (comment #63 - Simplified Debug view menu option and made

top-level Debug toolbar default)

5 files changed, 53 insertions, 202 deletions

diff --git a/org.eclipse.debug.ui/plugin.xml b/org.eclipse.debug.ui/plugin.xml
index 4863248cc..3a2ec489e 100644
--- a/org.eclipse.debug.ui/plugin.xml
+++ b/org.eclipse.debug.ui/plugin.xml
@@ -224,6 +224,7 @@
                helpContextId="skip_all_breakpoints_action_context"
                class="org.eclipse.debug.internal.ui.actions.breakpoints.SkipAllBreakpointsAction"
                menubarPath="org.eclipse.ui.run/breakpointGroup"
+               toolbarPath="org.eclipse.debug.ui.main.toolbar/breakpointGroup"
                style="toggle"
                id="org.eclipse.debug.ui.actions.SkipAllBreakpoints">
          </action>
@@ -302,6 +303,7 @@
                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>
@@ -324,7 +326,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 +337,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,96 +349,8 @@
                icon="$nl$/icons/full/elcl16/stepinto_co.gif"
                helpContextId="step_into_action_context"
                label="%StepIntoAction.label"
-               menubarPath="org.eclipse.ui.run/stepIntoGroup">
-         </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">
-         </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">
-         </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">
-         </action>
-      </actionSet>
-      <actionSet
-            label="%DebugToolbarActionSet.label"
-            visible="false"
-            id="org.eclipse.debug.ui.debugToolbarActionSet">
-         <action
-               id="org.eclipse.debug.ui.actions.toolbar.ToggleStepFilters"
-               hoverIcon="$nl$/icons/full/elcl16/stepbystep_co.gif"
-               class="org.eclipse.debug.internal.ui.commands.actions.ToggleStepFiltersCommandActionDelegate"
-               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"
-               style="toggle"
-               state="false"
-               toolbarPath="org.eclipse.debug.ui.main.toolbar/renderGroup">
-         </action>
-         <action
-               id="org.eclipse.debug.ui.actions.toolbar.DropToFrame"
-               hoverIcon="$nl$/icons/full/elcl16/drop_to_frame.gif"
-               class="org.eclipse.debug.internal.ui.commands.actions.DropToFrameCommandActionDelegate"
-               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.toolbar.StepReturn"
-               hoverIcon="$nl$/icons/full/elcl16/stepreturn_co.gif"
-               class="org.eclipse.debug.internal.ui.commands.actions.StepReturnCommandActionDelegate"
-               disabledIcon="$nl$/icons/full/dlcl16/stepreturn_co.gif"
-               icon="$nl$/icons/full/elcl16/stepreturn_co.gif"
-               helpContextId="step_return_action_context"
-               label="%StepReturnAction.label"
-               toolbarPath="org.eclipse.debug.ui.main.toolbar/stepReturnGroup">
-         </action>
-         <action
-               id="org.eclipse.debug.ui.actions.toolbar.StepOver"
-               hoverIcon="$nl$/icons/full/elcl16/stepover_co.gif"
-               class="org.eclipse.debug.internal.ui.commands.actions.StepOverCommandActionDelegate"
-               disabledIcon="$nl$/icons/full/dlcl16/stepover_co.gif"
-               icon="$nl$/icons/full/elcl16/stepover_co.gif"
-               helpContextId="step_over_action_context"
-               label="%StepOverAction.label"
-               toolbarPath="org.eclipse.debug.ui.main.toolbar/stepOverGroup">
-         </action>
-         <action
-               id="org.eclipse.debug.ui.actions.toolbar.StepInto"
-               hoverIcon="$nl$/icons/full/elcl16/stepinto_co.gif"
-               class="org.eclipse.debug.internal.ui.commands.actions.StepIntoCommandActionDelegate"
-               disabledIcon="$nl$/icons/full/dlcl16/stepinto_co.gif"
-               icon="$nl$/icons/full/elcl16/stepinto_co.gif"
-               helpContextId="step_into_action_context"
-               label="%StepIntoAction.label"
-               toolbarPath="org.eclipse.debug.ui.main.toolbar/stepIntoGroup">
+               menubarPath="org.eclipse.ui.run/stepIntoGroup"
+               toolbarPath="org.eclipse.debug.ui.main.toolbar/stepIntoGroup">               
          </action>
          <action
                id="org.eclipse.debug.ui.actions.toolbar.Disconnect"
@@ -444,36 +360,43 @@
                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.toolbar.Terminate"
+               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.toolbar.Suspend"
+               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.toolbar.Resume"
+               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>
       </actionSet>
@@ -740,6 +663,10 @@
              </separator>
              <separator
                    name="renderGroup"
+                   visible="false">
+             </separator>
+             <separator
+                   name="breakpointGroup"
                    visible="true">
              </separator>
           </toolbar>
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/DebugToolBarAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/DebugToolBarAction.java
index 5def549c7..d47929d13 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/DebugToolBarAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/DebugToolBarAction.java
@@ -12,9 +12,7 @@ package org.eclipse.debug.internal.ui.views.launch;
 
 import org.eclipse.debug.internal.core.IInternalDebugCoreConstants;
 import org.eclipse.debug.internal.ui.IDebugHelpContextIds;
-import org.eclipse.debug.ui.IDebugUIConstants;
 import org.eclipse.jface.action.Action;
-import org.eclipse.ui.IWorkbenchPage;
 import org.eclipse.ui.PlatformUI;
 
 /**
@@ -25,68 +23,31 @@ import org.eclipse.ui.PlatformUI;
 class DebugToolBarAction extends Action {
 
 	private final LaunchView fLaunchView;
-	private final boolean fDebugViewToolbar;
-    private final boolean fDebugToolbarActionSet;
-
+	
 	/**
 	 * Creates a new action to set the debug view mode.
 	 * 
 	 * @param view Reference to the debug view.
-	 * @param debugViewToolbar Causes action to show toolbar in Debug view.
-	 * @param debugActionSet Causes action to show toolbar in top level Window 
-	 * toolbar..
 	 */
-	public DebugToolBarAction(LaunchView view, boolean debugViewToolbar, boolean debugActionSet) {
-		super(IInternalDebugCoreConstants.EMPTY_STRING, AS_RADIO_BUTTON);
+	public DebugToolBarAction(LaunchView view) {
+		super(IInternalDebugCoreConstants.EMPTY_STRING, AS_CHECK_BOX);
 		fLaunchView = view;
-		fDebugViewToolbar = debugViewToolbar;
-		fDebugToolbarActionSet = debugActionSet;
 		
-		if (fDebugViewToolbar && fDebugToolbarActionSet) {
-            setText(LaunchViewMessages.DebugToolBarAction_Both_label);
-            setToolTipText(LaunchViewMessages.DebugToolBarAction_Both_tooltip);  
-            setDescription(LaunchViewMessages.DebugToolBarAction_Both_description);  
-            PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IDebugHelpContextIds.DEBUG_TOOLBAR_BOTH_ACTION);
-		} else if (fDebugViewToolbar) {
-            setText(LaunchViewMessages.DebugToolBarAction_View_label);
-            setToolTipText(LaunchViewMessages.DebugToolBarAction_View_tooltip);  
-            setDescription(LaunchViewMessages.DebugToolBarAction_View_description);  
-			PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IDebugHelpContextIds.DEBUG_TOOLBAR_VIEW_ACTION);
-		} else if (fDebugToolbarActionSet) {
-            setText(LaunchViewMessages.DebugToolBarAction_Window_label);
-            setToolTipText(LaunchViewMessages.DebugToolBarAction_Window_tooltip);  
-            setDescription(LaunchViewMessages.DebugToolBarAction_Window_description);  
-			PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IDebugHelpContextIds.DEBUG_TOOLBAR_WINDOW_ACTION);
-		} 	
+        setText(LaunchViewMessages.DebugToolBarAction_View_label);
+        setToolTipText(LaunchViewMessages.DebugToolBarAction_View_tooltip);  
+        setDescription(LaunchViewMessages.DebugToolBarAction_View_description);  
+		PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IDebugHelpContextIds.DEBUG_TOOLBAR_VIEW_ACTION);
 	}
 
+	public void setShowingDebugToolbar(boolean showingToolbar) {
+	    setChecked(showingToolbar);
+	}
+	
 	/* (non-Javadoc)
 	 * @see org.eclipse.jface.action.IAction#run()
 	 */
 	public void run() {
-		fLaunchView.setDebugToolbarInView(fDebugViewToolbar); 
-
-		IWorkbenchPage page = fLaunchView.getSite().getPage(); 
-        
-		if (fDebugToolbarActionSet) {
-            page.showActionSet(IDebugUIConstants.DEBUG_TOOLBAR_ACTION_SET);
-		} else {
-            page.hideActionSet(IDebugUIConstants.DEBUG_TOOLBAR_ACTION_SET);
-		}
+		fLaunchView.setDebugToolbarInView(isChecked()); 
 	}	
-	
-	/**
-     * @return Returns whether debug toolbar is shown in view by this action.
-	 */
-	public boolean getDebugViewToolbar() {
-	    return fDebugViewToolbar;
-	}
-
-    /**
-     * @return Returns whether debug toolbar action set is shown by this action.
-     */
-    public boolean getDebugToolbarActionSet() {
-        return fDebugToolbarActionSet;
-    }
 }
 
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 d017ca317..b25bb55c7 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
@@ -204,8 +204,9 @@ public class LaunchView extends AbstractDebugView
     private DebugViewModeAction[] fDebugViewModeActions;
 
     /**
+     * Action which shows or hides the Debug view toolbar.
      */
-    private DebugToolBarAction[] fDebugToolBarActions;
+    private DebugToolBarAction fDebugToolBarAction;
     
     /**
      * Action that controls the breadcrumb drop-down auto-expand behavior.
@@ -254,7 +255,7 @@ public class LaunchView extends AbstractDebugView
     
     private boolean fDebugToolbarInView = true;
     
-    private Set fDebugToolbarHiddenPerspectives = new TreeSet();
+    private Set fDebugToolbarPerspectives = new TreeSet();
     
 	/**
 	 * Page-book page for the breadcrumb viewer.  This page is activated in 
@@ -725,8 +726,8 @@ public class LaunchView extends AbstractDebugView
         fDebugViewModeActions[1] = new DebugViewModeAction(this, IDebugPreferenceConstants.DEBUG_VIEW_MODE_FULL, parent);
         fDebugViewModeActions[2] = new DebugViewModeAction(this, IDebugPreferenceConstants.DEBUG_VIEW_MODE_COMPACT, parent);
         fBreadcrumbDropDownAutoExpandAction = new BreadcrumbDropDownAutoExpandAction(this);
-        
         viewMenu.add(new Separator());
+        
         final MenuManager modeSubmenu = new MenuManager(LaunchViewMessages.LaunchView_ViewModeMenu_label);
         modeSubmenu.setRemoveAllWhenShown(true);
         modeSubmenu.add(fDebugViewModeActions[0]);
@@ -757,26 +758,8 @@ public class LaunchView extends AbstractDebugView
         IActionBars actionBars = getViewSite().getActionBars();
         IMenuManager viewMenu = actionBars.getMenuManager();
         
-        fDebugToolBarActions = new DebugToolBarAction[3];
-        fDebugToolBarActions[0] = new DebugToolBarAction(this, true, false);
-        fDebugToolBarActions[1] = new DebugToolBarAction(this, false, true);
-        fDebugToolBarActions[2] = new DebugToolBarAction(this, true, true);
-        
-        final MenuManager modeSubmenu = new MenuManager(LaunchViewMessages.LaunchView_ToolBarMenu_label);
-        modeSubmenu.setRemoveAllWhenShown(true);
-        modeSubmenu.add(fDebugToolBarActions[0]);
-        modeSubmenu.add(fDebugToolBarActions[1]);
-        modeSubmenu.add(fDebugToolBarActions[2]);
-        viewMenu.add(modeSubmenu);
-        
-        modeSubmenu.addMenuListener(new IMenuListener() {
-            public void menuAboutToShow(IMenuManager manager) {
-                modeSubmenu.add(fDebugToolBarActions[0]);
-                modeSubmenu.add(fDebugToolBarActions[1]);
-                modeSubmenu.add(fDebugToolBarActions[2]);
-           }
-        });
-        
+        fDebugToolBarAction = new DebugToolBarAction(this);
+        viewMenu.add(fDebugToolBarAction);
         updateCheckedDebugToolBarAction();
     }
 
@@ -923,10 +906,10 @@ public class LaunchView extends AbstractDebugView
         String preference = DebugUIPlugin.getDefault().getPreferenceStore().getString(
             IDebugPreferenceConstants.DEBUG_VIEW_TOOLBAR_HIDDEN_PERSPECTIVES);
         if (preference != null) {
-            fDebugToolbarHiddenPerspectives = ViewContextService.parseList(preference);
+            fDebugToolbarPerspectives = ViewContextService.parseList(preference);
         }
         IPerspectiveDescriptor perspective = getSite().getPage().getPerspective();
-        fDebugToolbarInView = perspective == null || !fDebugToolbarHiddenPerspectives.contains(perspective.getId());
+        fDebugToolbarInView = perspective == null || !fDebugToolbarPerspectives.contains(perspective.getId());
 	}
 	
 	/* (non-Javadoc)
@@ -977,7 +960,7 @@ public class LaunchView extends AbstractDebugView
         }
         
         StringBuffer buffer= new StringBuffer();
-        for (Iterator itr = fDebugToolbarHiddenPerspectives.iterator(); itr.hasNext();) {
+        for (Iterator itr = fDebugToolbarPerspectives.iterator(); itr.hasNext();) {
             buffer.append(itr.next()).append(',');          
         } 
         getPreferenceStore().setValue(IDebugPreferenceConstants.DEBUG_VIEW_TOOLBAR_HIDDEN_PERSPECTIVES, buffer.toString());
@@ -1049,8 +1032,8 @@ public class LaunchView extends AbstractDebugView
        return fDebugToolbarInView;
    }
    
-   public boolean isDebugToolbarInViewInPerspective(IPerspectiveDescriptor perspective) {
-       return perspective == null || !fDebugToolbarHiddenPerspectives.contains(perspective.getId());
+   public boolean isDebugToolbarShownInPerspective(IPerspectiveDescriptor perspective) {
+       return perspective == null || fDebugToolbarPerspectives.contains(perspective.getId());
    }
    
    public void setDebugToolbarInView(boolean show) {
@@ -1063,12 +1046,12 @@ public class LaunchView extends AbstractDebugView
        IPerspectiveDescriptor perspective = getSite().getPage().getPerspective();
        if (perspective != null) {
            if (show) {
-               fDebugToolbarHiddenPerspectives.remove(perspective.getId());
+               fDebugToolbarPerspectives.add(perspective.getId());
            } else {
-               fDebugToolbarHiddenPerspectives.add(perspective.getId());
+               fDebugToolbarPerspectives.remove(perspective.getId());
            }
        }
-       
+
        // Update the toolbar manager.
        IToolBarManager tbm = getViewSite().getActionBars().getToolBarManager();
        if (show) {
@@ -1167,7 +1150,7 @@ public class LaunchView extends AbstractDebugView
 	public void perspectiveActivated(IWorkbenchPage page, IPerspectiveDescriptor perspective) {
 		setActive(page.findView(getSite().getId()) != null);
 		updateObjects();
-		setDebugToolbarInView( isDebugToolbarInViewInPerspective(getSite().getPage().getPerspective()) );
+		setDebugToolbarInView( isDebugToolbarShownInPerspective(getSite().getPage().getPerspective()) );
         updateCheckedDebugToolBarAction();
 	}
 
@@ -1283,13 +1266,7 @@ public class LaunchView extends AbstractDebugView
 	}
 	
 	private void updateCheckedDebugToolBarAction() {
-	    boolean debugToolBarInView = isDebugToolbarInView();
-        boolean toolbarActionSetActive = fContextService.getActiveContextIds().contains(IDebugUIConstants.DEBUG_TOOLBAR_ACTION_SET); 
-        for (int i = 0; i < fDebugToolBarActions.length; i++) {
-            fDebugToolBarActions[i].setChecked(
-                fDebugToolBarActions[i].getDebugViewToolbar() == debugToolBarInView &&
-                fDebugToolBarActions[i].getDebugToolbarActionSet() == toolbarActionSetActive);
-        }
+	    fDebugToolBarAction.setChecked(isDebugToolbarInView());
 	}
 	
 	/**
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/LaunchViewMessages.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/LaunchViewMessages.java
index 11bfe0451..f0a4f2d8b 100755
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/LaunchViewMessages.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/LaunchViewMessages.java
@@ -32,16 +32,9 @@ public class LaunchViewMessages extends NLS {
     public static String BreadcrumbDropDownAutoExpandAction_tooltip;
     public static String BreadcrumbDropDownAutoExpandAction_description;
 
-    public static String LaunchView_ToolBarMenu_label;
     public static String DebugToolBarAction_View_label;
     public static String DebugToolBarAction_View_tooltip;
     public static String DebugToolBarAction_View_description;
-    public static String DebugToolBarAction_Window_label;
-    public static String DebugToolBarAction_Window_tooltip;
-    public static String DebugToolBarAction_Window_description;
-    public static String DebugToolBarAction_Both_label;
-    public static String DebugToolBarAction_Both_tooltip;
-    public static String DebugToolBarAction_Both_description;
 
 	static {
 		// load message values from bundle file
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/LaunchViewMessages.properties b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/LaunchViewMessages.properties
index 799bb32c2..dcef0d7a6 100755
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/LaunchViewMessages.properties
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/LaunchViewMessages.properties
@@ -26,14 +26,7 @@ BreadcrumbDropDownAutoExpandAction_label=Auto-&Expand Breadcrumb
 BreadcrumbDropDownAutoExpandAction_tooltip=Auto-Expand Breadcrumb
 BreadcrumbDropDownAutoExpandAction_description=In the breadcrumb drop-down, automatically expand elements to reveal full selection in view.
 
-LaunchView_ToolBarMenu_label=&Debug Toolbar
-DebugToolBarAction_View_label=&Debug View
-DebugToolBarAction_View_tooltip=Debug View
-DebugToolBarAction_View_description=Show debug actions in Debug view toolbar
-DebugToolBarAction_Window_label=&Main Toolbar
-DebugToolBarAction_Window_tooltip=Main Toolbar
-DebugToolBarAction_Window_description=Show debug action in the Window's main toolbar
-DebugToolBarAction_Both_label=&Both
-DebugToolBarAction_Both_tooltip=Both
-DebugToolBarAction_Both_description=Show debug actions in both toolbars
+DebugToolBarAction_View_label=&Debug Toolbar in View
+DebugToolBarAction_View_tooltip=Debug Toolbar in View
+DebugToolBarAction_View_description=Show run control actions in Debug view toolbar