From b10699be772daa2c1b9bde1e882a7036ca27fe30 Mon Sep 17 00:00:00 2001 From: Nathan Ridge Date: Tue, 24 Jan 2017 19:37:27 -0500 Subject: [PATCH] Bug 510998 - Fix a deprecation warning in CEditorColoringConfigurationBlock Change-Id: I6da1652d9b6fcc7a9775d427a57c858cb7323f1e --- .../ui/preferences/CEditorColoringConfigurationBlock.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CEditorColoringConfigurationBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CEditorColoringConfigurationBlock.java index b33f4db070b..4f4a31fe40a 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CEditorColoringConfigurationBlock.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CEditorColoringConfigurationBlock.java @@ -37,7 +37,7 @@ import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.jface.viewers.StructuredViewer; 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.SelectionAdapter; import org.eclipse.swt.events.SelectionEvent; @@ -61,6 +61,8 @@ import org.eclipse.ui.dialogs.PreferencesUtil; import org.eclipse.ui.editors.text.EditorsUI; import org.eclipse.ui.texteditor.ChainedPreferenceStore; +import com.ibm.icu.text.Collator; + import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.cdt.ui.PreferenceConstants; import org.eclipse.cdt.ui.text.ICPartitions; @@ -594,7 +596,7 @@ class CEditorColoringConfigurationBlock extends AbstractConfigurationBlock { fListViewer= new TreeViewer(editorComposite, SWT.SINGLE | SWT.BORDER); fListViewer.setLabelProvider(new ColorListLabelProvider()); fListViewer.setContentProvider(new ColorListContentProvider()); - fListViewer.setSorter(new ViewerSorter() { + fListViewer.setComparator(new ViewerComparator(Collator.getInstance()) { @Override public int category(Object element) { // don't sort the top level categories