mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-23 14:42:11 +02:00
Code Issues Wiki Activity

LaunchBar - fixing default label provider for configs

Browse source 
* 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 <elaskavaia.cdt@gmail.com>
Reviewed-on: https://git.eclipse.org/r/31056
This commit is contained in:
Alena Laskavaia 2014-08-05 15:47:53 -04:00 • committed by Elena Laskavaia
parent 9d6f5db024
commit b877d85865
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
launch/org.eclipse.cdt.launchbar.ui/src/org/eclipse/cdt/launchbar/ui/internal/controls/ConfigSelector.java
View file

@ -16,6 +16,7 @@ import org.eclipse.cdt.launchbar.core.ILaunchBarManager;
import org.eclipse.cdt.launchbar.core.ILaunchDescriptor; import org.eclipse.cdt.launchbar.core.ILaunchDescriptor;
import org.eclipse.cdt.launchbar.core.ILaunchTarget; import org.eclipse.cdt.launchbar.core.ILaunchTarget;
import org.eclipse.cdt.launchbar.ui.internal.Activator; 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.LaunchBarUIManager;
import org.eclipse.cdt.launchbar.ui.internal.dialogs.LaunchConfigurationEditDialog; import org.eclipse.cdt.launchbar.ui.internal.dialogs.LaunchConfigurationEditDialog;
import org.eclipse.cdt.launchbar.ui.internal.dialogs.NewLaunchConfigWizard; import org.eclipse.cdt.launchbar.ui.internal.dialogs.NewLaunchConfigWizard;
@ -60,6 +61,7 @@ import org.eclipse.ui.PlatformUI;
public class ConfigSelector extends CSelector { public class ConfigSelector extends CSelector {
private LaunchBarUIManager uiManager; private LaunchBarUIManager uiManager;
private DefaultDescriptorLabelProvider defaultProvider;
private static final String[] noConfigs = new String[] { "No Launch Configurations" }; private static final String[] noConfigs = new String[] { "No Launch Configurations" };
@ -67,6 +69,7 @@ public class ConfigSelector extends CSelector {
super(parent, style); super(parent, style);
setToolTipText("Launch configuration"); setToolTipText("Launch configuration");
defaultProvider = new DefaultDescriptorLabelProvider();
setContentProvider(new IStructuredContentProvider() { setContentProvider(new IStructuredContentProvider() {
@Override @Override
@ -98,7 +101,7 @@ public class ConfigSelector extends CSelector {
return labelProvider.getImage(element); return labelProvider.getImage(element);
} }
} }
return super.getImage(element); return defaultProvider.getImage(element);
} }
@Override @Override
public String getText(Object element) { public String getText(Object element) {
@ -110,10 +113,8 @@ public class ConfigSelector extends CSelector {
if (labelProvider != null) { if (labelProvider != null) {
return labelProvider.getText(element); return labelProvider.getText(element);
} }
// Default
return configDesc.getName();
} }
return super.getText(element); return defaultProvider.getText(element);
} }
}); });