From b877d8586594bddccb098bfb4fd6f6691fff766a Mon Sep 17 00:00:00 2001 From: Alena Laskavaia Date: Tue, 5 Aug 2014 15:47:53 -0400 Subject: [PATCH] LaunchBar - fixing default label provider for configs * fixing default label provider for config selector, if no contribution will default to launch config based image/name Change-Id: I978f4071a2e5f7b25d0a1d345c676fdb7e43b263 Signed-off-by: Alena Laskavaia Reviewed-on: https://git.eclipse.org/r/31056 --- .../launchbar/ui/internal/controls/ConfigSelector.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/launch/org.eclipse.cdt.launchbar.ui/src/org/eclipse/cdt/launchbar/ui/internal/controls/ConfigSelector.java b/launch/org.eclipse.cdt.launchbar.ui/src/org/eclipse/cdt/launchbar/ui/internal/controls/ConfigSelector.java index 5969d37edb2..e1f2193c52f 100644 --- a/launch/org.eclipse.cdt.launchbar.ui/src/org/eclipse/cdt/launchbar/ui/internal/controls/ConfigSelector.java +++ b/launch/org.eclipse.cdt.launchbar.ui/src/org/eclipse/cdt/launchbar/ui/internal/controls/ConfigSelector.java @@ -16,6 +16,7 @@ import org.eclipse.cdt.launchbar.core.ILaunchBarManager; import org.eclipse.cdt.launchbar.core.ILaunchDescriptor; import org.eclipse.cdt.launchbar.core.ILaunchTarget; import org.eclipse.cdt.launchbar.ui.internal.Activator; +import org.eclipse.cdt.launchbar.ui.internal.DefaultDescriptorLabelProvider; import org.eclipse.cdt.launchbar.ui.internal.LaunchBarUIManager; import org.eclipse.cdt.launchbar.ui.internal.dialogs.LaunchConfigurationEditDialog; import org.eclipse.cdt.launchbar.ui.internal.dialogs.NewLaunchConfigWizard; @@ -60,6 +61,7 @@ import org.eclipse.ui.PlatformUI; public class ConfigSelector extends CSelector { private LaunchBarUIManager uiManager; + private DefaultDescriptorLabelProvider defaultProvider; private static final String[] noConfigs = new String[] { "No Launch Configurations" }; @@ -67,6 +69,7 @@ public class ConfigSelector extends CSelector { super(parent, style); setToolTipText("Launch configuration"); + defaultProvider = new DefaultDescriptorLabelProvider(); setContentProvider(new IStructuredContentProvider() { @Override @@ -98,7 +101,7 @@ public class ConfigSelector extends CSelector { return labelProvider.getImage(element); } } - return super.getImage(element); + return defaultProvider.getImage(element); } @Override public String getText(Object element) { @@ -110,10 +113,8 @@ public class ConfigSelector extends CSelector { if (labelProvider != null) { return labelProvider.getText(element); } - // Default - return configDesc.getName(); } - return super.getText(element); + return defaultProvider.getText(element); } });