Attachment #49507 for bug #154884





import org.eclipse.jface.dialogs.IDialogSettings;
import org.eclipse.jface.viewers.Viewer;
import org.eclipse.jface.viewers.ViewerComparator;

/**
 * CategorySorter is the sorter that takes categories and the viewer into
 * account.
 * 
 */
public class CategorySorter extends ViewerComparator implements Comparator {
	TableSorter innerSorter;

	IField categoryField;




import org.eclipse.jface.viewers.SelectionChangedEvent;
import org.eclipse.jface.viewers.TableLayout;
import org.eclipse.jface.viewers.Viewer;
import org.eclipse.jface.viewers.ViewerComparator;
import org.eclipse.jface.wizard.ProgressMonitorPart;
import org.eclipse.osgi.util.NLS;
import org.eclipse.swt.SWT;


	private MarkerView markerView;

	private ViewerComparator resolutionsSorter;

	private boolean calculatingResolutions;



		resolutionsList.setInput(this);

		resolutionsList.setComparator(resolutionsSorter);

		FormData listData = new FormData();
		listData.top = new FormAttachment(resolutionsLabel, 0);

	 * Create the resolutions sorter.
	 */
	private void initializeResolutionsSorter() {
		resolutionsSorter = new ViewerComparator() {
			/*
			 * (non-Javadoc)
			 * 
			 * @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) {

Lines 17-25 Link Here

(-)src/org/eclipse/ui/views/markers/internal/TableSorter.java (-2 / +2 lines)
17	import org.eclipse.jface.dialogs.IDialogSettings;	17	import org.eclipse.jface.dialogs.IDialogSettings;
18	import org.eclipse.jface.viewers.TreeViewer;	18	import org.eclipse.jface.viewers.TreeViewer;
19	import org.eclipse.jface.viewers.Viewer;	19	import org.eclipse.jface.viewers.Viewer;
20	import org.eclipse.jface.viewers.ViewerSorter;	20	import org.eclipse.jface.viewers.ViewerComparator;
21		21
22	public class TableSorter extends ViewerSorter implements Comparator {	22	public class TableSorter extends ViewerComparator implements Comparator {
23		23
24	public static final int MAX_DEPTH = 4;	24	public static final int MAX_DEPTH = 4;
25		25




import org.eclipse.jface.viewers.TableLayout;
import org.eclipse.jface.viewers.TreeViewer;
import org.eclipse.jface.viewers.Viewer;
import org.eclipse.jface.viewers.ViewerComparator;
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.BusyIndicator;
import org.eclipse.swt.events.KeyAdapter;

			}
		});

		viewer.setComparator(buildSorter());
		setSortIndicators();

		// create the actions before the input is set on the viewer but after

	 * @param sorter2
	 */
	void setSorter(TableSorter sorter2) {
		viewer.setComparator(sorter2);
		updateForNewSorter(sorter2);
	}


	 * 
	 * @return TableSorter
	 */
	protected ViewerComparator buildSorter() {

		IField[] sortingFields = getSortingFields();
		int[] priorities = new int[sortingFields.length];

	 * @return TableSorter
	 */
	TableSorter getTableSorter() {
		return (TableSorter) viewer.getComparator();
	}

	protected abstract void handleKeyPressed(KeyEvent event);




import org.eclipse.jface.viewers.StructuredSelection;
import org.eclipse.jface.viewers.TableLayout;
import org.eclipse.jface.viewers.Viewer;
import org.eclipse.jface.viewers.ViewerComparator;
import org.eclipse.jface.window.Window;
import org.eclipse.osgi.util.NLS;
import org.eclipse.swt.SWT;

		typesViewer.getControl().setLayoutData(gridData);
		typesViewer.setContentProvider(typesContentProvider);
		typesViewer.setLabelProvider(getLabelProvider());
		typesViewer.setComparator(getComparator());
		typesViewer.addCheckStateListener(new ICheckStateListener() {
			public void checkStateChanged(CheckStateChangedEvent event) {
				markDirty();

	 * 
	 * @return ViewerSorter
	 */
	protected ViewerComparator getComparator() {
		return new ViewerComparator() {
			/*
			 * (non-Javadoc)
			 * 

			 *      java.lang.Object, java.lang.Object)
			 */
			public int compare(Viewer viewer, Object e1, Object e2) {
				return getComparator().compare(((AbstractNode) e1).getName(),
						((AbstractNode) e2).getName());
			}
		};




import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.SubProgressMonitor;
import org.eclipse.jface.viewers.ViewerComparator;
import org.eclipse.osgi.util.NLS;

/**

	 * @return CategorySorter
	 */
	public CategorySorter getCategorySorter() {
		return (CategorySorter) view.getViewer().getComparator();
	}

	/**

			if (monitor.isCanceled())
				return;

			ViewerComparator sorter = view.getViewer().getComparator();

			if (markerLimit == -1 || isShowingHierarchy()) {
				sorter.sort(view.getViewer(), newMarkers.toArray());

	 */
	private boolean isShowingHierarchy() {

		ViewerComparator sorter = view.getViewer().getComparator();
		if (sorter instanceof CategorySorter) {
			return ((CategorySorter) sorter).getCategoryField() != null;
		}

Lines 13-19 Link Here

(-)src/org/eclipse/ui/views/markers/internal/ProblemView.java (-4 / +5 lines)
13		13
14	package org.eclipse.ui.views.markers.internal;	14	package org.eclipse.ui.views.markers.internal;
15		15
16	import com.ibm.icu.text.MessageFormat;
17	import java.util.ArrayList;	16	import java.util.ArrayList;
18	import java.util.Collection;	17	import java.util.Collection;
19	import java.util.Iterator;	18	import java.util.Iterator;
Lines 33-39 Link Here
33	import org.eclipse.jface.viewers.ColumnLayoutData;	32	import org.eclipse.jface.viewers.ColumnLayoutData;
34	import org.eclipse.jface.viewers.IStructuredSelection;	33	import org.eclipse.jface.viewers.IStructuredSelection;
35	import org.eclipse.jface.viewers.TableLayout;	34	import org.eclipse.jface.viewers.TableLayout;
36	import org.eclipse.jface.viewers.ViewerSorter;	35	import org.eclipse.jface.viewers.ViewerComparator;
37	import org.eclipse.osgi.util.NLS;	36	import org.eclipse.osgi.util.NLS;
38	import org.eclipse.swt.widgets.Composite;	37	import org.eclipse.swt.widgets.Composite;
39	import org.eclipse.ui.IMemento;	38	import org.eclipse.ui.IMemento;
Lines 45-50 Link Here
45	import org.eclipse.ui.internal.ide.IDEWorkbenchPlugin;	44	import org.eclipse.ui.internal.ide.IDEWorkbenchPlugin;
46	import org.eclipse.ui.progress.IWorkbenchSiteProgressService;	45	import org.eclipse.ui.progress.IWorkbenchSiteProgressService;
47		46
		47	import com.ibm.icu.text.MessageFormat;
		48
48	/**	49	/**
49	* The ProblemView is the view that displays problem markers.	50	* The ProblemView is the view that displays problem markers.
50	*	51	*
Lines 446-452 Link Here
446	* @see org.eclipse.ui.views.markers.internal.MarkerView#getTableSorter()	447	* @see org.eclipse.ui.views.markers.internal.MarkerView#getTableSorter()
447	*/	448	*/
448	public TableSorter getTableSorter() {	449	public TableSorter getTableSorter() {
449	return ((CategorySorter) getViewer().getSorter()).innerSorter;	450	return ((CategorySorter) getViewer().getComparator()).innerSorter;
450	}	451	}
451		452
452	/*	453	/*
Lines 501-507 Link Here
501	*	502	*
502	* @see org.eclipse.ui.views.markers.internal.TableView#buildSorter()	503	* @see org.eclipse.ui.views.markers.internal.TableView#buildSorter()
503	*/	504	*/
504	protected ViewerSorter buildSorter() {	505	protected ViewerComparator buildSorter() {
505		506
506	TableSorter sorter = TableSorter.createTableSorter(getSortingFields());	507	TableSorter sorter = TableSorter.createTableSorter(getSortingFields());
507	sorter.restoreState(getDialogSettings());	508	sorter.restoreState(getDialogSettings());

Lines 18-24 Link Here

(-)src/org/eclipse/ui/internal/ide/misc/CheckboxTreeAndListGroup.java (-7 / +17 lines)
18	import java.util.Set;	18	import java.util.Set;
19		19
20	import org.eclipse.core.commands.common.EventManager;	20	import org.eclipse.core.commands.common.EventManager;
21	import org.eclipse.core.runtime.Platform;	21	import org.eclipse.core.runtime.SafeRunner;
22	import org.eclipse.jface.util.SafeRunnable;	22	import org.eclipse.jface.util.SafeRunnable;
23	import org.eclipse.jface.viewers.CheckStateChangedEvent;	23	import org.eclipse.jface.viewers.CheckStateChangedEvent;
24	import org.eclipse.jface.viewers.CheckboxTableViewer;	24	import org.eclipse.jface.viewers.CheckboxTableViewer;
Lines 33-39 Link Here
33	import org.eclipse.jface.viewers.SelectionChangedEvent;	33	import org.eclipse.jface.viewers.SelectionChangedEvent;
34	import org.eclipse.jface.viewers.StructuredSelection;	34	import org.eclipse.jface.viewers.StructuredSelection;
35	import org.eclipse.jface.viewers.TreeExpansionEvent;	35	import org.eclipse.jface.viewers.TreeExpansionEvent;
36	import org.eclipse.jface.viewers.ViewerSorter;	36	import org.eclipse.jface.viewers.ViewerComparator;
37	import org.eclipse.swt.SWT;	37	import org.eclipse.swt.SWT;
38	import org.eclipse.swt.custom.BusyIndicator;	38	import org.eclipse.swt.custom.BusyIndicator;
39	import org.eclipse.swt.layout.GridData;	39	import org.eclipse.swt.layout.GridData;
Lines 432-437 Link Here
432		432
433	/**	433	/**
434	* Set the initial checked state of the passed list element to true.	434	* Set the initial checked state of the passed list element to true.
		435	*
		436	* @param element the element in the list to select
435	*/	437	*/
436	public void initialCheckListItem(Object element) {	438	public void initialCheckListItem(Object element) {
437	Object parent = treeContentProvider.getParent(element);	439	Object parent = treeContentProvider.getParent(element);
Lines 444-449 Link Here
444	/**	446	/**
445	* Set the initial checked state of the passed element to true,	447	* Set the initial checked state of the passed element to true,
446	* as well as to all of its children and associated list elements	448	* as well as to all of its children and associated list elements
		449	*
		450	* @param element the element in the tree to select
447	*/	451	*/
448	public void initialCheckTreeItem(Object element) {	452	public void initialCheckTreeItem(Object element) {
449	treeItemChecked(element, true);	453	treeItemChecked(element, true);
Lines 498-504 Link Here
498	Object[] array = getListeners();	502	Object[] array = getListeners();
499	for (int i = 0; i < array.length; i++) {	503	for (int i = 0; i < array.length; i++) {
500	final ICheckStateListener l = (ICheckStateListener) array[i];	504	final ICheckStateListener l = (ICheckStateListener) array[i];
501	Platform.run(new SafeRunnable() {	505	SafeRunner.run(new SafeRunnable() {
502	public void run() {	506	public void run() {
503	l.checkStateChanged(event);	507	l.checkStateChanged(event);
504	}	508	}
Lines 560-565 Link Here
560	/**	564	/**
561	* Select or deselect all of the elements in the tree depending on the value of the selection	565	* Select or deselect all of the elements in the tree depending on the value of the selection
562	* boolean. Be sure to update the displayed files as well.	566	* boolean. Be sure to update the displayed files as well.
		567	*
		568	* @param selection boolean indicating whether or not to select all elements
563	*/	569	*/
564	public void setAllSelections(final boolean selection) {	570	public void setAllSelections(final boolean selection) {
565		571
Lines 587-595 Link Here
587		593
588	/**	594	/**
589	* Set the sorter that is to be applied to self's list viewer	595	* Set the sorter that is to be applied to self's list viewer
		596	*
		597	* @param sorter the sorter for the list viewer
590	*/	598	*/
591	public void setListSorter(ViewerSorter sorter) {	599	public void setListSorter(ViewerComparator sorter) {
592	listViewer.setSorter(sorter);	600	listViewer.setComparator(sorter);
593	}	601	}
594		602
595	/**	603	/**
Lines 649-657 Link Here
649		657
650	/**	658	/**
651	* Set the sorter that is to be applied to self's tree viewer	659	* Set the sorter that is to be applied to self's tree viewer
		660	*
		661	* @param sorter the sorter for the tree
652	*/	662	*/
653	public void setTreeSorter(ViewerSorter sorter) {	663	public void setTreeSorter(ViewerComparator sorter) {
654	treeViewer.setSorter(sorter);	664	treeViewer.setComparator(sorter);
655	}	665	}
656		666
657	/**	667	/**

Lines 51-57 Link Here

(-)src/org/eclipse/ui/internal/wizards/datatransfer/WizardProjectsImportPage.java (-2 / +2 lines)
51	import org.eclipse.jface.viewers.ITreeContentProvider;	51	import org.eclipse.jface.viewers.ITreeContentProvider;
52	import org.eclipse.jface.viewers.LabelProvider;	52	import org.eclipse.jface.viewers.LabelProvider;
53	import org.eclipse.jface.viewers.Viewer;	53	import org.eclipse.jface.viewers.Viewer;
54	import org.eclipse.jface.viewers.ViewerSorter;	54	import org.eclipse.jface.viewers.ViewerComparator;
55	import org.eclipse.jface.wizard.WizardPage;	55	import org.eclipse.jface.wizard.WizardPage;
56	import org.eclipse.osgi.util.NLS;	56	import org.eclipse.osgi.util.NLS;
57	import org.eclipse.swt.SWT;	57	import org.eclipse.swt.SWT;
Lines 406-412 Link Here
406	});	406	});
407		407
408	projectsList.setInput(this);	408	projectsList.setInput(this);
409	projectsList.setSorter(new ViewerSorter());	409	projectsList.setComparator(new ViewerComparator());
410	createSelectionButtons(listComposite);	410	createSelectionButtons(listComposite);
411	}	411	}
412		412

Lines 177-183 Link Here

(-)src/org/eclipse/ui/internal/ide/dialogs/ResourceWorkingSetPage.java (-1 / +1 lines)
177	.getWorkbench().getDecoratorManager()	177	.getWorkbench().getDecoratorManager()
178	.getLabelDecorator()));	178	.getLabelDecorator()));
179	tree.setInput(IDEWorkbenchPlugin.getPluginWorkspace().getRoot());	179	tree.setInput(IDEWorkbenchPlugin.getPluginWorkspace().getRoot());
180	tree.setSorter(new ResourceSorter(ResourceSorter.NAME));	180	tree.setComparator(new ResourceSorter(ResourceSorter.NAME));
181		181
182	data = new GridData(GridData.FILL_BOTH \| GridData.GRAB_VERTICAL);	182	data = new GridData(GridData.FILL_BOTH \| GridData.GRAB_VERTICAL);
183	data.heightHint = SIZING_SELECTION_WIDGET_HEIGHT;	183	data.heightHint = SIZING_SELECTION_WIDGET_HEIGHT;




import org.eclipse.core.resources.IContainer;
import org.eclipse.core.resources.IResource;
import org.eclipse.jface.viewers.Viewer;
import org.eclipse.jface.viewers.ViewerComparator;

/**
 * Sorter for viewers that display items of type <code>IResource</code>.

 * This class may be instantiated; it is not intended to be subclassed.
 * </p>
 */
public class ResourceSorter extends ViewerComparator {

    /**
     * Constructor argument value that indicates to sort items by name.

     *  element is greater than the second element
     */
    protected int compareNames(IResource resource1, IResource resource2) {
        return getComparator().compare(resource1.getName(), resource2.getName());
    }

    /**

        // 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 = getComparator().compare(ext1, ext2);

        if (result != 0) {
			return result;




import org.eclipse.jface.viewers.SelectionChangedEvent;
import org.eclipse.jface.viewers.StructuredSelection;
import org.eclipse.jface.viewers.TreeExpansionEvent;
import org.eclipse.jface.viewers.ViewerComparator;
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.BusyIndicator;
import org.eclipse.swt.layout.GridData;


    /**
     * Set the sorter that is to be applied to self's list viewer
     * 
     * @param sorter the sorter for the list
     */
    public void setListSorter(ViewerComparator sorter) {
        listViewer.setComparator(sorter);
    }

    /**


    /**
     * Set the sorter that is to be applied to self's tree viewer
     * 
     * @param sorter the sorter for the tree
     */
    public void setTreeSorter(ViewerComparator sorter) {
        treeViewer.setComparator(sorter);
    }

    /**

Lines 191-197 Link Here

(-)src/org/eclipse/ui/internal/ide/dialogs/CleanDialog.java (-1 / +1 lines)
191	projectNames = CheckboxTableViewer.newCheckList(radioGroup, SWT.BORDER);	191	projectNames = CheckboxTableViewer.newCheckList(radioGroup, SWT.BORDER);
192	projectNames.setContentProvider(new WorkbenchContentProvider());	192	projectNames.setContentProvider(new WorkbenchContentProvider());
193	projectNames.setLabelProvider(new WorkbenchLabelProvider());	193	projectNames.setLabelProvider(new WorkbenchLabelProvider());
194	projectNames.setSorter(new ResourceSorter(ResourceSorter.NAME));	194	projectNames.setComparator(new ResourceSorter(ResourceSorter.NAME));
195	projectNames.addFilter(new ViewerFilter() {	195	projectNames.addFilter(new ViewerFilter() {
196	private final IProject[] projectHolder = new IProject[1];	196	private final IProject[] projectHolder = new IProject[1];
197	public boolean select(Viewer viewer, Object parentElement, Object element) {	197	public boolean select(Viewer viewer, Object parentElement, Object element) {




import org.eclipse.jface.viewers.StructuredSelection;
import org.eclipse.jface.viewers.TableViewer;
import org.eclipse.jface.viewers.Viewer;
import org.eclipse.jface.viewers.ViewerComparator;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.DisposeListener;
import org.eclipse.swt.graphics.Image;

		// Display a list of jobs that have reported errors
		jobListViewer = new TableViewer(parent, SWT.SINGLE | SWT.H_SCROLL
				| SWT.V_SCROLL | SWT.BORDER);
		jobListViewer.setComparator(getViewerSorter());
		Control control = jobListViewer.getControl();
		GridData data = new GridData(GridData.FILL_BOTH
				| GridData.GRAB_HORIZONTAL | GridData.GRAB_VERTICAL);

	 * 
	 * @return ViewerSorter
	 */
	private ViewerComparator getViewerSorter() {
		return new ViewerComparator() {
			/*
			 * (non-Javadoc)
			 * 
			 * @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) {

Lines 15-21 Link Here

(-)Eclipse UI/org/eclipse/ui/internal/progress/DetailedProgressViewer.java (-2 / +2 lines)
15		15
16	import org.eclipse.jface.dialogs.IDialogConstants;	16	import org.eclipse.jface.dialogs.IDialogConstants;
17	import org.eclipse.jface.resource.JFaceResources;	17	import org.eclipse.jface.resource.JFaceResources;
18	import org.eclipse.jface.viewers.ViewerSorter;	18	import org.eclipse.jface.viewers.ViewerComparator;
19	import org.eclipse.swt.SWT;	19	import org.eclipse.swt.SWT;
20	import org.eclipse.swt.custom.ScrolledComposite;	20	import org.eclipse.swt.custom.ScrolledComposite;
21	import org.eclipse.swt.events.FocusAdapter;	21	import org.eclipse.swt.events.FocusAdapter;
Lines 105-111 Link Here
105	* @see org.eclipse.ui.internal.progress.AbstractProgressViewer#add(java.lang.Object[])	105	* @see org.eclipse.ui.internal.progress.AbstractProgressViewer#add(java.lang.Object[])
106	*/	106	*/
107	public void add(Object[] elements) {	107	public void add(Object[] elements) {
108	ViewerSorter sorter = getSorter();	108	ViewerComparator sorter = getComparator();
109	ArrayList newItems = new ArrayList(control.getChildren().length	109	ArrayList newItems = new ArrayList(control.getChildren().length
110	+ elements.length);	110	+ elements.length);
111		111




import org.eclipse.core.runtime.QualifiedName;
import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.jface.viewers.Viewer;
import org.eclipse.jface.viewers.ViewerComparator;
import org.eclipse.jface.window.IShellProvider;
import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.GC;

	 * 
	 * @return ViewerSorter
	 */
	static ViewerComparator getProgressViewerSorter() {
		return new ViewerComparator() {
			/*
			 * (non-Javadoc)
			 * 
			 * @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) {




import org.eclipse.jface.dialogs.IconAndMessageDialog;
import org.eclipse.jface.resource.JFaceResources;
import org.eclipse.jface.viewers.Viewer;
import org.eclipse.jface.viewers.ViewerComparator;
import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.Cursor;
import org.eclipse.swt.graphics.Image;

	void showJobDetails(Composite parent) {
		viewer = new DetailedProgressViewer(parent, SWT.MULTI | SWT.H_SCROLL
				| SWT.V_SCROLL | SWT.BORDER);
		viewer.setComparator(new ViewerComparator() {
			/*
			 * (non-Javadoc)
			 * 
			 * @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) {

Lines 170-176 Link Here

(-)Eclipse UI/org/eclipse/ui/internal/progress/ProgressRegion.java (-1 / +1 lines)
170	viewer.setContentProvider(provider);	170	viewer.setContentProvider(provider);
171	viewer.setInput(provider);	171	viewer.setInput(provider);
172	viewer.setLabelProvider(new ProgressViewerLabelProvider(viewerControl));	172	viewer.setLabelProvider(new ProgressViewerLabelProvider(viewerControl));
173	viewer.setSorter(ProgressManagerUtil.getProgressViewerSorter());	173	viewer.setComparator(ProgressManagerUtil.getProgressViewerSorter());
174	return region;	174	return region;
175	}	175	}
176		176

Lines 53-59 Link Here

(-)Eclipse UI/org/eclipse/ui/internal/progress/ProgressView.java (-1 / +1 lines)
53	*/	53	*/
54	public void createPartControl(Composite parent) {	54	public void createPartControl(Composite parent) {
55	viewer = new DetailedProgressViewer(parent, SWT.MULTI);	55	viewer = new DetailedProgressViewer(parent, SWT.MULTI);
56	viewer.setSorter(ProgressManagerUtil.getProgressViewerSorter());	56	viewer.setComparator(ProgressManagerUtil.getProgressViewerSorter());
57		57
58	viewer.getControl().setLayoutData(	58	viewer.getControl().setLayoutData(
59	new GridData(SWT.FILL, SWT.FILL, true, true));	59	new GridData(SWT.FILL, SWT.FILL, true, true));




import org.eclipse.jface.dialogs.ProgressMonitorDialog;
import org.eclipse.jface.operation.IRunnableWithProgress;
import org.eclipse.jface.viewers.Viewer;
import org.eclipse.jface.viewers.ViewerComparator;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;


            viewer = new DetailedProgressViewer(viewerComposite, SWT.MULTI
                    | SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER);
            viewer.setComparator(new ViewerComparator() {
                /*
                 * (non-Javadoc)
                 * 
                 * @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) {

Lines 10-16 Link Here

(-)Eclipse UI/org/eclipse/ui/internal/themes/ColorsAndFontsPreferencePage.java (-4 / +5 lines)
10	*******************************************************************************/	10	*******************************************************************************/
11	package org.eclipse.ui.internal.themes;	11	package org.eclipse.ui.internal.themes;
12		12
13	import com.ibm.icu.text.MessageFormat;
14	import java.util.ArrayList;	13	import java.util.ArrayList;
15	import java.util.Arrays;	14	import java.util.Arrays;
16	import java.util.HashMap;	15	import java.util.HashMap;
Lines 42-48 Link Here
42	import org.eclipse.jface.viewers.SelectionChangedEvent;	41	import org.eclipse.jface.viewers.SelectionChangedEvent;
43	import org.eclipse.jface.viewers.StructuredSelection;	42	import org.eclipse.jface.viewers.StructuredSelection;
44	import org.eclipse.jface.viewers.Viewer;	43	import org.eclipse.jface.viewers.Viewer;
45	import org.eclipse.jface.viewers.ViewerSorter;	44	import org.eclipse.jface.viewers.ViewerComparator;
46	import org.eclipse.swt.SWT;	45	import org.eclipse.swt.SWT;
47	import org.eclipse.swt.custom.StackLayout;	46	import org.eclipse.swt.custom.StackLayout;
48	import org.eclipse.swt.events.DisposeEvent;	47	import org.eclipse.swt.events.DisposeEvent;
Lines 82-87 Link Here
82	import org.eclipse.ui.themes.IThemeManager;	81	import org.eclipse.ui.themes.IThemeManager;
83	import org.eclipse.ui.themes.IThemePreview;	82	import org.eclipse.ui.themes.IThemePreview;
84		83
		84	import com.ibm.icu.text.MessageFormat;
		85
85	/**	86	/**
86	* Preference page for management of system colors, gradients and fonts.	87	* Preference page for management of system colors, gradients and fonts.
87	*	88	*
Lines 862-870 Link Here
862		863
863	tree.getViewer().setLabelProvider(labelProvider);	864	tree.getViewer().setLabelProvider(labelProvider);
864	tree.getViewer().setContentProvider(new ThemeContentProvider());	865	tree.getViewer().setContentProvider(new ThemeContentProvider());
865	tree.getViewer().setSorter(new ViewerSorter() {	866	tree.getViewer().setComparator(new ViewerComparator() {
866	/* (non-Javadoc)	867	/* (non-Javadoc)
867	* @see org.eclipse.jface.viewers.ViewerSorter#category(java.lang.Object)	868	* @see org.eclipse.jface.viewers.ViewerComparator#category(java.lang.Object)
868	*/	869	*/
869	public int category(Object element) {	870	public int category(Object element) {
870	if (element instanceof ThemeElementCategory) {	871	if (element instanceof ThemeElementCategory) {

Lines 299-305 Link Here

(-)Eclipse UI/org/eclipse/ui/internal/dialogs/NewWizardNewPage.java (-1 / +1 lines)
299	final TreeViewer treeViewer = filterTree.getViewer();	299	final TreeViewer treeViewer = filterTree.getViewer();
300	treeViewer.setContentProvider(new WizardContentProvider());	300	treeViewer.setContentProvider(new WizardContentProvider());
301	treeViewer.setLabelProvider(new WorkbenchLabelProvider());	301	treeViewer.setLabelProvider(new WorkbenchLabelProvider());
302	treeViewer.setSorter(NewWizardCollectionSorter.INSTANCE);	302	treeViewer.setComparator(NewWizardCollectionSorter.INSTANCE);
303	treeViewer.addSelectionChangedListener(this);	303	treeViewer.addSelectionChangedListener(this);
304		304
305	ArrayList inputArray = new ArrayList();	305	ArrayList inputArray = new ArrayList();

Lines 12-18 Link Here

(-)Eclipse UI/org/eclipse/ui/internal/dialogs/DataTransferWizardCollectionSorter.java (-2 / +2 lines)
12	package org.eclipse.ui.internal.dialogs;	12	package org.eclipse.ui.internal.dialogs;
13		13
14	import org.eclipse.jface.viewers.IBasicPropertyConstants;	14	import org.eclipse.jface.viewers.IBasicPropertyConstants;
15	import org.eclipse.jface.viewers.ViewerSorter;	15	import org.eclipse.jface.viewers.ViewerComparator;
16	import org.eclipse.ui.internal.registry.WizardsRegistryReader;	16	import org.eclipse.ui.internal.registry.WizardsRegistryReader;
17		17
18	/**	18	/**
Lines 28-34 Link Here
28	*	28	*
29	* @since 3.2	29	* @since 3.2
30	*/	30	*/
31	class DataTransferWizardCollectionSorter extends ViewerSorter {	31	class DataTransferWizardCollectionSorter extends ViewerComparator {
32	/**	32	/**
33	* Static instance of this class.	33	* Static instance of this class.
34	*/	34	*/




import org.eclipse.jface.viewers.SelectionChangedEvent;
import org.eclipse.jface.viewers.TreeViewer;
import org.eclipse.jface.viewers.Viewer;
import org.eclipse.jface.viewers.ViewerComparator;
import org.eclipse.jface.window.Window;
import org.eclipse.osgi.util.NLS;
import org.eclipse.osgi.util.TextProcessor;

        }
    }

    private class FileSpecSorter extends ViewerComparator {
		public int category(Object element) {
			// only Spec objects in here - unchecked cast
			return ((Spec)element).sortValue;

        }
        {
            fileAssociationViewer = new ListViewer(composite);
            fileAssociationViewer.setComparator(new FileSpecSorter());
            fileAssociationViewer.getControl().setFont(composite.getFont());
            fileAssociationViewer
                    .setContentProvider(new FileSpecContentProvider());

                    .setContentProvider(new ContentTypesContentProvider());
            contentTypesViewer
                    .setLabelProvider(new ContentTypesLabelProvider());
            contentTypesViewer.setComparator(new ViewerComparator());
            contentTypesViewer.setInput(Platform.getContentTypeManager());
            GridData data = new GridData(GridData.FILL_BOTH);
            data.horizontalSpan = 2;




package org.eclipse.ui.internal.dialogs;

import org.eclipse.jface.viewers.Viewer;
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 ViewerComparator {

    /**
     * Creates a new sorter.

                    .getLabel());
            String str2 = DialogUtil.removeAccel(((IActionSetDescriptor) e2)
                    .getLabel());
            return getComparator().compare(str1, str2);
        }
        return 0;
    }

Lines 116-122 Link Here

(-)Eclipse UI/org/eclipse/ui/internal/dialogs/ImportExportPage.java (-1 / +1 lines)
116		116
117	viewer.setContentProvider(new WizardContentProvider());	117	viewer.setContentProvider(new WizardContentProvider());
118	viewer.setLabelProvider(new WorkbenchLabelProvider());	118	viewer.setLabelProvider(new WorkbenchLabelProvider());
119	viewer.setSorter(DataTransferWizardCollectionSorter.INSTANCE);	119	viewer.setComparator(DataTransferWizardCollectionSorter.INSTANCE);
120		120
121	ArrayList inputArray = new ArrayList();	121	ArrayList inputArray = new ArrayList();
122	boolean expandTop = false;	122	boolean expandTop = false;

Lines 12-18 Link Here

(-)Eclipse UI/org/eclipse/ui/internal/dialogs/NewWizardCollectionSorter.java (-2 / +2 lines)
12	package org.eclipse.ui.internal.dialogs;	12	package org.eclipse.ui.internal.dialogs;
13		13
14	import org.eclipse.jface.viewers.IBasicPropertyConstants;	14	import org.eclipse.jface.viewers.IBasicPropertyConstants;
15	import org.eclipse.jface.viewers.ViewerSorter;	15	import org.eclipse.jface.viewers.ViewerComparator;
16	import org.eclipse.ui.internal.registry.WizardsRegistryReader;	16	import org.eclipse.ui.internal.registry.WizardsRegistryReader;
17		17
18	/**	18	/**
Lines 24-30 Link Here
24	* name for base Wizards will always be sorted such that it will	24	* name for base Wizards will always be sorted such that it will
25	* ultimately be placed at the beginning of the sorted result.	25	* ultimately be placed at the beginning of the sorted result.
26	*/	26	*/
27	class NewWizardCollectionSorter extends ViewerSorter {	27	class NewWizardCollectionSorter extends ViewerComparator {
28	/**	28	/**
29	* Static instance of this class.	29	* Static instance of this class.
30	*/	30	*/

Lines 210-216 Link Here

(-)Eclipse UI/org/eclipse/ui/internal/dialogs/ShowViewDialog.java (-1 / +1 lines)
210		210
211	treeViewer.setLabelProvider(new ViewLabelProvider(window, dimmedForeground));	211	treeViewer.setLabelProvider(new ViewLabelProvider(window, dimmedForeground));
212	treeViewer.setContentProvider(new ViewContentProvider());	212	treeViewer.setContentProvider(new ViewContentProvider());
213	treeViewer.setSorter(new ViewSorter((ViewRegistry) viewReg));	213	treeViewer.setComparator(new ViewSorter((ViewRegistry) viewReg));
214	treeViewer.setInput(viewReg);	214	treeViewer.setInput(viewReg);
215	treeViewer.addSelectionChangedListener(this);	215	treeViewer.addSelectionChangedListener(this);
216	treeViewer.addDoubleClickListener(this);	216	treeViewer.addDoubleClickListener(this);

Lines 1092-1098 Link Here

(-)Eclipse UI/org/eclipse/ui/internal/dialogs/CustomizePerspectiveDialog.java (-1 / +1 lines)
1092	actionSetsViewer.getTable().setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));	1092	actionSetsViewer.getTable().setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
1093	actionSetsViewer.setLabelProvider(new WorkbenchLabelProvider());	1093	actionSetsViewer.setLabelProvider(new WorkbenchLabelProvider());
1094	actionSetsViewer.setContentProvider(new ArrayContentProvider());	1094	actionSetsViewer.setContentProvider(new ArrayContentProvider());
1095	actionSetsViewer.setSorter(new ActionSetSorter());	1095	actionSetsViewer.setComparator(new ActionSetSorter());
1096		1096
1097	// Menu and toolbar composite	1097	// Menu and toolbar composite
1098	Composite actionGroup = new Composite(sashComposite, SWT.NONE);	1098	Composite actionGroup = new Composite(sashComposite, SWT.NONE);




package org.eclipse.ui.internal.dialogs;

import org.eclipse.jface.viewers.Viewer;
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;

/**
 * This is used to sort views in a ShowViewDialog.
 */
public class ViewSorter extends ViewerComparator {
    private ViewRegistry viewReg;

    /**

                    .getLabel());
            String str2 = DialogUtil.removeAccel(((IViewDescriptor) e2)
                    .getLabel());
            return getComparator().compare(str1, str2);
        } else if (e1 instanceof IViewCategory) {
        	IViewCategory generalCategory = viewReg.findCategory(ViewRegistryReader.GENERAL_VIEW_ID);
        	if (generalCategory != null){

			}
            String str1 = DialogUtil.removeAccel(((IViewCategory) e1).getLabel());
            String str2 = DialogUtil.removeAccel(((IViewCategory) e2).getLabel());
            return getComparator().compare(str1, str2);
        }
        return 0;
    }

Lines 13-19 Link Here

(-)Eclipse UI/org/eclipse/ui/internal/keys/NewKeysPreferencePage.java (-4 / +5 lines)
13		13
14	import java.io.IOException;	14	import java.io.IOException;
15	import java.net.URL;	15	import java.net.URL;
16	import com.ibm.icu.text.Collator;
17	import java.util.ArrayList;	16	import java.util.ArrayList;
18	import java.util.Arrays;	17	import java.util.Arrays;
19	import java.util.Collection;	18	import java.util.Collection;
Lines 66-72 Link Here
66	import org.eclipse.jface.viewers.TreeNodeContentProvider;	65	import org.eclipse.jface.viewers.TreeNodeContentProvider;
67	import org.eclipse.jface.viewers.TreeViewer;	66	import org.eclipse.jface.viewers.TreeViewer;
68	import org.eclipse.jface.viewers.Viewer;	67	import org.eclipse.jface.viewers.Viewer;
69	import org.eclipse.jface.viewers.ViewerSorter;	68	import org.eclipse.jface.viewers.ViewerComparator;
70	import org.eclipse.swt.SWT;	69	import org.eclipse.swt.SWT;
71	import org.eclipse.swt.events.MouseAdapter;	70	import org.eclipse.swt.events.MouseAdapter;
72	import org.eclipse.swt.events.MouseEvent;	71	import org.eclipse.swt.events.MouseEvent;
Lines 101-106 Link Here
101	import org.eclipse.ui.internal.util.Util;	100	import org.eclipse.ui.internal.util.Util;
102	import org.eclipse.ui.keys.IBindingService;	101	import org.eclipse.ui.keys.IBindingService;
103		102
		103	import com.ibm.icu.text.Collator;
		104
104	/**	105	/**
105	* <p>	106	* <p>
106	* A preference page that is capable of displaying and editing the bindings	107	* A preference page that is capable of displaying and editing the bindings
Lines 425-431 Link Here
425	/**	426	/**
426	* Sorts the bindings in the filtered tree based on the current grouping.	427	* Sorts the bindings in the filtered tree based on the current grouping.
427	*/	428	*/
428	private final class BindingSorter extends ViewerSorter {	429	private final class BindingSorter extends ViewerComparator {
429		430
430	public final int category(final Object element) {	431	public final int category(final Object element) {
431	switch (grouping) {	432	switch (grouping) {
Lines 1134-1140 Link Here
1134	final TreeViewer viewer = filteredTree.getViewer();	1135	final TreeViewer viewer = filteredTree.getViewer();
1135	viewer.setLabelProvider(new BindingLabelProvider());	1136	viewer.setLabelProvider(new BindingLabelProvider());
1136	viewer.setContentProvider(new TreeNodeContentProvider());	1137	viewer.setContentProvider(new TreeNodeContentProvider());
1137	viewer.setSorter(new BindingSorter());	1138	viewer.setComparator(new BindingSorter());
1138		1139
1139	/*	1140	/*
1140	* Listen for selection changes so that the data controls can be	1141	* Listen for selection changes so that the data controls can be

Lines 23-29 Link Here

(-)Eclipse UI/org/eclipse/ui/internal/presentations/BasicPartList.java (-6 / +17 lines)
23	import org.eclipse.jface.viewers.LabelProvider;	23	import org.eclipse.jface.viewers.LabelProvider;
24	import org.eclipse.jface.viewers.TableViewer;	24	import org.eclipse.jface.viewers.TableViewer;
25	import org.eclipse.jface.viewers.Viewer;	25	import org.eclipse.jface.viewers.Viewer;
26	import org.eclipse.jface.viewers.ViewerSorter;	26	import org.eclipse.jface.viewers.ViewerComparator;
27	import org.eclipse.swt.SWT;	27	import org.eclipse.swt.SWT;
28	import org.eclipse.swt.graphics.Font;	28	import org.eclipse.swt.graphics.Font;
29	import org.eclipse.swt.graphics.FontData;	29	import org.eclipse.swt.graphics.FontData;
Lines 47-53 Link Here
47		47
48	private class BasicStackListContentProvider implements	48	private class BasicStackListContentProvider implements
49	IStructuredContentProvider {	49	IStructuredContentProvider {
50		50
		51	/**
		52	* Constructor for content provider.
		53	*
		54	*/
51	public BasicStackListContentProvider() {	55	public BasicStackListContentProvider() {
52	//no-op	56	//no-op
53	}	57	}
Lines 74-79 Link Here
74		78
75	private Font boldFont = null;	79	private Font boldFont = null;
76		80
		81	/**
		82	* Constructor for label provider.
		83	*
		84	*/
77	public BasicStackListLabelProvider() {	85	public BasicStackListLabelProvider() {
78	//no-op	86	//no-op
79	}	87	}
Lines 123-130 Link Here
123	}	131	}
124	}	132	}
125		133
126	private class BasicStackListViewerSorter extends ViewerSorter {	134	private class BasicStackListViewerSorter extends ViewerComparator {
127		135	/**
		136	* Constructor for sorter.
		137	*
		138	*/
128	public BasicStackListViewerSorter() {	139	public BasicStackListViewerSorter() {
129	//no-op	140	//no-op
130	}	141	}
Lines 176-182 Link Here
176	if (name2 == null) {	187	if (name2 == null) {
177	name2 = "";//$NON-NLS-1$	188	name2 = "";//$NON-NLS-1$
178	}	189	}
179	return collator.compare(name1, name2);	190	return getComparator().compare(name1, name2);
180	}	191	}
181		192
182	/* (non-Javadoc)	193	/* (non-Javadoc)
Lines 229-235 Link Here
229	};	240	};
230	tableViewer.addFilter(new NamePatternFilter());	241	tableViewer.addFilter(new NamePatternFilter());
231	tableViewer.setContentProvider(new BasicStackListContentProvider());	242	tableViewer.setContentProvider(new BasicStackListContentProvider());
232	tableViewer.setSorter(new BasicStackListViewerSorter());	243	tableViewer.setComparator(new BasicStackListViewerSorter());
233	tableViewer.setLabelProvider(new BasicStackListLabelProvider());	244	tableViewer.setLabelProvider(new BasicStackListLabelProvider());
234	return tableViewer;	245	return tableViewer;
235	}	246	}




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;

                true);
        workingCopy.addActivityManagerListener(categoryLabelProvider);
        categoryViewer.setLabelProvider(categoryLabelProvider);
        categoryViewer.setComparator(new ViewerComparator());
        categoryViewer.addFilter(new EmptyCategoryFilter());

        categoryViewer

Lines 20-26 Link Here

(-)Eclipse UI/org/eclipse/ui/dialogs/TypeFilteringDialog.java (-2 / +2 lines)
20		20
21	import org.eclipse.jface.dialogs.IDialogConstants;	21	import org.eclipse.jface.dialogs.IDialogConstants;
22	import org.eclipse.jface.viewers.CheckboxTableViewer;	22	import org.eclipse.jface.viewers.CheckboxTableViewer;
23	import org.eclipse.jface.viewers.ViewerSorter;	23	import org.eclipse.jface.viewers.ViewerComparator;
24	import org.eclipse.swt.SWT;	24	import org.eclipse.swt.SWT;
25	import org.eclipse.swt.events.SelectionAdapter;	25	import org.eclipse.swt.events.SelectionAdapter;
26	import org.eclipse.swt.events.SelectionEvent;	26	import org.eclipse.swt.events.SelectionEvent;
Lines 219-225 Link Here
219	listViewer.setLabelProvider(FileEditorMappingLabelProvider.INSTANCE);	219	listViewer.setLabelProvider(FileEditorMappingLabelProvider.INSTANCE);
220	listViewer	220	listViewer
221	.setContentProvider(FileEditorMappingContentProvider.INSTANCE);	221	.setContentProvider(FileEditorMappingContentProvider.INSTANCE);
222	listViewer.setSorter(new ViewerSorter());	222	listViewer.setComparator(new ViewerComparator());
223	addSelectionButtons(composite);	223	addSelectionButtons(composite);
224	createUserEntryGroup(composite);	224	createUserEntryGroup(composite);
225	initializeViewer();	225	initializeViewer();

Return to bug 154884

Lines 18-24 Link Here

(-)src/org/eclipse/ui/views/markers/internal/MarkerAdapter.java (-4 / +4 lines)
18	import org.eclipse.core.runtime.CoreException;	18	import org.eclipse.core.runtime.CoreException;
19	import org.eclipse.core.runtime.IProgressMonitor;	19	import org.eclipse.core.runtime.IProgressMonitor;
20	import org.eclipse.core.runtime.SubProgressMonitor;	20	import org.eclipse.core.runtime.SubProgressMonitor;
21	import org.eclipse.jface.viewers.ViewerSorter;	21	import org.eclipse.jface.viewers.ViewerComparator;
22	import org.eclipse.osgi.util.NLS;	22	import org.eclipse.osgi.util.NLS;
23		23
24	/**	24	/**
Lines 197-203 Link Here
197	* @return CategorySorter	197	* @return CategorySorter
198	*/	198	*/
199	public CategorySorter getCategorySorter() {	199	public CategorySorter getCategorySorter() {
200	return (CategorySorter) view.getViewer().getSorter();	200	return (CategorySorter) view.getViewer().getComparator();
201	}	201	}
202		202
203	/**	203	/**
Lines 245-251 Link Here
245	if (monitor.isCanceled())	245	if (monitor.isCanceled())
246	return;	246	return;
247		247
248	ViewerSorter sorter = view.getViewer().getSorter();	248	ViewerComparator sorter = view.getViewer().getComparator();
249		249
250	if (markerLimit == -1 \|\| isShowingHierarchy()) {	250	if (markerLimit == -1 \|\| isShowingHierarchy()) {
251	sorter.sort(view.getViewer(), newMarkers.toArray());	251	sorter.sort(view.getViewer(), newMarkers.toArray());
Lines 297-303 Link Here
297	*/	297	*/
298	private boolean isShowingHierarchy() {	298	private boolean isShowingHierarchy() {
299		299
300	ViewerSorter sorter = view.getViewer().getSorter();	300	ViewerComparator sorter = view.getViewer().getComparator();
301	if (sorter instanceof CategorySorter) {	301	if (sorter instanceof CategorySorter) {
302	return ((CategorySorter) sorter).getCategoryField() != null;	302	return ((CategorySorter) sorter).getCategoryField() != null;
303	}	303	}

Lines 13-19 Link Here

(-)src/org/eclipse/ui/internal/ide/dialogs/ResourceSorter.java (-4 / +4 lines)
13	import org.eclipse.core.resources.IContainer;	13	import org.eclipse.core.resources.IContainer;
14	import org.eclipse.core.resources.IResource;	14	import org.eclipse.core.resources.IResource;
15	import org.eclipse.jface.viewers.Viewer;	15	import org.eclipse.jface.viewers.Viewer;
16	import org.eclipse.jface.viewers.ViewerSorter;	16	import org.eclipse.jface.viewers.ViewerComparator;
17		17
18	/**	18	/**
19	* Sorter for viewers that display items of type <code>IResource</code>.	19	* Sorter for viewers that display items of type <code>IResource</code>.
Lines 32-38 Link Here
32	* This class may be instantiated; it is not intended to be subclassed.	32	* This class may be instantiated; it is not intended to be subclassed.
33	* </p>	33	* </p>
34	*/	34	*/
35	public class ResourceSorter extends ViewerSorter {	35	public class ResourceSorter extends ViewerComparator {
36		36
37	/**	37	/**
38	* Constructor argument value that indicates to sort items by name.	38	* Constructor argument value that indicates to sort items by name.
Lines 133-139 Link Here
133	* element is greater than the second element	133	* element is greater than the second element
134	*/	134	*/
135	protected int compareNames(IResource resource1, IResource resource2) {	135	protected int compareNames(IResource resource1, IResource resource2) {
136	return collator.compare(resource1.getName(), resource2.getName());	136	return getComparator().compare(resource1.getName(), resource2.getName());
137	}	137	}
138		138
139	/**	139	/**
Lines 155-161 Link Here
155	// Compare extensions. If they're different then return a value that	155	// Compare extensions. If they're different then return a value that
156	// indicates correct extension ordering. If they're the same then	156	// indicates correct extension ordering. If they're the same then
157	// return a value that indicates the correct NAME ordering.	157	// return a value that indicates the correct NAME ordering.
158	int result = collator.compare(ext1, ext2);	158	int result = getComparator().compare(ext1, ext2);
159		159
160	if (result != 0) {	160	if (result != 0) {
161	return result;	161	return result;

Lines 17-23 Link Here

(-)Eclipse UI/org/eclipse/ui/internal/progress/ProgressManagerUtil.java (-4 / +4 lines)
17	import org.eclipse.core.runtime.QualifiedName;	17	import org.eclipse.core.runtime.QualifiedName;
18	import org.eclipse.core.runtime.jobs.Job;	18	import org.eclipse.core.runtime.jobs.Job;
19	import org.eclipse.jface.viewers.Viewer;	19	import org.eclipse.jface.viewers.Viewer;
20	import org.eclipse.jface.viewers.ViewerSorter;	20	import org.eclipse.jface.viewers.ViewerComparator;
21	import org.eclipse.jface.window.IShellProvider;	21	import org.eclipse.jface.window.IShellProvider;
22	import org.eclipse.swt.SWT;	22	import org.eclipse.swt.SWT;
23	import org.eclipse.swt.graphics.GC;	23	import org.eclipse.swt.graphics.GC;
Lines 106-117 Link Here
106	*	106	*
107	* @return ViewerSorter	107	* @return ViewerSorter
108	*/	108	*/
109	static ViewerSorter getProgressViewerSorter() {	109	static ViewerComparator getProgressViewerSorter() {
110	return new ViewerSorter() {	110	return new ViewerComparator() {
111	/*	111	/*
112	* (non-Javadoc)	112	* (non-Javadoc)
113	*	113	*
114	* @see org.eclipse.jface.viewers.ViewerSorter#compare(org.eclipse.jface.viewers.Viewer,	114	* @see org.eclipse.jface.viewers.ViewerComparator#compare(org.eclipse.jface.viewers.Viewer,
115	* java.lang.Object, java.lang.Object)	115	* java.lang.Object, java.lang.Object)
116	*/	116	*/
117	public int compare(Viewer testViewer, Object e1, Object e2) {	117	public int compare(Viewer testViewer, Object e1, Object e2) {

Lines 16-22 Link Here

(-)Eclipse UI/org/eclipse/ui/internal/progress/BlockedJobsDialog.java (-3 / +3 lines)
16	import org.eclipse.jface.dialogs.IconAndMessageDialog;	16	import org.eclipse.jface.dialogs.IconAndMessageDialog;
17	import org.eclipse.jface.resource.JFaceResources;	17	import org.eclipse.jface.resource.JFaceResources;
18	import org.eclipse.jface.viewers.Viewer;	18	import org.eclipse.jface.viewers.Viewer;
19	import org.eclipse.jface.viewers.ViewerSorter;	19	import org.eclipse.jface.viewers.ViewerComparator;
20	import org.eclipse.swt.SWT;	20	import org.eclipse.swt.SWT;
21	import org.eclipse.swt.graphics.Cursor;	21	import org.eclipse.swt.graphics.Cursor;
22	import org.eclipse.swt.graphics.Image;	22	import org.eclipse.swt.graphics.Image;
Lines 301-311 Link Here
301	void showJobDetails(Composite parent) {	301	void showJobDetails(Composite parent) {
302	viewer = new DetailedProgressViewer(parent, SWT.MULTI \| SWT.H_SCROLL	302	viewer = new DetailedProgressViewer(parent, SWT.MULTI \| SWT.H_SCROLL
303	\| SWT.V_SCROLL \| SWT.BORDER);	303	\| SWT.V_SCROLL \| SWT.BORDER);
304	viewer.setSorter(new ViewerSorter() {	304	viewer.setComparator(new ViewerComparator() {
305	/*	305	/*
306	* (non-Javadoc)	306	* (non-Javadoc)
307	*	307	*
308	* @see org.eclipse.jface.viewers.ViewerSorter#compare(org.eclipse.jface.viewers.Viewer,	308	* @see org.eclipse.jface.viewers.ViewerComparator#compare(org.eclipse.jface.viewers.Viewer,
309	* java.lang.Object, java.lang.Object)	309	* java.lang.Object, java.lang.Object)
310	*/	310	*/
311	public int compare(Viewer testViewer, Object e1, Object e2) {	311	public int compare(Viewer testViewer, Object e1, Object e2) {

Lines 19-25 Link Here

(-)Eclipse UI/org/eclipse/ui/internal/progress/ProgressMonitorJobsDialog.java (-3 / +3 lines)
19	import org.eclipse.jface.dialogs.ProgressMonitorDialog;	19	import org.eclipse.jface.dialogs.ProgressMonitorDialog;
20	import org.eclipse.jface.operation.IRunnableWithProgress;	20	import org.eclipse.jface.operation.IRunnableWithProgress;
21	import org.eclipse.jface.viewers.Viewer;	21	import org.eclipse.jface.viewers.Viewer;
22	import org.eclipse.jface.viewers.ViewerSorter;	22	import org.eclipse.jface.viewers.ViewerComparator;
23	import org.eclipse.swt.SWT;	23	import org.eclipse.swt.SWT;
24	import org.eclipse.swt.events.SelectionAdapter;	24	import org.eclipse.swt.events.SelectionAdapter;
25	import org.eclipse.swt.events.SelectionEvent;	25	import org.eclipse.swt.events.SelectionEvent;
Lines 114-124 Link Here
114		114
115	viewer = new DetailedProgressViewer(viewerComposite, SWT.MULTI	115	viewer = new DetailedProgressViewer(viewerComposite, SWT.MULTI
116	\| SWT.H_SCROLL \| SWT.V_SCROLL \| SWT.BORDER);	116	\| SWT.H_SCROLL \| SWT.V_SCROLL \| SWT.BORDER);
117	viewer.setSorter(new ViewerSorter() {	117	viewer.setComparator(new ViewerComparator() {
118	/*	118	/*
119	* (non-Javadoc)	119	* (non-Javadoc)
120	*	120	*
121	* @see org.eclipse.jface.viewers.ViewerSorter#compare(org.eclipse.jface.viewers.Viewer,	121	* @see org.eclipse.jface.viewers.ViewerComparator#compare(org.eclipse.jface.viewers.Viewer,
122	* java.lang.Object, java.lang.Object)	122	* java.lang.Object, java.lang.Object)
123	*/	123	*/
124	public int compare(Viewer testViewer, Object e1, Object e2) {	124	public int compare(Viewer testViewer, Object e1, Object e2) {

Lines 30-36 Link Here

(-)Eclipse UI/org/eclipse/ui/internal/activities/ws/ActivityEnabler.java (-2 / +2 lines)
30	import org.eclipse.jface.viewers.IStructuredSelection;	30	import org.eclipse.jface.viewers.IStructuredSelection;
31	import org.eclipse.jface.viewers.SelectionChangedEvent;	31	import org.eclipse.jface.viewers.SelectionChangedEvent;
32	import org.eclipse.jface.viewers.StructuredSelection;	32	import org.eclipse.jface.viewers.StructuredSelection;
33	import org.eclipse.jface.viewers.ViewerSorter;	33	import org.eclipse.jface.viewers.ViewerComparator;
34	import org.eclipse.swt.SWT;	34	import org.eclipse.swt.SWT;
35	import org.eclipse.swt.events.SelectionAdapter;	35	import org.eclipse.swt.events.SelectionAdapter;
36	import org.eclipse.swt.events.SelectionEvent;	36	import org.eclipse.swt.events.SelectionEvent;
Lines 294-300 Link Here
294	new Label(composite, SWT.NONE).setText(strings.getProperty(ActivitiesPreferencePage.ACTIVITY_NAME, ActivityMessages.ActivityEnabler_activities) + ':');	294	new Label(composite, SWT.NONE).setText(strings.getProperty(ActivitiesPreferencePage.ACTIVITY_NAME, ActivityMessages.ActivityEnabler_activities) + ':');
295		295
296	dualViewer = new CheckboxTreeViewer(composite);	296	dualViewer = new CheckboxTreeViewer(composite);
297	dualViewer.setSorter(new ViewerSorter());	297	dualViewer.setComparator(new ViewerComparator());
298	dualViewer.setLabelProvider(new ActivityCategoryLabelProvider());	298	dualViewer.setLabelProvider(new ActivityCategoryLabelProvider());
299	dualViewer.setContentProvider(provider);	299	dualViewer.setContentProvider(provider);
300	dualViewer.setInput(activitySupport);	300	dualViewer.setInput(activitySupport);

Lines 38-45 Link Here

(-)Eclipse UI/org/eclipse/ui/activities/ActivityCategoryPreferencePage.java (-2 / +2 lines)
38	import org.eclipse.jface.viewers.SelectionChangedEvent;	38	import org.eclipse.jface.viewers.SelectionChangedEvent;
39	import org.eclipse.jface.viewers.TableViewer;	39	import org.eclipse.jface.viewers.TableViewer;
40	import org.eclipse.jface.viewers.Viewer;	40	import org.eclipse.jface.viewers.Viewer;
		41	import org.eclipse.jface.viewers.ViewerComparator;
41	import org.eclipse.jface.viewers.ViewerFilter;	42	import org.eclipse.jface.viewers.ViewerFilter;
42	import org.eclipse.jface.viewers.ViewerSorter;
43	import org.eclipse.osgi.util.NLS;	43	import org.eclipse.osgi.util.NLS;
44	import org.eclipse.swt.SWT;	44	import org.eclipse.swt.SWT;
45	import org.eclipse.swt.events.SelectionAdapter;	45	import org.eclipse.swt.events.SelectionAdapter;
Lines 549-555 Link Here
549	true);	549	true);
550	workingCopy.addActivityManagerListener(categoryLabelProvider);	550	workingCopy.addActivityManagerListener(categoryLabelProvider);
551	categoryViewer.setLabelProvider(categoryLabelProvider);	551	categoryViewer.setLabelProvider(categoryLabelProvider);
552	categoryViewer.setSorter(new ViewerSorter());	552	categoryViewer.setComparator(new ViewerComparator());
553	categoryViewer.addFilter(new EmptyCategoryFilter());	553	categoryViewer.addFilter(new EmptyCategoryFilter());
554		554
555	categoryViewer	555	categoryViewer