### Eclipse Workspace Patch 1.0
#P org.eclipse.ui.ide
Index: src/org/eclipse/ui/views/markers/internal/CategorySorter.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.ui.ide/src/org/eclipse/ui/views/markers/internal/CategorySorter.java,v
retrieving revision 1.10
diff -u -r1.10 CategorySorter.java
--- src/org/eclipse/ui/views/markers/internal/CategorySorter.java	8 May 2006 20:54:11 -0000	1.10
+++ src/org/eclipse/ui/views/markers/internal/CategorySorter.java	11 Sep 2006 20:23:11 -0000
@@ -14,14 +14,14 @@
 
 import org.eclipse.jface.dialogs.IDialogSettings;
 import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerSorter;
+import org.eclipse.jface.viewers.ViewerComparator;
 
 /**
  * CategorySorter is the sorter that takes categories and the viewer into
  * account.
  * 
  */
-public class CategorySorter extends ViewerSorter implements Comparator {
+public class CategorySorter extends ViewerComparator implements Comparator {
 	TableSorter innerSorter;
 
 	IField categoryField;
Index: src/org/eclipse/ui/views/markers/internal/TableSortAction.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.ui.ide/src/org/eclipse/ui/views/markers/internal/TableSortAction.java,v
retrieving revision 1.6
diff -u -r1.6 TableSortAction.java
--- src/org/eclipse/ui/views/markers/internal/TableSortAction.java	8 May 2006 20:54:11 -0000	1.6
+++ src/org/eclipse/ui/views/markers/internal/TableSortAction.java	11 Sep 2006 20:23:11 -0000
@@ -29,7 +29,7 @@
 
     public void run() {
         if (dialog.open() == Window.OK && dialog.isDirty()) {
-            view.setSorter(dialog.getSorter());
+            view.setComparator(dialog.getSorter());
         }
     }
 }
Index: src/org/eclipse/ui/views/markers/internal/MarkerResolutionDialog.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.ui.ide/src/org/eclipse/ui/views/markers/internal/MarkerResolutionDialog.java,v
retrieving revision 1.14
diff -u -r1.14 MarkerResolutionDialog.java
--- src/org/eclipse/ui/views/markers/internal/MarkerResolutionDialog.java	8 May 2006 20:54:11 -0000	1.14
+++ src/org/eclipse/ui/views/markers/internal/MarkerResolutionDialog.java	11 Sep 2006 20:23:11 -0000
@@ -36,7 +36,7 @@
 import org.eclipse.jface.viewers.SelectionChangedEvent;
 import org.eclipse.jface.viewers.TableLayout;
 import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerSorter;
+import org.eclipse.jface.viewers.ViewerComparator;
 import org.eclipse.jface.wizard.ProgressMonitorPart;
 import org.eclipse.osgi.util.NLS;
 import org.eclipse.swt.SWT;
@@ -79,7 +79,7 @@
 
 	private MarkerView markerView;
 
-	private ViewerSorter resolutionsSorter;
+	private ViewerComparator resolutionsComparator;
 
 	private boolean calculatingResolutions;
 
@@ -104,7 +104,7 @@
 		super(shell);
 		setShellStyle(getShellStyle() | SWT.RESIZE);
 		initializeResolutionsSorter();
-		resolutionsSorter.sort(view.getViewer(), newResolutions);
+		resolutionsComparator.sort(view.getViewer(), newResolutions);
 		resolutions = newResolutions;
 		originalMarker = marker;
 		markerView = view;
@@ -210,7 +210,7 @@
 
 		resolutionsList.setInput(this);
 
-		resolutionsList.setSorter(resolutionsSorter);
+		resolutionsList.setComparator(resolutionsComparator);
 
 		FormData listData = new FormData();
 		listData.top = new FormAttachment(resolutionsLabel, 0);
@@ -264,11 +264,11 @@
 	 * Create the resolutions sorter.
 	 */
 	private void initializeResolutionsSorter() {
-		resolutionsSorter = new ViewerSorter() {
+		resolutionsComparator = new ViewerComparator() {
 			/*
 			 * (non-Javadoc)
 			 * 
-			 * @see org.eclipse.jface.viewers.ViewerSorter#compare(org.eclipse.jface.viewers.Viewer,
+			 * @see org.eclipse.jface.viewers.ViewerComparator#compare(org.eclipse.jface.viewers.Viewer,
 			 *      java.lang.Object, java.lang.Object)
 			 */
 			public int compare(Viewer viewer, Object e1, Object e2) {
Index: src/org/eclipse/ui/views/markers/internal/TableSorter.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.ui.ide/src/org/eclipse/ui/views/markers/internal/TableSorter.java,v
retrieving revision 1.13
diff -u -r1.13 TableSorter.java
--- src/org/eclipse/ui/views/markers/internal/TableSorter.java	8 May 2006 20:54:11 -0000	1.13
+++ src/org/eclipse/ui/views/markers/internal/TableSorter.java	11 Sep 2006 20:23:11 -0000
@@ -17,9 +17,9 @@
 import org.eclipse.jface.dialogs.IDialogSettings;
 import org.eclipse.jface.viewers.TreeViewer;
 import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerSorter;
+import org.eclipse.jface.viewers.ViewerComparator;
 
-public class TableSorter extends ViewerSorter implements Comparator {
+public class TableSorter extends ViewerComparator implements Comparator {
 
 	public static final int MAX_DEPTH = 4;
 
Index: src/org/eclipse/ui/views/markers/internal/TableView.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.ui.ide/src/org/eclipse/ui/views/markers/internal/TableView.java,v
retrieving revision 1.29
diff -u -r1.29 TableView.java
--- src/org/eclipse/ui/views/markers/internal/TableView.java	18 Apr 2006 19:13:48 -0000	1.29
+++ src/org/eclipse/ui/views/markers/internal/TableView.java	11 Sep 2006 20:23:11 -0000
@@ -35,7 +35,7 @@
 import org.eclipse.jface.viewers.TableLayout;
 import org.eclipse.jface.viewers.TreeViewer;
 import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerSorter;
+import org.eclipse.jface.viewers.ViewerComparator;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.BusyIndicator;
 import org.eclipse.swt.events.KeyAdapter;
@@ -138,7 +138,7 @@
 			}
 		});
 
-		viewer.setSorter(buildSorter());
+		viewer.setComparator(buildComparator());
 		setSortIndicators();
 
 		// create the actions before the input is set on the viewer but after
@@ -191,22 +191,22 @@
 	abstract Object createViewerInput();
 
 	/**
-	 * Set the sorter to be the new sorter.
+	 * Set the comparator to be the new comparator.
 	 * 
-	 * @param sorter2
+	 * @param comparator
 	 */
-	void setSorter(TableSorter sorter2) {
-		viewer.setSorter(sorter2);
-		updateForNewSorter(sorter2);
+	void setComparator(TableSorter comparator) {
+		viewer.setComparator(comparator);
+		updateForNewComparator(comparator);
 	}
 
 	/**
-	 * Update the viewer for sorter updates
+	 * Update the viewer for comparator updates
 	 * 
-	 * @param sorter2
+	 * @param comparator
 	 */
-	void updateForNewSorter(TableSorter sorter2) {
-		sorter2.saveState(getDialogSettings());
+	void updateForNewComparator(TableSorter comparator) {
+		comparator.saveState(getDialogSettings());
 		viewer.refresh();
 		setSortIndicators();
 	}
@@ -396,11 +396,11 @@
 	}
 
 	/**
-	 * Build a sorter from the default settings.
+	 * Build a comparator from the default settings.
 	 * 
 	 * @return TableSorter
 	 */
-	protected ViewerSorter buildSorter() {
+	protected ViewerComparator buildComparator() {
 
 		IField[] sortingFields = getSortingFields();
 		int[] priorities = new int[sortingFields.length];
@@ -574,7 +574,7 @@
 	 * @return TableSorter
 	 */
 	TableSorter getTableSorter() {
-		return (TableSorter) viewer.getSorter();
+		return (TableSorter) viewer.getComparator();
 	}
 
 	protected abstract void handleKeyPressed(KeyEvent event);
Index: src/org/eclipse/ui/views/markers/internal/DialogMarkerFilter.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.ui.ide/src/org/eclipse/ui/views/markers/internal/DialogMarkerFilter.java,v
retrieving revision 1.34
diff -u -r1.34 DialogMarkerFilter.java
--- src/org/eclipse/ui/views/markers/internal/DialogMarkerFilter.java	2 Aug 2006 14:49:21 -0000	1.34
+++ src/org/eclipse/ui/views/markers/internal/DialogMarkerFilter.java	11 Sep 2006 20:23:11 -0000
@@ -38,7 +38,7 @@
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableLayout;
 import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerSorter;
+import org.eclipse.jface.viewers.ViewerComparator;
 import org.eclipse.jface.window.Window;
 import org.eclipse.osgi.util.NLS;
 import org.eclipse.swt.SWT;
@@ -1000,7 +1000,7 @@
 		typesViewer.getControl().setLayoutData(gridData);
 		typesViewer.setContentProvider(typesContentProvider);
 		typesViewer.setLabelProvider(getLabelProvider());
-		typesViewer.setSorter(getSorter());
+		typesViewer.setComparator(getComparator());
 		typesViewer.addCheckStateListener(new ICheckStateListener() {
 			public void checkStateChanged(CheckStateChangedEvent event) {
 				markDirty();
@@ -1140,16 +1140,16 @@
 	 * 
 	 * @return ViewerSorter
 	 */
-	protected ViewerSorter getSorter() {
-		return new ViewerSorter() {
+	protected ViewerComparator getComparator() {
+		return new ViewerComparator() {
 			/*
 			 * (non-Javadoc)
 			 * 
-			 * @see org.eclipse.jface.viewers.ViewerSorter#compare(org.eclipse.jface.viewers.Viewer,
+			 * @see org.eclipse.jface.viewers.ViewerComparator#compare(org.eclipse.jface.viewers.Viewer,
 			 *      java.lang.Object, java.lang.Object)
 			 */
 			public int compare(Viewer viewer, Object e1, Object e2) {
-				return collator.compare(((AbstractNode) e1).getName(),
+				return getComparator().compare(((AbstractNode) e1).getName(),
 						((AbstractNode) e2).getName());
 			}
 		};
Index: src/org/eclipse/ui/views/markers/internal/MarkerAdapter.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.ui.ide/src/org/eclipse/ui/views/markers/internal/MarkerAdapter.java,v
retrieving revision 1.28
diff -u -r1.28 MarkerAdapter.java
--- src/org/eclipse/ui/views/markers/internal/MarkerAdapter.java	8 May 2006 20:54:11 -0000	1.28
+++ src/org/eclipse/ui/views/markers/internal/MarkerAdapter.java	11 Sep 2006 20:23:11 -0000
@@ -18,7 +18,7 @@
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.SubProgressMonitor;
-import org.eclipse.jface.viewers.ViewerSorter;
+import org.eclipse.jface.viewers.ViewerComparator;
 import org.eclipse.osgi.util.NLS;
 
 /**
@@ -197,7 +197,7 @@
 	 * @return CategorySorter
 	 */
 	public CategorySorter getCategorySorter() {
-		return (CategorySorter) view.getViewer().getSorter();
+		return (CategorySorter) view.getViewer().getComparator();
 	}
 
 	/**
@@ -245,7 +245,7 @@
 			if (monitor.isCanceled())
 				return;
 
-			ViewerSorter sorter = view.getViewer().getSorter();
+			ViewerComparator sorter = view.getViewer().getComparator();
 
 			if (markerLimit == -1 || isShowingHierarchy()) {
 				sorter.sort(view.getViewer(), newMarkers.toArray());
@@ -297,7 +297,7 @@
 	 */
 	private boolean isShowingHierarchy() {
 
-		ViewerSorter sorter = view.getViewer().getSorter();
+		ViewerComparator sorter = view.getViewer().getComparator();
 		if (sorter instanceof CategorySorter) {
 			return ((CategorySorter) sorter).getCategoryField() != null;
 		}
Index: src/org/eclipse/ui/views/markers/internal/ProblemView.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.ui.ide/src/org/eclipse/ui/views/markers/internal/ProblemView.java,v
retrieving revision 1.57
diff -u -r1.57 ProblemView.java
--- src/org/eclipse/ui/views/markers/internal/ProblemView.java	28 Aug 2006 16:12:56 -0000	1.57
+++ src/org/eclipse/ui/views/markers/internal/ProblemView.java	11 Sep 2006 20:23:11 -0000
@@ -33,7 +33,7 @@
 import org.eclipse.jface.viewers.ColumnLayoutData;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.TableLayout;
-import org.eclipse.jface.viewers.ViewerSorter;
+import org.eclipse.jface.viewers.ViewerComparator;
 import org.eclipse.osgi.util.NLS;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.IMemento;
@@ -433,10 +433,10 @@
 	 * 
 	 * @see org.eclipse.ui.views.markers.internal.TableView#setSorter(org.eclipse.ui.views.markers.internal.TableSorter)
 	 */
-	void setSorter(TableSorter sorter2) {
+	void setComparator(TableSorter sorter2) {
 		getMarkerAdapter().getCategorySorter().setTableSorter(sorter2);
 		getMarkerAdapter().getCategorySorter().saveState(getDialogSettings());
-		updateForNewSorter(sorter2);
+		updateForNewComparator(sorter2);
 		
 	}
 
@@ -446,7 +446,7 @@
 	 * @see org.eclipse.ui.views.markers.internal.MarkerView#getTableSorter()
 	 */
 	public TableSorter getTableSorter() {
-		return ((CategorySorter) getViewer().getSorter()).innerSorter;
+		return ((CategorySorter) getViewer().getComparator()).innerSorter;
 	}
 
 	/*
@@ -501,7 +501,7 @@
 	 * 
 	 * @see org.eclipse.ui.views.markers.internal.TableView#buildSorter()
 	 */
-	protected ViewerSorter buildSorter() {
+	protected ViewerComparator buildComparator() {
 
 		TableSorter sorter = TableSorter.createTableSorter(getSortingFields());
 		sorter.restoreState(getDialogSettings());
Index: extensions/org/eclipse/ui/dialogs/FileSelectionDialog.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.ui.ide/extensions/org/eclipse/ui/dialogs/FileSelectionDialog.java,v
retrieving revision 1.8
diff -u -r1.8 FileSelectionDialog.java
--- extensions/org/eclipse/ui/dialogs/FileSelectionDialog.java	8 May 2006 20:54:12 -0000	1.8
+++ extensions/org/eclipse/ui/dialogs/FileSelectionDialog.java	11 Sep 2006 20:23:10 -0000
@@ -188,8 +188,8 @@
         };
 
         WorkbenchViewerSorter sorter = new WorkbenchViewerSorter();
-        selectionGroup.setTreeSorter(sorter);
-        selectionGroup.setListSorter(sorter);
+        selectionGroup.setTreeComparator(sorter);
+        selectionGroup.setListComparator(sorter);
         selectionGroup.addCheckStateListener(listener);
 
         addSelectionButtons(composite);
Index: extensions/org/eclipse/ui/dialogs/WizardResourceImportPage.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.ui.ide/extensions/org/eclipse/ui/dialogs/WizardResourceImportPage.java,v
retrieving revision 1.13
diff -u -r1.13 WizardResourceImportPage.java
--- extensions/org/eclipse/ui/dialogs/WizardResourceImportPage.java	14 Jun 2006 14:39:44 -0000	1.13
+++ extensions/org/eclipse/ui/dialogs/WizardResourceImportPage.java	11 Sep 2006 20:23:10 -0000
@@ -225,8 +225,8 @@
         };
 
         WorkbenchViewerSorter sorter = new WorkbenchViewerSorter();
-        this.selectionGroup.setTreeSorter(sorter);
-        this.selectionGroup.setListSorter(sorter);
+        this.selectionGroup.setTreeComparator(sorter);
+        this.selectionGroup.setListComparator(sorter);
         this.selectionGroup.addCheckStateListener(listener);
 
     }
Index: src/org/eclipse/ui/internal/wizards/datatransfer/WizardProjectsImportPage.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.ui.ide/src/org/eclipse/ui/internal/wizards/datatransfer/WizardProjectsImportPage.java,v
retrieving revision 1.35
diff -u -r1.35 WizardProjectsImportPage.java
--- src/org/eclipse/ui/internal/wizards/datatransfer/WizardProjectsImportPage.java	2 Aug 2006 18:06:14 -0000	1.35
+++ src/org/eclipse/ui/internal/wizards/datatransfer/WizardProjectsImportPage.java	11 Sep 2006 20:23:11 -0000
@@ -51,7 +51,7 @@
 import org.eclipse.jface.viewers.ITreeContentProvider;
 import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerSorter;
+import org.eclipse.jface.viewers.ViewerComparator;
 import org.eclipse.jface.wizard.WizardPage;
 import org.eclipse.osgi.util.NLS;
 import org.eclipse.swt.SWT;
@@ -406,7 +406,7 @@
 		});
 
 		projectsList.setInput(this);
-		projectsList.setSorter(new ViewerSorter());
+		projectsList.setComparator(new ViewerComparator());
 		createSelectionButtons(listComposite);
 	}
 
Index: src/org/eclipse/ui/internal/ide/misc/CheckboxTreeAndListGroup.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/misc/CheckboxTreeAndListGroup.java,v
retrieving revision 1.10
diff -u -r1.10 CheckboxTreeAndListGroup.java
--- src/org/eclipse/ui/internal/ide/misc/CheckboxTreeAndListGroup.java	8 May 2006 20:54:08 -0000	1.10
+++ src/org/eclipse/ui/internal/ide/misc/CheckboxTreeAndListGroup.java	11 Sep 2006 20:23:10 -0000
@@ -18,7 +18,7 @@
 import java.util.Set;
 
 import org.eclipse.core.commands.common.EventManager;
-import org.eclipse.core.runtime.Platform;
+import org.eclipse.core.runtime.SafeRunner;
 import org.eclipse.jface.util.SafeRunnable;
 import org.eclipse.jface.viewers.CheckStateChangedEvent;
 import org.eclipse.jface.viewers.CheckboxTableViewer;
@@ -33,7 +33,7 @@
 import org.eclipse.jface.viewers.SelectionChangedEvent;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TreeExpansionEvent;
-import org.eclipse.jface.viewers.ViewerSorter;
+import org.eclipse.jface.viewers.ViewerComparator;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.BusyIndicator;
 import org.eclipse.swt.layout.GridData;
@@ -432,6 +432,8 @@
 
     /**
      *	Set the initial checked state of the passed list element to true.
+     *	
+     *	@param element the element in the list to select 
      */
     public void initialCheckListItem(Object element) {
         Object parent = treeContentProvider.getParent(element);
@@ -444,6 +446,8 @@
     /**
      *	Set the initial checked state of the passed element to true,
      *	as well as to all of its children and associated list elements
+     *	
+     *	@param element the element in the tree to select
      */
     public void initialCheckTreeItem(Object element) {
         treeItemChecked(element, true);
@@ -498,7 +502,7 @@
         Object[] array = getListeners();
         for (int i = 0; i < array.length; i++) {
             final ICheckStateListener l = (ICheckStateListener) array[i];
-            Platform.run(new SafeRunnable() {
+            SafeRunner.run(new SafeRunnable() {
                 public void run() {
                     l.checkStateChanged(event);
                 }
@@ -560,6 +564,8 @@
     /**
      * Select or deselect all of the elements in the tree depending on the value of the selection
      * boolean. Be sure to update the displayed files as well.
+     * 
+     * @param selection boolean indicating whether or not to select all elements
      */
     public void setAllSelections(final boolean selection) {
 
@@ -586,10 +592,12 @@
     }
 
     /**
-     *	Set the sorter that is to be applied to self's list viewer
+     *	Set the comparator that is to be applied to self's list viewer
+     *
+     *	@param comparator the comparator for the list viewer
      */
-    public void setListSorter(ViewerSorter sorter) {
-        listViewer.setSorter(sorter);
+    public void setListComparator(ViewerComparator comparator) {
+        listViewer.setComparator(comparator);
     }
 
     /**
@@ -648,10 +656,12 @@
     }
 
     /**
-     *	Set the sorter that is to be applied to self's tree viewer
+     *	Set the comparator that is to be applied to self's tree viewer
+     *
+     *	@param comparator the comparator for the tree
      */
-    public void setTreeSorter(ViewerSorter sorter) {
-        treeViewer.setSorter(sorter);
+    public void setTreeComparator(ViewerComparator comparator) {
+        treeViewer.setComparator(comparator);
     }
 
     /**
Index: src/org/eclipse/ui/internal/ide/misc/ContainerSelectionGroup.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/misc/ContainerSelectionGroup.java,v
retrieving revision 1.15
diff -u -r1.15 ContainerSelectionGroup.java
--- src/org/eclipse/ui/internal/ide/misc/ContainerSelectionGroup.java	8 May 2006 20:54:08 -0000	1.15
+++ src/org/eclipse/ui/internal/ide/misc/ContainerSelectionGroup.java	11 Sep 2006 20:23:10 -0000
@@ -29,7 +29,7 @@
 import org.eclipse.jface.viewers.SelectionChangedEvent;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jface.viewers.ViewerSorter;
+import org.eclipse.jface.viewers.ViewerComparator;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
@@ -266,7 +266,7 @@
 		treeViewer.setContentProvider(cp);
 		treeViewer.setLabelProvider(WorkbenchLabelProvider
 				.getDecoratingWorkbenchLabelProvider());
-		treeViewer.setSorter(new ViewerSorter());
+		treeViewer.setComparator(new ViewerComparator());
 		treeViewer.setUseHashlookup(true);
 		treeViewer.addSelectionChangedListener(new ISelectionChangedListener() {
 			public void selectionChanged(SelectionChangedEvent event) {
Index: src/org/eclipse/ui/internal/ide/dialogs/ResourceWorkingSetPage.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/dialogs/ResourceWorkingSetPage.java,v
retrieving revision 1.16
diff -u -r1.16 ResourceWorkingSetPage.java
--- src/org/eclipse/ui/internal/ide/dialogs/ResourceWorkingSetPage.java	14 Aug 2006 17:35:48 -0000	1.16
+++ src/org/eclipse/ui/internal/ide/dialogs/ResourceWorkingSetPage.java	11 Sep 2006 20:23:10 -0000
@@ -177,7 +177,7 @@
                         .getWorkbench().getDecoratorManager()
                         .getLabelDecorator()));
         tree.setInput(IDEWorkbenchPlugin.getPluginWorkspace().getRoot());
-        tree.setSorter(new ResourceSorter(ResourceSorter.NAME));
+        tree.setComparator(new ResourceSorter(ResourceSorter.NAME));
 
         data = new GridData(GridData.FILL_BOTH | GridData.GRAB_VERTICAL);
         data.heightHint = SIZING_SELECTION_WIDGET_HEIGHT;
Index: src/org/eclipse/ui/internal/ide/dialogs/ProjectReferencePage.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/dialogs/ProjectReferencePage.java,v
retrieving revision 1.17
diff -u -r1.17 ProjectReferencePage.java
--- src/org/eclipse/ui/internal/ide/dialogs/ProjectReferencePage.java	8 May 2006 20:54:08 -0000	1.17
+++ src/org/eclipse/ui/internal/ide/dialogs/ProjectReferencePage.java	11 Sep 2006 20:23:10 -0000
@@ -28,7 +28,7 @@
 import org.eclipse.jface.viewers.CheckboxTableViewer;
 import org.eclipse.jface.viewers.ICheckStateListener;
 import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.ViewerSorter;
+import org.eclipse.jface.viewers.ViewerComparator;
 import org.eclipse.osgi.util.NLS;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Font;
@@ -106,7 +106,7 @@
         listViewer.setLabelProvider(WorkbenchLabelProvider
                 .getDecoratingWorkbenchLabelProvider());
         listViewer.setContentProvider(getContentProvider(project));
-        listViewer.setSorter(new ViewerSorter());
+        listViewer.setComparator(new ViewerComparator());
         listViewer.setInput(project.getWorkspace());
         try {
             listViewer.setCheckedElements(project.getDescription()
Index: src/org/eclipse/ui/internal/ide/dialogs/ResourceSorter.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/dialogs/ResourceSorter.java,v
retrieving revision 1.5
diff -u -r1.5 ResourceSorter.java
--- src/org/eclipse/ui/internal/ide/dialogs/ResourceSorter.java	8 May 2006 20:54:08 -0000	1.5
+++ src/org/eclipse/ui/internal/ide/dialogs/ResourceSorter.java	11 Sep 2006 20:23:10 -0000
@@ -13,7 +13,7 @@
 import org.eclipse.core.resources.IContainer;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerSorter;
+import org.eclipse.jface.viewers.ViewerComparator;
 
 /**
  * Sorter for viewers that display items of type <code>IResource</code>.
@@ -32,7 +32,7 @@
  * This class may be instantiated; it is not intended to be subclassed.
  * </p>
  */
-public class ResourceSorter extends ViewerSorter {
+public class ResourceSorter extends ViewerComparator {
 
     /**
      * Constructor argument value that indicates to sort items by name.
@@ -133,7 +133,7 @@
      *  element is greater than the second element
      */
     protected int compareNames(IResource resource1, IResource resource2) {
-        return collator.compare(resource1.getName(), resource2.getName());
+        return getComparator().compare(resource1.getName(), resource2.getName());
     }
 
     /**
@@ -155,7 +155,7 @@
         // Compare extensions.  If they're different then return a value that
         // indicates correct extension ordering.  If they're the same then
         // return a value that indicates the correct NAME ordering.
-        int result = collator.compare(ext1, ext2);
+        int result = getComparator().compare(ext1, ext2);
 
         if (result != 0) {
 			return result;
Index: src/org/eclipse/ui/internal/ide/dialogs/ResourceTreeAndListGroup.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/dialogs/ResourceTreeAndListGroup.java,v
retrieving revision 1.14
diff -u -r1.14 ResourceTreeAndListGroup.java
--- src/org/eclipse/ui/internal/ide/dialogs/ResourceTreeAndListGroup.java	8 May 2006 20:54:08 -0000	1.14
+++ src/org/eclipse/ui/internal/ide/dialogs/ResourceTreeAndListGroup.java	11 Sep 2006 20:23:10 -0000
@@ -38,7 +38,7 @@
 import org.eclipse.jface.viewers.SelectionChangedEvent;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TreeExpansionEvent;
-import org.eclipse.jface.viewers.ViewerSorter;
+import org.eclipse.jface.viewers.ViewerComparator;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.BusyIndicator;
 import org.eclipse.swt.layout.GridData;
@@ -869,11 +869,12 @@
     }
 
     /**
-     * Set the sorter that is to be applied to self's list viewer
-     * @param sorter
+     * Set the comparator that is to be applied to self's list viewer
+     * 
+     * @param comparator the sorter for the list
      */
-    public void setListSorter(ViewerSorter sorter) {
-        listViewer.setSorter(sorter);
+    public void setListComparator(ViewerComparator comparator) {
+        listViewer.setComparator(comparator);
     }
 
     /**
@@ -928,11 +929,12 @@
     }
 
     /**
-     * Set the sorter that is to be applied to self's tree viewer
-     * @param sorter
+     * Set the comparator that is to be applied to self's tree viewer
+     * 
+     * @param comparator the comparator for the tree
      */
-    public void setTreeSorter(ViewerSorter sorter) {
-        treeViewer.setSorter(sorter);
+    public void setTreeComparator(ViewerComparator comparator) {
+        treeViewer.setComparator(comparator);
     }
 
     /**
Index: src/org/eclipse/ui/internal/ide/dialogs/CleanDialog.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/dialogs/CleanDialog.java,v
retrieving revision 1.21
diff -u -r1.21 CleanDialog.java
--- src/org/eclipse/ui/internal/ide/dialogs/CleanDialog.java	8 May 2006 20:54:08 -0000	1.21
+++ src/org/eclipse/ui/internal/ide/dialogs/CleanDialog.java	11 Sep 2006 20:23:10 -0000
@@ -191,7 +191,7 @@
     	projectNames = CheckboxTableViewer.newCheckList(radioGroup, SWT.BORDER);
     	projectNames.setContentProvider(new WorkbenchContentProvider());
     	projectNames.setLabelProvider(new WorkbenchLabelProvider());
-    	projectNames.setSorter(new ResourceSorter(ResourceSorter.NAME));
+    	projectNames.setComparator(new ResourceSorter(ResourceSorter.NAME));
     	projectNames.addFilter(new ViewerFilter() {
     		private final IProject[] projectHolder = new IProject[1];
 			public boolean select(Viewer viewer, Object parentElement, Object element) {
#P org.eclipse.ui.workbench
Index: Eclipse UI/org/eclipse/ui/internal/progress/JobErrorDialog.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/JobErrorDialog.java,v
retrieving revision 1.15
diff -u -r1.15 JobErrorDialog.java
--- Eclipse UI/org/eclipse/ui/internal/progress/JobErrorDialog.java	8 May 2006 20:55:47 -0000	1.15
+++ Eclipse UI/org/eclipse/ui/internal/progress/JobErrorDialog.java	11 Sep 2006 20:23:12 -0000
@@ -33,7 +33,7 @@
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerSorter;
+import org.eclipse.jface.viewers.ViewerComparator;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.DisposeListener;
 import org.eclipse.swt.graphics.Image;
@@ -243,7 +243,7 @@
 		// Display a list of jobs that have reported errors
 		jobListViewer = new TableViewer(parent, SWT.SINGLE | SWT.H_SCROLL
 				| SWT.V_SCROLL | SWT.BORDER);
-		jobListViewer.setSorter(getViewerSorter());
+		jobListViewer.setComparator(getViewerComparator());
 		Control control = jobListViewer.getControl();
 		GridData data = new GridData(GridData.FILL_BOTH
 				| GridData.GRAB_HORIZONTAL | GridData.GRAB_VERTICAL);
@@ -288,12 +288,12 @@
 	 * 
 	 * @return ViewerSorter
 	 */
-	private ViewerSorter getViewerSorter() {
-		return new ViewerSorter() {
+	private ViewerComparator getViewerComparator() {
+		return new ViewerComparator() {
 			/*
 			 * (non-Javadoc)
 			 * 
-			 * @see org.eclipse.jface.viewers.ViewerSorter#compare(org.eclipse.jface.viewers.Viewer,
+			 * @see org.eclipse.jface.viewers.ViewerComparator#compare(org.eclipse.jface.viewers.Viewer,
 			 *      java.lang.Object, java.lang.Object)
 			 */
 			public int compare(Viewer testViewer, Object e1, Object e2) {
Index: Eclipse UI/org/eclipse/ui/internal/progress/DetailedProgressViewer.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/DetailedProgressViewer.java,v
retrieving revision 1.21
diff -u -r1.21 DetailedProgressViewer.java
--- Eclipse UI/org/eclipse/ui/internal/progress/DetailedProgressViewer.java	20 Jun 2006 14:10:36 -0000	1.21
+++ Eclipse UI/org/eclipse/ui/internal/progress/DetailedProgressViewer.java	11 Sep 2006 20:23:12 -0000
@@ -15,7 +15,7 @@
 
 import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.jface.viewers.ViewerSorter;
+import org.eclipse.jface.viewers.ViewerComparator;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.ScrolledComposite;
 import org.eclipse.swt.events.FocusAdapter;
@@ -105,7 +105,7 @@
 	 * @see org.eclipse.ui.internal.progress.AbstractProgressViewer#add(java.lang.Object[])
 	 */
 	public void add(Object[] elements) {
-		ViewerSorter sorter = getSorter();
+		ViewerComparator sorter = getComparator();
 		ArrayList newItems = new ArrayList(control.getChildren().length
 				+ elements.length);
 
Index: Eclipse UI/org/eclipse/ui/internal/progress/ProgressManagerUtil.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/ProgressManagerUtil.java,v
retrieving revision 1.40
diff -u -r1.40 ProgressManagerUtil.java
--- Eclipse UI/org/eclipse/ui/internal/progress/ProgressManagerUtil.java	28 Aug 2006 15:26:30 -0000	1.40
+++ Eclipse UI/org/eclipse/ui/internal/progress/ProgressManagerUtil.java	11 Sep 2006 20:23:12 -0000
@@ -17,7 +17,7 @@
 import org.eclipse.core.runtime.QualifiedName;
 import org.eclipse.core.runtime.jobs.Job;
 import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerSorter;
+import org.eclipse.jface.viewers.ViewerComparator;
 import org.eclipse.jface.window.IShellProvider;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.GC;
@@ -102,16 +102,16 @@
 	// viewer.setLabelProvider(new ProgressLabelProvider());
 	// }
 	/**
-	 * Return a viewer sorter for looking at the jobs.
+	 * Return a viewer comparator for looking at the jobs.
 	 * 
-	 * @return ViewerSorter
+	 * @return ViewerComparator
 	 */
-	static ViewerSorter getProgressViewerSorter() {
-		return new ViewerSorter() {
+	static ViewerComparator getProgressViewerComparator() {
+		return new ViewerComparator() {
 			/*
 			 * (non-Javadoc)
 			 * 
-			 * @see org.eclipse.jface.viewers.ViewerSorter#compare(org.eclipse.jface.viewers.Viewer,
+			 * @see org.eclipse.jface.viewers.ViewerComparator#compare(org.eclipse.jface.viewers.Viewer,
 			 *      java.lang.Object, java.lang.Object)
 			 */
 			public int compare(Viewer testViewer, Object e1, Object e2) {
Index: Eclipse UI/org/eclipse/ui/internal/progress/BlockedJobsDialog.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/BlockedJobsDialog.java,v
retrieving revision 1.46
diff -u -r1.46 BlockedJobsDialog.java
--- Eclipse UI/org/eclipse/ui/internal/progress/BlockedJobsDialog.java	8 May 2006 20:55:47 -0000	1.46
+++ Eclipse UI/org/eclipse/ui/internal/progress/BlockedJobsDialog.java	11 Sep 2006 20:23:12 -0000
@@ -16,7 +16,7 @@
 import org.eclipse.jface.dialogs.IconAndMessageDialog;
 import org.eclipse.jface.resource.JFaceResources;
 import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerSorter;
+import org.eclipse.jface.viewers.ViewerComparator;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Cursor;
 import org.eclipse.swt.graphics.Image;
@@ -301,11 +301,11 @@
 	void showJobDetails(Composite parent) {
 		viewer = new DetailedProgressViewer(parent, SWT.MULTI | SWT.H_SCROLL
 				| SWT.V_SCROLL | SWT.BORDER);
-		viewer.setSorter(new ViewerSorter() {
+		viewer.setComparator(new ViewerComparator() {
 			/*
 			 * (non-Javadoc)
 			 * 
-			 * @see org.eclipse.jface.viewers.ViewerSorter#compare(org.eclipse.jface.viewers.Viewer,
+			 * @see org.eclipse.jface.viewers.ViewerComparator#compare(org.eclipse.jface.viewers.Viewer,
 			 *      java.lang.Object, java.lang.Object)
 			 */
 			public int compare(Viewer testViewer, Object e1, Object e2) {
Index: Eclipse UI/org/eclipse/ui/internal/progress/ProgressRegion.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/ProgressRegion.java,v
retrieving revision 1.37
diff -u -r1.37 ProgressRegion.java
--- Eclipse UI/org/eclipse/ui/internal/progress/ProgressRegion.java	9 May 2006 19:59:55 -0000	1.37
+++ Eclipse UI/org/eclipse/ui/internal/progress/ProgressRegion.java	11 Sep 2006 20:23:12 -0000
@@ -170,7 +170,7 @@
         viewer.setContentProvider(provider);
         viewer.setInput(provider);
         viewer.setLabelProvider(new ProgressViewerLabelProvider(viewerControl));
-        viewer.setSorter(ProgressManagerUtil.getProgressViewerSorter());
+        viewer.setComparator(ProgressManagerUtil.getProgressViewerComparator());
         return region;
     }
 
Index: Eclipse UI/org/eclipse/ui/internal/progress/ProgressView.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/ProgressView.java,v
retrieving revision 1.44
diff -u -r1.44 ProgressView.java
--- Eclipse UI/org/eclipse/ui/internal/progress/ProgressView.java	7 Jun 2006 14:42:07 -0000	1.44
+++ Eclipse UI/org/eclipse/ui/internal/progress/ProgressView.java	11 Sep 2006 20:23:12 -0000
@@ -53,7 +53,7 @@
 	 */
 	public void createPartControl(Composite parent) {
 		viewer = new DetailedProgressViewer(parent, SWT.MULTI);
-		viewer.setSorter(ProgressManagerUtil.getProgressViewerSorter());
+		viewer.setComparator(ProgressManagerUtil.getProgressViewerComparator());
 
 		viewer.getControl().setLayoutData(
 				new GridData(SWT.FILL, SWT.FILL, true, true));
Index: Eclipse UI/org/eclipse/ui/internal/progress/ProgressMonitorJobsDialog.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/ProgressMonitorJobsDialog.java,v
retrieving revision 1.39
diff -u -r1.39 ProgressMonitorJobsDialog.java
--- Eclipse UI/org/eclipse/ui/internal/progress/ProgressMonitorJobsDialog.java	14 Jun 2006 18:21:05 -0000	1.39
+++ Eclipse UI/org/eclipse/ui/internal/progress/ProgressMonitorJobsDialog.java	11 Sep 2006 20:23:12 -0000
@@ -19,7 +19,7 @@
 import org.eclipse.jface.dialogs.ProgressMonitorDialog;
 import org.eclipse.jface.operation.IRunnableWithProgress;
 import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerSorter;
+import org.eclipse.jface.viewers.ViewerComparator;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
@@ -114,11 +114,11 @@
 
             viewer = new DetailedProgressViewer(viewerComposite, SWT.MULTI
                     | SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER);
-            viewer.setSorter(new ViewerSorter() {
+            viewer.setComparator(new ViewerComparator() {
                 /*
                  * (non-Javadoc)
                  * 
-                 * @see org.eclipse.jface.viewers.ViewerSorter#compare(org.eclipse.jface.viewers.Viewer,
+                 * @see org.eclipse.jface.viewers.ViewerComparator#compare(org.eclipse.jface.viewers.Viewer,
                  *      java.lang.Object, java.lang.Object)
                  */
                 public int compare(Viewer testViewer, Object e1, Object e2) {
Index: Eclipse UI/org/eclipse/ui/internal/themes/ColorsAndFontsPreferencePage.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/themes/ColorsAndFontsPreferencePage.java,v
retrieving revision 1.51
diff -u -r1.51 ColorsAndFontsPreferencePage.java
--- Eclipse UI/org/eclipse/ui/internal/themes/ColorsAndFontsPreferencePage.java	8 May 2006 20:55:33 -0000	1.51
+++ Eclipse UI/org/eclipse/ui/internal/themes/ColorsAndFontsPreferencePage.java	11 Sep 2006 20:23:12 -0000
@@ -42,7 +42,7 @@
 import org.eclipse.jface.viewers.SelectionChangedEvent;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerSorter;
+import org.eclipse.jface.viewers.ViewerComparator;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.StackLayout;
 import org.eclipse.swt.events.DisposeEvent;
@@ -862,9 +862,9 @@
 
         tree.getViewer().setLabelProvider(labelProvider);
         tree.getViewer().setContentProvider(new ThemeContentProvider());
-        tree.getViewer().setSorter(new ViewerSorter() {
+        tree.getViewer().setComparator(new ViewerComparator() {
             /* (non-Javadoc)
-             * @see org.eclipse.jface.viewers.ViewerSorter#category(java.lang.Object)
+             * @see org.eclipse.jface.viewers.ViewerComparator#category(java.lang.Object)
              */
             public int category(Object element) {
                 if (element instanceof ThemeElementCategory) {
Index: Eclipse UI/org/eclipse/ui/internal/dialogs/SelectPerspectiveDialog.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/SelectPerspectiveDialog.java,v
retrieving revision 1.32
diff -u -r1.32 SelectPerspectiveDialog.java
--- Eclipse UI/org/eclipse/ui/internal/dialogs/SelectPerspectiveDialog.java	8 May 2006 20:55:45 -0000	1.32
+++ Eclipse UI/org/eclipse/ui/internal/dialogs/SelectPerspectiveDialog.java	11 Sep 2006 20:23:12 -0000
@@ -21,7 +21,7 @@
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.SelectionChangedEvent;
 import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.ViewerSorter;
+import org.eclipse.jface.viewers.ViewerComparator;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
@@ -183,7 +183,7 @@
         list.setLabelProvider(new PerspectiveLabelProvider());
         list.setContentProvider(new PerspContentProvider());
         list.addFilter(activityViewerFilter);
-        list.setSorter(new ViewerSorter());
+        list.setComparator(new ViewerComparator());
         list.setInput(perspReg);
         list.addSelectionChangedListener(this);
         list.addDoubleClickListener(new IDoubleClickListener() {
Index: Eclipse UI/org/eclipse/ui/internal/dialogs/NewWizardNewPage.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/NewWizardNewPage.java,v
retrieving revision 1.53
diff -u -r1.53 NewWizardNewPage.java
--- Eclipse UI/org/eclipse/ui/internal/dialogs/NewWizardNewPage.java	28 Jun 2006 21:31:22 -0000	1.53
+++ Eclipse UI/org/eclipse/ui/internal/dialogs/NewWizardNewPage.java	11 Sep 2006 20:23:12 -0000
@@ -299,7 +299,7 @@
 		final TreeViewer treeViewer = filterTree.getViewer();
 		treeViewer.setContentProvider(new WizardContentProvider());
 		treeViewer.setLabelProvider(new WorkbenchLabelProvider());
-		treeViewer.setSorter(NewWizardCollectionSorter.INSTANCE);
+		treeViewer.setComparator(NewWizardCollectionSorter.INSTANCE);
 		treeViewer.addSelectionChangedListener(this);
 
         ArrayList inputArray = new ArrayList();
Index: Eclipse UI/org/eclipse/ui/internal/dialogs/DataTransferWizardCollectionSorter.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/DataTransferWizardCollectionSorter.java,v
retrieving revision 1.4
diff -u -r1.4 DataTransferWizardCollectionSorter.java
--- Eclipse UI/org/eclipse/ui/internal/dialogs/DataTransferWizardCollectionSorter.java	8 May 2006 20:55:46 -0000	1.4
+++ Eclipse UI/org/eclipse/ui/internal/dialogs/DataTransferWizardCollectionSorter.java	11 Sep 2006 20:23:12 -0000
@@ -12,7 +12,7 @@
 package org.eclipse.ui.internal.dialogs;
 
 import org.eclipse.jface.viewers.IBasicPropertyConstants;
-import org.eclipse.jface.viewers.ViewerSorter;
+import org.eclipse.jface.viewers.ViewerComparator;
 import org.eclipse.ui.internal.registry.WizardsRegistryReader;
 
 /**
@@ -28,7 +28,7 @@
  *  
  *  @since 3.2
  */
-class DataTransferWizardCollectionSorter extends ViewerSorter {
+class DataTransferWizardCollectionSorter extends ViewerComparator {
 	/**
 	 * Static instance of this class.
 	 */	
Index: Eclipse UI/org/eclipse/ui/internal/dialogs/ContentTypesPreferencePage.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/ContentTypesPreferencePage.java,v
retrieving revision 1.11
diff -u -r1.11 ContentTypesPreferencePage.java
--- Eclipse UI/org/eclipse/ui/internal/dialogs/ContentTypesPreferencePage.java	8 May 2006 20:55:45 -0000	1.11
+++ Eclipse UI/org/eclipse/ui/internal/dialogs/ContentTypesPreferencePage.java	11 Sep 2006 20:23:12 -0000
@@ -31,7 +31,7 @@
 import org.eclipse.jface.viewers.SelectionChangedEvent;
 import org.eclipse.jface.viewers.TreeViewer;
 import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerSorter;
+import org.eclipse.jface.viewers.ViewerComparator;
 import org.eclipse.jface.window.Window;
 import org.eclipse.osgi.util.NLS;
 import org.eclipse.osgi.util.TextProcessor;
@@ -115,7 +115,7 @@
         }
     }
 
-    private class FileSpecSorter extends ViewerSorter {
+    private class FileSpecComparator extends ViewerComparator {
 		public int category(Object element) {
 			// only Spec objects in here - unchecked cast
 			return ((Spec)element).sortValue;
@@ -403,7 +403,7 @@
         }
         {
             fileAssociationViewer = new ListViewer(composite);
-            fileAssociationViewer.setSorter(new FileSpecSorter());
+            fileAssociationViewer.setComparator(new FileSpecComparator());
             fileAssociationViewer.getControl().setFont(composite.getFont());
             fileAssociationViewer
                     .setContentProvider(new FileSpecContentProvider());
@@ -556,7 +556,7 @@
                     .setContentProvider(new ContentTypesContentProvider());
             contentTypesViewer
                     .setLabelProvider(new ContentTypesLabelProvider());
-            contentTypesViewer.setSorter(new ViewerSorter());
+            contentTypesViewer.setComparator(new ViewerComparator());
             contentTypesViewer.setInput(Platform.getContentTypeManager());
             GridData data = new GridData(GridData.FILL_BOTH);
             data.horizontalSpan = 2;
Index: Eclipse UI/org/eclipse/ui/internal/dialogs/ActionSetSorter.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/ActionSetSorter.java,v
retrieving revision 1.7
diff -u -r1.7 ActionSetSorter.java
--- Eclipse UI/org/eclipse/ui/internal/dialogs/ActionSetSorter.java	15 Jun 2005 18:41:21 -0000	1.7
+++ Eclipse UI/org/eclipse/ui/internal/dialogs/ActionSetSorter.java	11 Sep 2006 20:23:11 -0000
@@ -11,13 +11,13 @@
 package org.eclipse.ui.internal.dialogs;
 
 import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerSorter;
+import org.eclipse.jface.viewers.ViewerComparator;
 import org.eclipse.ui.internal.registry.IActionSetDescriptor;
 
 /**
  * This is used to sort action sets in the perspective customization dialog.
  */
-public class ActionSetSorter extends ViewerSorter {
+public class ActionSetSorter extends ViewerComparator {
 
     /**
      * Creates a new sorter.
@@ -36,7 +36,7 @@
                     .getLabel());
             String str2 = DialogUtil.removeAccel(((IActionSetDescriptor) e2)
                     .getLabel());
-            return collator.compare(str1, str2);
+            return getComparator().compare(str1, str2);
         }
         return 0;
     }
Index: Eclipse UI/org/eclipse/ui/internal/dialogs/SavePerspectiveDialog.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/SavePerspectiveDialog.java,v
retrieving revision 1.19
diff -u -r1.19 SavePerspectiveDialog.java
--- Eclipse UI/org/eclipse/ui/internal/dialogs/SavePerspectiveDialog.java	8 May 2006 20:55:46 -0000	1.19
+++ Eclipse UI/org/eclipse/ui/internal/dialogs/SavePerspectiveDialog.java	11 Sep 2006 20:23:12 -0000
@@ -17,7 +17,7 @@
 import org.eclipse.jface.viewers.SelectionChangedEvent;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.ViewerSorter;
+import org.eclipse.jface.viewers.ViewerComparator;
 import org.eclipse.osgi.util.NLS;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.ModifyListener;
@@ -165,7 +165,7 @@
         list.setLabelProvider(new PerspectiveLabelProvider());
         list.setContentProvider(new PerspContentProvider());
         list.addFilter(new ActivityViewerFilter());
-        list.setSorter(new ViewerSorter());
+        list.setComparator(new ViewerComparator());
         list.setInput(perspReg);
         list.addSelectionChangedListener(this);
         list.getTable().setFont(font);
Index: Eclipse UI/org/eclipse/ui/internal/dialogs/ImportExportPage.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/ImportExportPage.java,v
retrieving revision 1.15
diff -u -r1.15 ImportExportPage.java
--- Eclipse UI/org/eclipse/ui/internal/dialogs/ImportExportPage.java	8 May 2006 20:55:45 -0000	1.15
+++ Eclipse UI/org/eclipse/ui/internal/dialogs/ImportExportPage.java	11 Sep 2006 20:23:12 -0000
@@ -116,7 +116,7 @@
 
 	        viewer.setContentProvider(new WizardContentProvider());
 	        viewer.setLabelProvider(new WorkbenchLabelProvider());
-	        viewer.setSorter(DataTransferWizardCollectionSorter.INSTANCE);
+	        viewer.setComparator(DataTransferWizardCollectionSorter.INSTANCE);
 	        
 	        ArrayList inputArray = new ArrayList();
 	        boolean expandTop = false;
Index: Eclipse UI/org/eclipse/ui/internal/dialogs/NewWizardCollectionSorter.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/NewWizardCollectionSorter.java,v
retrieving revision 1.13
diff -u -r1.13 NewWizardCollectionSorter.java
--- Eclipse UI/org/eclipse/ui/internal/dialogs/NewWizardCollectionSorter.java	8 May 2006 20:55:46 -0000	1.13
+++ Eclipse UI/org/eclipse/ui/internal/dialogs/NewWizardCollectionSorter.java	11 Sep 2006 20:23:12 -0000
@@ -12,7 +12,7 @@
 package org.eclipse.ui.internal.dialogs;
 
 import org.eclipse.jface.viewers.IBasicPropertyConstants;
-import org.eclipse.jface.viewers.ViewerSorter;
+import org.eclipse.jface.viewers.ViewerComparator;
 import org.eclipse.ui.internal.registry.WizardsRegistryReader;
 
 /**
@@ -24,7 +24,7 @@
  *	name for base Wizards will always be sorted such that it will
  *	ultimately be placed at the beginning of the sorted result.
  */
-class NewWizardCollectionSorter extends ViewerSorter {
+class NewWizardCollectionSorter extends ViewerComparator {
 	/**
 	 * Static instance of this class.
 	 */
Index: Eclipse UI/org/eclipse/ui/internal/dialogs/ShowViewDialog.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/ShowViewDialog.java,v
retrieving revision 1.35
diff -u -r1.35 ShowViewDialog.java
--- Eclipse UI/org/eclipse/ui/internal/dialogs/ShowViewDialog.java	29 Aug 2006 15:36:04 -0000	1.35
+++ Eclipse UI/org/eclipse/ui/internal/dialogs/ShowViewDialog.java	11 Sep 2006 20:23:12 -0000
@@ -210,7 +210,7 @@
 		
 		treeViewer.setLabelProvider(new ViewLabelProvider(window, dimmedForeground));
 		treeViewer.setContentProvider(new ViewContentProvider());
-		treeViewer.setSorter(new ViewSorter((ViewRegistry) viewReg));
+		treeViewer.setComparator(new ViewSorter((ViewRegistry) viewReg));
 		treeViewer.setInput(viewReg);
 		treeViewer.addSelectionChangedListener(this);
 		treeViewer.addDoubleClickListener(this);
Index: Eclipse UI/org/eclipse/ui/internal/dialogs/CustomizePerspectiveDialog.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/CustomizePerspectiveDialog.java,v
retrieving revision 1.52
diff -u -r1.52 CustomizePerspectiveDialog.java
--- Eclipse UI/org/eclipse/ui/internal/dialogs/CustomizePerspectiveDialog.java	4 Apr 2006 18:12:56 -0000	1.52
+++ Eclipse UI/org/eclipse/ui/internal/dialogs/CustomizePerspectiveDialog.java	11 Sep 2006 20:23:12 -0000
@@ -1092,7 +1092,7 @@
         actionSetsViewer.getTable().setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
         actionSetsViewer.setLabelProvider(new WorkbenchLabelProvider());
         actionSetsViewer.setContentProvider(new ArrayContentProvider());
-        actionSetsViewer.setSorter(new ActionSetSorter());
+        actionSetsViewer.setComparator(new ActionSetSorter());
 
         // Menu and toolbar composite
         Composite actionGroup = new Composite(sashComposite, SWT.NONE);
Index: Eclipse UI/org/eclipse/ui/internal/dialogs/ViewSorter.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/ViewSorter.java,v
retrieving revision 1.12
diff -u -r1.12 ViewSorter.java
--- Eclipse UI/org/eclipse/ui/internal/dialogs/ViewSorter.java	8 May 2006 20:55:46 -0000	1.12
+++ Eclipse UI/org/eclipse/ui/internal/dialogs/ViewSorter.java	11 Sep 2006 20:23:12 -0000
@@ -11,7 +11,7 @@
 package org.eclipse.ui.internal.dialogs;
 
 import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerSorter;
+import org.eclipse.jface.viewers.ViewerComparator;
 import org.eclipse.ui.internal.registry.Category;
 import org.eclipse.ui.internal.registry.ViewRegistry;
 import org.eclipse.ui.internal.registry.ViewRegistryReader;
@@ -21,7 +21,7 @@
 /**
  * This is used to sort views in a ShowViewDialog.
  */
-public class ViewSorter extends ViewerSorter {
+public class ViewSorter extends ViewerComparator {
     private ViewRegistry viewReg;
 
     /**
@@ -45,7 +45,7 @@
                     .getLabel());
             String str2 = DialogUtil.removeAccel(((IViewDescriptor) e2)
                     .getLabel());
-            return collator.compare(str1, str2);
+            return getComparator().compare(str1, str2);
         } else if (e1 instanceof IViewCategory) {
         	IViewCategory generalCategory = viewReg.findCategory(ViewRegistryReader.GENERAL_VIEW_ID);
         	if (generalCategory != null){
@@ -67,7 +67,7 @@
 			}
             String str1 = DialogUtil.removeAccel(((IViewCategory) e1).getLabel());
             String str2 = DialogUtil.removeAccel(((IViewCategory) e2).getLabel());
-            return collator.compare(str1, str2);
+            return getComparator().compare(str1, str2);
         }
         return 0;
     }
Index: Eclipse UI/org/eclipse/ui/internal/activities/ws/ActivityEnabler.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/activities/ws/ActivityEnabler.java,v
retrieving revision 1.27
diff -u -r1.27 ActivityEnabler.java
--- Eclipse UI/org/eclipse/ui/internal/activities/ws/ActivityEnabler.java	14 Aug 2006 17:56:07 -0000	1.27
+++ Eclipse UI/org/eclipse/ui/internal/activities/ws/ActivityEnabler.java	11 Sep 2006 20:23:11 -0000
@@ -30,7 +30,7 @@
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.SelectionChangedEvent;
 import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.ViewerSorter;
+import org.eclipse.jface.viewers.ViewerComparator;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
@@ -294,7 +294,7 @@
 		new Label(composite, SWT.NONE).setText(strings.getProperty(ActivitiesPreferencePage.ACTIVITY_NAME, ActivityMessages.ActivityEnabler_activities) + ':');
 
 		dualViewer = new CheckboxTreeViewer(composite);
-		dualViewer.setSorter(new ViewerSorter());
+		dualViewer.setComparator(new ViewerComparator());
 		dualViewer.setLabelProvider(new ActivityCategoryLabelProvider());
 		dualViewer.setContentProvider(provider);
 		dualViewer.setInput(activitySupport);
Index: Eclipse UI/org/eclipse/ui/internal/keys/NewKeysPreferencePage.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/NewKeysPreferencePage.java,v
retrieving revision 1.27
diff -u -r1.27 NewKeysPreferencePage.java
--- Eclipse UI/org/eclipse/ui/internal/keys/NewKeysPreferencePage.java	8 May 2006 20:55:48 -0000	1.27
+++ Eclipse UI/org/eclipse/ui/internal/keys/NewKeysPreferencePage.java	11 Sep 2006 20:23:12 -0000
@@ -66,7 +66,7 @@
 import org.eclipse.jface.viewers.TreeNodeContentProvider;
 import org.eclipse.jface.viewers.TreeViewer;
 import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerSorter;
+import org.eclipse.jface.viewers.ViewerComparator;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.MouseAdapter;
 import org.eclipse.swt.events.MouseEvent;
@@ -425,7 +425,7 @@
 	/**
 	 * Sorts the bindings in the filtered tree based on the current grouping.
 	 */
-	private final class BindingSorter extends ViewerSorter {
+	private final class BindingComparator extends ViewerComparator {
 
 		public final int category(final Object element) {
 			switch (grouping) {
@@ -1134,7 +1134,7 @@
 		final TreeViewer viewer = filteredTree.getViewer();
 		viewer.setLabelProvider(new BindingLabelProvider());
 		viewer.setContentProvider(new TreeNodeContentProvider());
-		viewer.setSorter(new BindingSorter());
+		viewer.setComparator(new BindingComparator());
 
 		/*
 		 * Listen for selection changes so that the data controls can be
Index: Eclipse UI/org/eclipse/ui/internal/presentations/BasicPartList.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/presentations/BasicPartList.java,v
retrieving revision 1.11
diff -u -r1.11 BasicPartList.java
--- Eclipse UI/org/eclipse/ui/internal/presentations/BasicPartList.java	8 May 2006 20:55:45 -0000	1.11
+++ Eclipse UI/org/eclipse/ui/internal/presentations/BasicPartList.java	11 Sep 2006 20:23:12 -0000
@@ -23,7 +23,7 @@
 import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerSorter;
+import org.eclipse.jface.viewers.ViewerComparator;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Font;
 import org.eclipse.swt.graphics.FontData;
@@ -47,7 +47,11 @@
     
     private class BasicStackListContentProvider implements
             IStructuredContentProvider {
-
+    	
+    	/**
+    	 * Constructor for stack list content provider.
+    	 *
+    	 */
         public BasicStackListContentProvider() {
             //no-op
         }
@@ -74,6 +78,10 @@
 
         private Font boldFont = null;
 
+        /**
+         * Constructor for stack list label provider.
+         *
+         */
         public BasicStackListLabelProvider() {
             //no-op
         }
@@ -123,14 +131,17 @@
         }
     }
 
-    private class BasicStackListViewerSorter extends ViewerSorter {
-
-        public BasicStackListViewerSorter() {
+    private class BasicStackListViewerComparator extends ViewerComparator {
+    	/**
+    	 * Constructor for stack list viewer's comparator.
+    	 *
+    	 */
+        public BasicStackListViewerComparator() {
             //no-op
         }
 
         /* (non-Javadoc)
-         * @see org.eclipse.jface.viewers.ViewerSorter#compare(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)
+         * @see org.eclipse.jface.viewers.ViewerComparator#compare(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)
          */
         public int compare(Viewer viewer, Object e1, Object e2) {
             int cat1 = category(e1);
@@ -140,8 +151,6 @@
 				return cat1 - cat2;
 			}
 
-            // cat1 == cat2
-
             String name1;
             String name2;
 
@@ -176,11 +185,11 @@
             if (name2 == null) {
 				name2 = "";//$NON-NLS-1$
 			}
-            return collator.compare(name1, name2);
+            return getComparator().compare(name1, name2);
         }
 
         /* (non-Javadoc)
-         * @see org.eclipse.jface.viewers.ViewerSorter#category(java.lang.Object)
+         * @see org.eclipse.jface.viewers.ViewerComparator#category(java.lang.Object)
          */
         public int category(Object element) {
 
@@ -194,6 +203,15 @@
         }
     }
 
+    /**
+     * Constructor for BasicPartList.
+     * 
+     * @param parent the parent shell
+     * @param shellStyle the SWT style bits used to create the shell
+     * @param treeStyle	the SWT style bits used to create the tree
+     * @param site 
+     * @param folder 
+     */
     public BasicPartList(Shell parent, int shellStyle, int treeStyle, 
             IStackPresentationSite site, PresentablePartFolder folder) {
         super(parent, shellStyle, treeStyle);
@@ -229,7 +247,7 @@
         };
         tableViewer.addFilter(new NamePatternFilter());
         tableViewer.setContentProvider(new BasicStackListContentProvider());
-        tableViewer.setSorter(new BasicStackListViewerSorter());
+        tableViewer.setComparator(new BasicStackListViewerComparator());
         tableViewer.setLabelProvider(new BasicStackListLabelProvider());
         return tableViewer;
     }
Index: Eclipse UI/org/eclipse/ui/dialogs/TypeFilteringDialog.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/TypeFilteringDialog.java,v
retrieving revision 1.21
diff -u -r1.21 TypeFilteringDialog.java
--- Eclipse UI/org/eclipse/ui/dialogs/TypeFilteringDialog.java	8 May 2006 20:55:32 -0000	1.21
+++ Eclipse UI/org/eclipse/ui/dialogs/TypeFilteringDialog.java	11 Sep 2006 20:23:11 -0000
@@ -20,7 +20,7 @@
 
 import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.jface.viewers.CheckboxTableViewer;
-import org.eclipse.jface.viewers.ViewerSorter;
+import org.eclipse.jface.viewers.ViewerComparator;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
@@ -219,7 +219,7 @@
         listViewer.setLabelProvider(FileEditorMappingLabelProvider.INSTANCE);
         listViewer
                 .setContentProvider(FileEditorMappingContentProvider.INSTANCE);
-        listViewer.setSorter(new ViewerSorter());
+        listViewer.setComparator(new ViewerComparator());
         addSelectionButtons(composite);
         createUserEntryGroup(composite);
         initializeViewer();
Index: Eclipse UI/org/eclipse/ui/activities/ActivityCategoryPreferencePage.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/activities/ActivityCategoryPreferencePage.java,v
retrieving revision 1.13
diff -u -r1.13 ActivityCategoryPreferencePage.java
--- Eclipse UI/org/eclipse/ui/activities/ActivityCategoryPreferencePage.java	14 Aug 2006 17:56:07 -0000	1.13
+++ Eclipse UI/org/eclipse/ui/activities/ActivityCategoryPreferencePage.java	11 Sep 2006 20:23:11 -0000
@@ -38,8 +38,8 @@
 import org.eclipse.jface.viewers.SelectionChangedEvent;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.jface.viewers.ViewerComparator;
 import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.jface.viewers.ViewerSorter;
 import org.eclipse.osgi.util.NLS;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
@@ -549,7 +549,7 @@
                 true);
         workingCopy.addActivityManagerListener(categoryLabelProvider);
         categoryViewer.setLabelProvider(categoryLabelProvider);
-        categoryViewer.setSorter(new ViewerSorter());
+        categoryViewer.setComparator(new ViewerComparator());
         categoryViewer.addFilter(new EmptyCategoryFilter());
 
         categoryViewer