[128057] Port to ICU4J (remaining issues)
diff --git a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/views/contentoutline/SortAction.java b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/views/contentoutline/SortAction.java
index eb2daf4..8fd73e3 100644
--- a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/views/contentoutline/SortAction.java
+++ b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/views/contentoutline/SortAction.java
@@ -11,12 +11,10 @@
package org.eclipse.wst.css.ui.views.contentoutline;
-import java.text.Collator;
-
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jface.viewers.ViewerSorter;
+import org.eclipse.jface.viewers.ViewerComparator;
import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.eclipse.wst.css.ui.internal.CSSUIMessages;
import org.eclipse.wst.css.ui.internal.CSSUIPlugin;
@@ -36,7 +34,7 @@
setToolTipText(getText());
treeViewer = viewer;
if (isChecked()) {
- treeViewer.setSorter(new ViewerSorter(Collator.getInstance()));
+ treeViewer.setComparator(new ViewerComparator());
}
}
@@ -45,9 +43,10 @@
treeViewer.getControl().setVisible(false);
Object[] expandedElements = treeViewer.getExpandedElements();
if (isChecked()) {
- treeViewer.setSorter(new ViewerSorter(Collator.getInstance()));
- } else {
- treeViewer.setSorter(null);
+ treeViewer.setComparator(new ViewerComparator());
+ }
+ else {
+ treeViewer.setComparator(null);
}
treeViewer.setInput(treeViewer.getInput());
treeViewer.setExpandedElements(expandedElements);
diff --git a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/views/contentoutline/SortAction.java b/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/views/contentoutline/SortAction.java
index b101966..1ab0382 100644
--- a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/views/contentoutline/SortAction.java
+++ b/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/views/contentoutline/SortAction.java
@@ -12,11 +12,9 @@
*******************************************************************************/
package org.eclipse.wst.dtd.ui.views.contentoutline;
-import java.text.Collator;
-
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jface.viewers.ViewerSorter;
+import org.eclipse.jface.viewers.ViewerComparator;
import org.eclipse.wst.dtd.ui.internal.DTDUIMessages;
import org.eclipse.wst.dtd.ui.internal.editor.DTDEditorPluginImageHelper;
import org.eclipse.wst.dtd.ui.internal.editor.DTDEditorPluginImages;
@@ -31,7 +29,7 @@
setToolTipText(getText());
treeViewer = viewer;
if (isChecked()) {
- treeViewer.setSorter(new ViewerSorter(Collator.getInstance()));
+ treeViewer.setComparator(new ViewerComparator());
}
}
@@ -46,10 +44,10 @@
treeViewer.getControl().setRedraw(false);
Object[] expandedElements = treeViewer.getExpandedElements();
if (isChecked()) {
- treeViewer.setSorter(new ViewerSorter(Collator.getInstance()));
+ treeViewer.setComparator(new ViewerComparator());
}
else {
- treeViewer.setSorter(null);
+ treeViewer.setComparator(null);
}
treeViewer.setInput(treeViewer.getInput());
treeViewer.setExpandedElements(expandedElements);
