From 377f0cc81501b2098cd8105089c641c1dcb60f32 Mon Sep 17 00:00:00 2001 From: Alvaro Sanchez-Leon Date: Fri, 9 Dec 2016 09:49:46 -0500 Subject: [PATCH] Bug 508446 - [memory] Preferences dialog empty tree on the left This apply to the Floating Point and Traditional Renderings, When calling these preferences from the drop down inside the memory view, the associated preferences dialog comes up with the left side empty, this left side shall reflect the preference page three path. The call to the preference dialog has been replaced to use PreferenceUtil.createPreferenceDialogOn which takes care of this. Change-Id: I89d6b1289a7eac5ffcca54a1ca6d8b3c3ed831df --- .../FPRenderingPreferenceAction.java | 16 ++-------------- .../TraditionalRenderingPreferenceAction.java | 16 ++-------------- 2 files changed, 4 insertions(+), 28 deletions(-) diff --git a/memory/org.eclipse.cdt.debug.ui.memory.floatingpoint/src/org/eclipse/cdt/debug/ui/memory/floatingpoint/FPRenderingPreferenceAction.java b/memory/org.eclipse.cdt.debug.ui.memory.floatingpoint/src/org/eclipse/cdt/debug/ui/memory/floatingpoint/FPRenderingPreferenceAction.java index ac158b1e6d9..e7fe2cb69e0 100644 --- a/memory/org.eclipse.cdt.debug.ui.memory.floatingpoint/src/org/eclipse/cdt/debug/ui/memory/floatingpoint/FPRenderingPreferenceAction.java +++ b/memory/org.eclipse.cdt.debug.ui.memory.floatingpoint/src/org/eclipse/cdt/debug/ui/memory/floatingpoint/FPRenderingPreferenceAction.java @@ -13,16 +13,12 @@ package org.eclipse.cdt.debug.ui.memory.floatingpoint; import org.eclipse.jface.action.IAction; -import org.eclipse.jface.preference.IPreferenceNode; import org.eclipse.jface.preference.IPreferencePage; -import org.eclipse.jface.preference.PreferenceDialog; -import org.eclipse.jface.preference.PreferenceManager; -import org.eclipse.jface.preference.PreferenceNode; -import org.eclipse.jface.window.Window; import org.eclipse.swt.custom.BusyIndicator; import org.eclipse.ui.IViewActionDelegate; import org.eclipse.ui.IViewPart; import org.eclipse.ui.actions.ActionDelegate; +import org.eclipse.ui.dialogs.PreferencesUtil; public class FPRenderingPreferenceAction extends ActionDelegate implements IViewActionDelegate { @@ -51,20 +47,12 @@ public class FPRenderingPreferenceAction extends ActionDelegate implements IView protected void showPreferencePage(String id, IPreferencePage page) { - final IPreferenceNode targetNode = new PreferenceNode(id, page); - - PreferenceManager manager = new PreferenceManager(); - manager.addToRoot(targetNode); - final PreferenceDialog dialog = new PreferenceDialog(FPRenderingPlugin.getShell(), manager); - final boolean[] result = new boolean[] { false }; BusyIndicator.showWhile(FPRenderingPlugin.getStandardDisplay(), new Runnable() { @Override public void run() { - dialog.create(); - dialog.setMessage(targetNode.getLabelText()); - result[0] = (dialog.open() == Window.OK); + PreferencesUtil.createPreferenceDialogOn(FPRenderingPlugin.getShell(), id, new String[] { id }, null).open(); } }); } diff --git a/memory/org.eclipse.cdt.debug.ui.memory.traditional/src/org/eclipse/cdt/debug/ui/memory/traditional/TraditionalRenderingPreferenceAction.java b/memory/org.eclipse.cdt.debug.ui.memory.traditional/src/org/eclipse/cdt/debug/ui/memory/traditional/TraditionalRenderingPreferenceAction.java index 7d1509307e8..b150537d384 100644 --- a/memory/org.eclipse.cdt.debug.ui.memory.traditional/src/org/eclipse/cdt/debug/ui/memory/traditional/TraditionalRenderingPreferenceAction.java +++ b/memory/org.eclipse.cdt.debug.ui.memory.traditional/src/org/eclipse/cdt/debug/ui/memory/traditional/TraditionalRenderingPreferenceAction.java @@ -13,16 +13,12 @@ package org.eclipse.cdt.debug.ui.memory.traditional; import org.eclipse.jface.action.IAction; -import org.eclipse.jface.preference.IPreferenceNode; import org.eclipse.jface.preference.IPreferencePage; -import org.eclipse.jface.preference.PreferenceDialog; -import org.eclipse.jface.preference.PreferenceManager; -import org.eclipse.jface.preference.PreferenceNode; -import org.eclipse.jface.window.Window; import org.eclipse.swt.custom.BusyIndicator; import org.eclipse.ui.IViewActionDelegate; import org.eclipse.ui.IViewPart; import org.eclipse.ui.actions.ActionDelegate; +import org.eclipse.ui.dialogs.PreferencesUtil; public class TraditionalRenderingPreferenceAction extends ActionDelegate implements IViewActionDelegate { @@ -42,17 +38,9 @@ public class TraditionalRenderingPreferenceAction extends ActionDelegate impleme } protected void showPreferencePage(String id, IPreferencePage page) { - final IPreferenceNode targetNode = new PreferenceNode(id, page); - - PreferenceManager manager = new PreferenceManager(); - manager.addToRoot(targetNode); - final PreferenceDialog dialog = new PreferenceDialog(TraditionalRenderingPlugin.getShell(), manager); - final boolean [] result = new boolean[] { false }; BusyIndicator.showWhile(TraditionalRenderingPlugin.getStandardDisplay(), new Runnable() { public void run() { - dialog.create(); - dialog.setMessage(targetNode.getLabelText()); - result[0]= (dialog.open() == Window.OK); + PreferencesUtil.createPreferenceDialogOn(TraditionalRenderingPlugin.getShell(), id, new String[] { id }, null).open(); } }); }