diff options
author | Darin Swanson | 2006-10-20 21:43:06 +0000 |
---|---|---|
committer | Darin Swanson | 2006-10-20 21:43:06 +0000 |
commit | 96e5103abe9606c375ed99f99f1ebf5e5c9de315 (patch) | |
tree | 61ef382c6668ba94ec2ce887480a7abe78aeff59 /org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui | |
parent | 0c618faad0b0bbe6307570a2ffb80023723861ef (diff) | |
download | eclipse.platform.debug-96e5103abe9606c375ed99f99f1ebf5e5c9de315.tar.gz eclipse.platform.debug-96e5103abe9606c375ed99f99f1ebf5e5c9de315.tar.xz eclipse.platform.debug-96e5103abe9606c375ed99f99f1ebf5e5c9de315.zip |
Bug 157090 - should adopt ICU Collator and use new APIs on StructuredViewer
Diffstat (limited to 'org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui')
6 files changed, 13 insertions, 12 deletions
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/FavoritesDialog.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/FavoritesDialog.java index 919230d31..e64eb3ec6 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/FavoritesDialog.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/FavoritesDialog.java @@ -51,7 +51,7 @@ import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.dialogs.ListSelectionDialog; -import org.eclipse.ui.model.WorkbenchViewerSorter; +import org.eclipse.ui.model.WorkbenchViewerComparator; import com.ibm.icu.text.MessageFormat; @@ -168,7 +168,7 @@ public class FavoritesDialog extends TrayDialog { } list.removeAll(getFavorites()); Object[] objs = list.toArray(); - new WorkbenchViewerSorter().sort(getFavoritesTable(), objs); + new WorkbenchViewerComparator().sort(getFavoritesTable(), objs); return objs; } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationView.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationView.java index eb979eaa5..9805edf93 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationView.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationView.java @@ -49,7 +49,7 @@ import org.eclipse.swt.widgets.TreeItem; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.dialogs.FilteredTree; import org.eclipse.ui.dialogs.PatternFilter; -import org.eclipse.ui.model.WorkbenchViewerSorter; +import org.eclipse.ui.model.WorkbenchViewerComparator; /** * A tree view of launch configurations @@ -136,7 +136,7 @@ public class LaunchConfigurationView extends AbstractDebugView implements ILaunc fTree.setBackground(parent.getDisplay().getSystemColor(SWT.COLOR_LIST_BACKGROUND)); TreeViewer treeViewer = fTree.getViewer(); treeViewer.setLabelProvider(DebugUITools.newDebugModelPresentation()); - treeViewer.setSorter(new WorkbenchViewerSorter()); + treeViewer.setComparator(new WorkbenchViewerComparator()); treeViewer.setContentProvider(new LaunchConfigurationTreeContentProvider(fLaunchGroup.getMode(), parent.getShell())); if(fFilters != null) { for (int i = 0; i < fFilters.length; i++) { diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/LaunchConfigurationsPreferencePage.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/LaunchConfigurationsPreferencePage.java index d96aa9dd1..5dbe4adec 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/LaunchConfigurationsPreferencePage.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/LaunchConfigurationsPreferencePage.java @@ -61,7 +61,7 @@ import org.eclipse.ui.PlatformUI; import org.eclipse.ui.dialogs.ListSelectionDialog; import org.eclipse.ui.model.AdaptableList; import org.eclipse.ui.model.WorkbenchContentProvider; -import org.eclipse.ui.model.WorkbenchViewerSorter; +import org.eclipse.ui.model.WorkbenchViewerComparator; /** * Provides the Launch Configuration preference page to the Run/Debug preferences @@ -252,7 +252,7 @@ public class LaunchConfigurationsPreferencePage extends PreferencePage implement CheckboxTableViewer tviewer = new CheckboxTableViewer(fTable); tviewer.setLabelProvider(DebugUITools.newDebugModelPresentation()); tviewer.setContentProvider(new TableContentProvider()); - tviewer.setSorter(new WorkbenchViewerSorter()); + tviewer.setComparator(new WorkbenchViewerComparator()); LaunchGroupExtension[] groups = new LaunchGroupExtension[] { DebugUIPlugin.getDefault().getLaunchConfigurationManager().getLaunchGroup(DEBUG_LAUNCH_GROUP), DebugUIPlugin.getDefault().getLaunchConfigurationManager().getLaunchGroup(EXT_BUILDER_GROUP)}; diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/PerspectivePreferencePage.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/PerspectivePreferencePage.java index 744323ffb..ece9cf4bd 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/PerspectivePreferencePage.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/PerspectivePreferencePage.java @@ -63,7 +63,7 @@ import org.eclipse.ui.PlatformUI; import org.eclipse.ui.activities.ActivityManagerEvent; import org.eclipse.ui.activities.IActivityManagerListener; import org.eclipse.ui.activities.WorkbenchActivityHelper; -import org.eclipse.ui.model.WorkbenchViewerSorter; +import org.eclipse.ui.model.WorkbenchViewerComparator; import org.w3c.dom.Element; import org.w3c.dom.Node; import org.w3c.dom.NodeList; @@ -516,7 +516,7 @@ public class PerspectivePreferencePage extends PreferencePage implements IWorkbe fTree.setLayoutData(new GridData(GridData.FILL_BOTH)); fViewer = new TreeViewer(fTree); fViewer.setLabelProvider(DebugUITools.newDebugModelPresentation()); - fViewer.setSorter(new WorkbenchViewerSorter()); + fViewer.setComparator(new WorkbenchViewerComparator()); fViewer.setContentProvider(new LaunchConfigurationTreeContentProviderNoChildren(null, parent.getShell())); fViewer.addFilter(new LaunchGroupFilter(fLCM.getLaunchGroup(DEBUG_LAUNCH_GROUP))); fViewer.setInput(fLManager.getLaunchConfigurationTypes()); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/browsers/ArchiveSourceContainerBrowser.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/browsers/ArchiveSourceContainerBrowser.java index ffbb330a3..aa2613d6f 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/browsers/ArchiveSourceContainerBrowser.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/browsers/ArchiveSourceContainerBrowser.java @@ -13,6 +13,7 @@ package org.eclipse.debug.internal.ui.sourcelookup.browsers; import java.util.ArrayList; import java.util.List; + import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.IStatus; @@ -32,7 +33,7 @@ import org.eclipse.ui.dialogs.ElementTreeSelectionDialog; import org.eclipse.ui.dialogs.ISelectionStatusValidator; import org.eclipse.ui.model.WorkbenchContentProvider; import org.eclipse.ui.model.WorkbenchLabelProvider; -import org.eclipse.ui.views.navigator.ResourceSorter; +import org.eclipse.ui.views.navigator.ResourceComparator; /** * Adds an internal jar to the runtime class path. @@ -86,7 +87,7 @@ public class ArchiveSourceContainerBrowser extends AbstractSourceContainerBrowse dialog.setMessage(SourceLookupUIMessages.ArchiveSourceContainerBrowser_4); dialog.addFilter(filter); dialog.setInput(ResourcesPlugin.getWorkspace().getRoot()); - dialog.setSorter(new ResourceSorter(ResourceSorter.NAME)); + dialog.setComparator(new ResourceComparator(ResourceComparator.NAME)); if (dialog.open() == Window.OK) { Object[] result = dialog.getResult(); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/browsers/FolderSourceContainerDialog.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/browsers/FolderSourceContainerDialog.java index 1526915ce..f1122e510 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/browsers/FolderSourceContainerDialog.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/browsers/FolderSourceContainerDialog.java @@ -27,7 +27,7 @@ import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.dialogs.ElementTreeSelectionDialog; import org.eclipse.ui.dialogs.ISelectionStatusValidator; -import org.eclipse.ui.views.navigator.ResourceSorter; +import org.eclipse.ui.views.navigator.ResourceComparator; /** * The dialog for selecting the folder for which a source container will be created. @@ -80,7 +80,7 @@ public class FolderSourceContainerDialog extends ElementTreeSelectionDialog { super(parent, labelProvider, contentProvider); setTitle(SourceLookupUIMessages.folderSelection_title); // setInput(ResourcesPlugin.getWorkspace().getRoot()); - setSorter(new ResourceSorter(ResourceSorter.NAME)); + setComparator(new ResourceComparator(ResourceComparator.NAME)); ISelectionStatusValidator validator= new ISelectionStatusValidator() { public IStatus validate(Object[] selection) { for (int i= 0; i < selection.length; i++) { |