Bug 9523 - redundant menu entry in variables view

4 files changed, 74 insertions, 68 deletions

diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ActionMessages.properties b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ActionMessages.properties
index bbe829c85..4cc3645a2 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ActionMessages.properties
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ActionMessages.properties
@@ -101,7 +101,8 @@ TerminateAndRemoveActionDelegate.Terminate_and_remove_failed_1=Terminate and rem
 ShowTypesAction.Hide_Type_Names=Hide Type Names

 ShowTypesAction.Show_&Type_Names_1=Show &Type Names

 ShowTypesAction.Show_Type_Names=Show Type Names

-ShowVariableDetailPaneAction.Hide_detail_pane_3=Hide Detail Pane

-ShowVariableDetailPaneAction.Show_Variable_Detail_Pane_1=Show Variable Detail Pane

-ShowVariableDetailPaneAction.Show_detail_pane_2=Show Detail Pane

+

+ShowDetailPaneAction.Hide_detail_pane_3=Hide Detail Pane

+ShowDetailPaneAction.Show_Variable_Detail_Pane_1=Show Detail Pane

+ShowDetailPaneAction.Show_detail_pane_2=Show &Detail Pane

 

diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ShowVariableDetailPaneAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ShowDetailPaneAction.java
index 919e44cc9..95df741cf 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ShowVariableDetailPaneAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ShowDetailPaneAction.java
@@ -1,61 +1,61 @@
-package org.eclipse.debug.internal.ui.actions;

-

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

-

-import org.eclipse.debug.internal.ui.DebugPluginImages;

-import org.eclipse.debug.internal.ui.DebugUIPlugin;

-import org.eclipse.debug.internal.ui.IDebugHelpContextIds;

-import org.eclipse.debug.internal.ui.IInternalDebugUIConstants;

-import org.eclipse.debug.internal.ui.views.VariablesView;

-import org.eclipse.jface.action.Action;

-import org.eclipse.ui.help.WorkbenchHelp;

-

-public class ShowVariableDetailPaneAction extends Action {

-

-	private VariablesView fVariablesView;

-

-	public ShowVariableDetailPaneAction(VariablesView view) {

-		super(ActionMessages.getString("ShowVariableDetailPaneAction.Show_Variable_Detail_Pane_1")); //$NON-NLS-1$

-		setVariablesView(view);

-		setToolTipText(ActionMessages.getString("ShowVariableDetailPaneAction.Show_detail_pane_2")); //$NON-NLS-1$

-		setImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_DETAIL_PANE));

-		setId(DebugUIPlugin.getDefault().getDescriptor().getUniqueIdentifier() + ".ShowVariableDetailPaneAction"); //$NON-NLS-1$

-		WorkbenchHelp.setHelp(this, IDebugHelpContextIds.SHOW_DETAIL_PANE_ACTION);

-	}

-

-	/**

-	 * @see Action#run()

-	 */

-	public void run() {

-		toggleDetailPane(isChecked());

-	}

-

-	/**

-	 * Ask the VariablesView to toggle its detail pane and reset this action's

-	 * tooltip as appropriate.

-	 */

-	private void toggleDetailPane(final boolean on) {

-		getVariablesView().toggleDetailPane(on);

-		setToolTipText(on ? ActionMessages.getString("ShowVariableDetailPaneAction.Hide_detail_pane_3") : ActionMessages.getString("ShowVariableDetailPaneAction.Show_detail_pane_2")); //$NON-NLS-2$ //$NON-NLS-1$

-	}

-

-	/**

-	 * @see Action#setChecked(boolean)

-	 */

-	public void setChecked(boolean value) {

-		super.setChecked(value);

-		toggleDetailPane(value);

-	}

-	

-	protected VariablesView getVariablesView() {

-		return fVariablesView;

-	}

-

-	protected void setVariablesView(VariablesView variablesView) {

-		fVariablesView = variablesView;

-	}

-}

-

+package org.eclipse.debug.internal.ui.actions;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved.
+ */
+
+import org.eclipse.debug.internal.ui.DebugPluginImages;
+import org.eclipse.debug.internal.ui.DebugUIPlugin;
+import org.eclipse.debug.internal.ui.IDebugHelpContextIds;
+import org.eclipse.debug.internal.ui.IInternalDebugUIConstants;
+import org.eclipse.debug.internal.ui.views.VariablesView;
+import org.eclipse.jface.action.Action;
+import org.eclipse.ui.help.WorkbenchHelp;
+
+public class ShowDetailPaneAction extends Action {
+
+	private VariablesView fVariablesView;
+
+	public ShowDetailPaneAction(VariablesView view) {
+		super(ActionMessages.getString("ShowDetailPaneAction.Show_Variable_Detail_Pane_1")); //$NON-NLS-1$
+		setVariablesView(view);
+		setToolTipText(ActionMessages.getString("ShowDetailPaneAction.Show_detail_pane_2")); //$NON-NLS-1$
+		setImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_DETAIL_PANE));
+		setId(DebugUIPlugin.getDefault().getDescriptor().getUniqueIdentifier() + ".ShowDetailPaneAction"); //$NON-NLS-1$
+		WorkbenchHelp.setHelp(this, IDebugHelpContextIds.SHOW_DETAIL_PANE_ACTION);
+	}
+
+	/**
+	 * @see Action#run()
+	 */
+	public void run() {
+		toggleDetailPane(isChecked());
+	}
+
+	/**
+	 * Ask the VariablesView to toggle its detail pane and reset this action's
+	 * tooltip as appropriate.
+	 */
+	private void toggleDetailPane(final boolean on) {
+		getVariablesView().toggleDetailPane(on);
+		setToolTipText(on ? ActionMessages.getString("ShowDetailPaneAction.Hide_detail_pane_3") : ActionMessages.getString("ShowDetailPaneAction.Show_detail_pane_2")); //$NON-NLS-2$ //$NON-NLS-1$
+	}
+
+	/**
+	 * @see Action#setChecked(boolean)
+	 */
+	public void setChecked(boolean value) {
+		super.setChecked(value);
+		toggleDetailPane(value);
+	}
+	
+	protected VariablesView getVariablesView() {
+		return fVariablesView;
+	}
+
+	protected void setVariablesView(VariablesView variablesView) {
+		fVariablesView = variablesView;
+	}
+}
+
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/ExpressionView.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/ExpressionView.java
index 345e3b88f..315d7b9a4 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/ExpressionView.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/ExpressionView.java
@@ -86,6 +86,8 @@ public class ExpressionView extends VariablesView {
 		menu.add(new Separator(IDebugUIConstants.EMPTY_RENDER_GROUP));

 		menu.add(new Separator(IDebugUIConstants.RENDER_GROUP));

 		menu.add(getAction("ShowTypeNames")); //$NON-NLS-1$

+		menu.add(new Separator("TOGGLE_VIEW")); //$NON-NLS-1$

+		menu.add(getAction("ShowDetailPane")); //$NON-NLS-1$

 		menu.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS));

 	}

 	

diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/VariablesView.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/VariablesView.java
index 516fd7957..214ba109d 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/VariablesView.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/VariablesView.java
@@ -26,7 +26,7 @@ import org.eclipse.debug.internal.ui.IDebugPreferenceConstants;
 import org.eclipse.debug.internal.ui.LazyModelPresentation;

 import org.eclipse.debug.internal.ui.actions.ChangeVariableValueAction;

 import org.eclipse.debug.internal.ui.actions.ShowTypesAction;

-import org.eclipse.debug.internal.ui.actions.ShowVariableDetailPaneAction;

+import org.eclipse.debug.internal.ui.actions.ShowDetailPaneAction;

 import org.eclipse.debug.internal.ui.actions.TextViewerAction;

 import org.eclipse.debug.ui.IDebugModelPresentation;

 import org.eclipse.debug.ui.IDebugUIConstants;

@@ -481,7 +481,7 @@ public class VariablesView extends AbstractDebugEventHandlerView implements ISel
 		setAction("ChangeVariableValue", action); //$NON-NLS-1$

 		setAction(DOUBLE_CLICK_ACTION, action);

 		

-		action = new ShowVariableDetailPaneAction(this);

+		action = new ShowDetailPaneAction(this);

 		action.setChecked(false);

 		setAction("ShowDetailPane", action); //$NON-NLS-1$

 	

@@ -539,6 +539,8 @@ public class VariablesView extends AbstractDebugEventHandlerView implements ISel
 		menu.add(new Separator(IDebugUIConstants.EMPTY_RENDER_GROUP));

 		menu.add(new Separator(IDebugUIConstants.RENDER_GROUP));

 		menu.add(getAction("ShowTypeNames")); //$NON-NLS-1$

+		menu.add(new Separator("TOGGLE_VIEW")); //$NON-NLS-1$

+		menu.add(getAction("ShowDetailPane")); //$NON-NLS-1$

 		

 		menu.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS));

 	}

@@ -558,7 +560,8 @@ public class VariablesView extends AbstractDebugEventHandlerView implements ISel
 

 		menu.add(new Separator("FIND")); //$NON-NLS-1$

 		menu.add((IAction)fGlobalActions.get(ITextEditorActionConstants.FIND));

-		

+		menu.add(new Separator("TOGGLE_VIEW")); //$NON-NLS-1$

+		menu.add(getAction("ShowDetailPane")); //$NON-NLS-1$

 		menu.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS));

 	}

 	

@@ -794,7 +797,7 @@ public class VariablesView extends AbstractDebugEventHandlerView implements ISel
 		return fSelectionProvider;

 	}

 	/** 

-	 * The <code>VariablesView</code> listens for selection changes in the <code>LaunchesView</code>

+	 * The <code>VariablesView</code> listens for selection changes in the <code>LaunchView</code>

 	 *

 	 * @see ISelectionListener#selectionChanged(IWorkbenchPart, ISelection)

 	 */