From 46d6c6dca7282f1832a5f9d03d89cdced882ac18 Mon Sep 17 00:00:00 2001 From: David Inglis Date: Thu, 6 Feb 2003 20:37:45 +0000 Subject: [PATCH] use WorkbenchLabelProvider --- launch/org.eclipse.cdt.launch/ChangeLog | 5 +++++ .../cdt/launch/internal/CApplicationLaunchShortcut.java | 4 ++-- .../src/org/eclipse/cdt/launch/ui/CMainTab.java | 6 +++--- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/launch/org.eclipse.cdt.launch/ChangeLog b/launch/org.eclipse.cdt.launch/ChangeLog index bba879d53dc..2b4d1db67ae 100644 --- a/launch/org.eclipse.cdt.launch/ChangeLog +++ b/launch/org.eclipse.cdt.launch/ChangeLog @@ -1,3 +1,8 @@ +2003-02-06 David Inglis + * src/.../launch/internal/CApplicationLaunchShortcut.java + * src/.../launch/ui/CMainTab.java + Change to use WorkbenchLabelProvider + 2003-01-29 David Inglis * src/.../launch/internal/ui/LaunchUIPluging.java (getShell) change so that it will always return a shell. diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/CApplicationLaunchShortcut.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/CApplicationLaunchShortcut.java index 40680e75a5c..e79155e8404 100644 --- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/CApplicationLaunchShortcut.java +++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/CApplicationLaunchShortcut.java @@ -11,7 +11,6 @@ import org.eclipse.cdt.core.model.ICProject; import org.eclipse.cdt.debug.core.CDebugCorePlugin; import org.eclipse.cdt.debug.core.ICDebugConfiguration; import org.eclipse.cdt.debug.ui.CDebugUIPlugin; -import org.eclipse.cdt.internal.ui.CElementLabelProvider; import org.eclipse.cdt.launch.AbstractCLaunchDelegate; import org.eclipse.cdt.launch.ICDTLaunchConfigurationConstants; import org.eclipse.cdt.launch.internal.ui.LaunchUIPlugin; @@ -39,6 +38,7 @@ import org.eclipse.jface.viewers.LabelProvider; import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.IEditorPart; import org.eclipse.ui.dialogs.ElementListSelectionDialog; +import org.eclipse.ui.model.WorkbenchLabelProvider; /** */ @@ -254,7 +254,7 @@ public class CApplicationLaunchShortcut implements ILaunchShortcut { * @return the selected binary or null if none. */ protected IBinary chooseBinary(List binList, String mode) { - ElementListSelectionDialog dialog = new ElementListSelectionDialog(getShell(), new CElementLabelProvider()); + ElementListSelectionDialog dialog = new ElementListSelectionDialog(getShell(), new WorkbenchLabelProvider()); dialog.setElements(binList.toArray()); dialog.setTitle("C ApplicationAction"); //$NON-NLS-1$ if (mode.equals(ILaunchManager.DEBUG_MODE)) { diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CMainTab.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CMainTab.java index 0ab20494c39..cabdf32c564 100644 --- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CMainTab.java +++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CMainTab.java @@ -15,7 +15,6 @@ import org.eclipse.cdt.core.model.IBinary; import org.eclipse.cdt.core.model.IBinaryContainer; import org.eclipse.cdt.core.model.ICElement; import org.eclipse.cdt.core.model.ICProject; -import org.eclipse.cdt.internal.ui.CElementLabelProvider; import org.eclipse.cdt.launch.ICDTLaunchConfigurationConstants; import org.eclipse.cdt.launch.internal.ui.LaunchImages; import org.eclipse.cdt.launch.internal.ui.LaunchUIPlugin; @@ -40,6 +39,7 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Text; import org.eclipse.ui.dialogs.ElementListSelectionDialog; +import org.eclipse.ui.model.WorkbenchLabelProvider; /** * A launch configuration tab that displays and edits project and @@ -197,7 +197,7 @@ public class CMainTab extends CLaunchConfigurationTab { } IBinary[] executables = getBinaryFiles(getCProject()); - ILabelProvider labelProvider = new CElementLabelProvider(); + ILabelProvider labelProvider = new WorkbenchLabelProvider(); ElementListSelectionDialog dialog = new ElementListSelectionDialog(getShell(), labelProvider); dialog.setElements(executables); dialog.setMessage("Choose a &program to run"); @@ -243,7 +243,7 @@ public class CMainTab extends CLaunchConfigurationTab { ICProject[] projects; projects = getCProjects(); - ILabelProvider labelProvider = new CElementLabelProvider(); + ILabelProvider labelProvider = new WorkbenchLabelProvider(); ElementListSelectionDialog dialog = new ElementListSelectionDialog(getShell(), labelProvider); dialog.setTitle("Project Selection"); dialog.setMessage("Choose a &project to constrain the search for a program");