1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-23 17:05:26 +02:00

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 <elaskavaia.cdt@gmail.com>
Reviewed-on: https://git.eclipse.org/r/31447
Tested-by: Hudson CI
This commit is contained in:
Alena Laskavaia 2014-08-12 11:52:42 -04:00 committed by Elena Laskavaia
parent c1ca67ed34
commit 51f7d9c829

View file

@ -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);