From 51f7d9c82920241a308e270a1c8795d1acc393fd Mon Sep 17 00:00:00 2001 From: Alena Laskavaia Date: Tue, 12 Aug 2014 11:52:42 -0400 Subject: [PATCH] Launch Bar - label provider for config selector If provider does not return image or text, use default provider Change-Id: I20bca6e5ef577f4e227d5e567820ba8d004cb85a Signed-off-by: Alena Laskavaia Reviewed-on: https://git.eclipse.org/r/31447 Tested-by: Hudson CI --- .../launchbar/ui/internal/controls/ConfigSelector.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 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 bbb320269c2..9181202404f 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 @@ -110,7 +110,9 @@ public class ConfigSelector extends CSelector { ILaunchDescriptor configDesc = (ILaunchDescriptor)element; ILabelProvider labelProvider = uiManager.getLabelProvider(configDesc); if (labelProvider != null) { - return labelProvider.getImage(element); + Image img = labelProvider.getImage(element); + if (img != null) + return img; } } return defaultProvider.getImage(element); @@ -123,7 +125,9 @@ public class ConfigSelector extends CSelector { ILaunchDescriptor configDesc = (ILaunchDescriptor)element; ILabelProvider labelProvider = uiManager.getLabelProvider(configDesc); if (labelProvider != null) { - return labelProvider.getText(element); + String text = labelProvider.getText(element); + if (text != null) + return text; } } return defaultProvider.getText(element);