Skip to content

Commit c252113

Browse files
committed
Replace ViewerSorter with ViewerComparator.
Change-Id: I3013723be25fef063f382456166f6e5a622316d3 Signed-off-by: Alexander Kurtakov <[email protected]>
1 parent 2deb211 commit c252113

File tree

8 files changed

+15
-15
lines changed

8 files changed

+15
-15
lines changed

build/org.eclipse.cdt.make.ui/META-INF/MANIFEST.MF

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
22
Bundle-ManifestVersion: 2
33
Bundle-Name: %pluginName
44
Bundle-SymbolicName: org.eclipse.cdt.make.ui; singleton:=true
5-
Bundle-Version: 7.3.1.qualifier
5+
Bundle-Version: 7.3.100.qualifier
66
Bundle-Activator: org.eclipse.cdt.make.internal.ui.MakeUIPlugin
77
Bundle-Vendor: %providerName
88
Bundle-Localization: plugin

build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/views/MakeView.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
import org.eclipse.jface.viewers.IStructuredSelection;
4949
import org.eclipse.jface.viewers.SelectionChangedEvent;
5050
import org.eclipse.jface.viewers.TreeViewer;
51-
import org.eclipse.jface.viewers.ViewerSorter;
51+
import org.eclipse.jface.viewers.ViewerComparator;
5252
import org.eclipse.swt.SWT;
5353
import org.eclipse.swt.dnd.Clipboard;
5454
import org.eclipse.swt.dnd.DND;
@@ -125,7 +125,7 @@ public void selectionChanged(SelectionChangedEvent event) {
125125
}
126126
});
127127

128-
fViewer.setSorter(new ViewerSorter() {
128+
fViewer.setComparator(new ViewerComparator() {
129129
@Override
130130
public int category(Object element) {
131131
if (element instanceof TargetSourceContainer) {

build/org.eclipse.cdt.managedbuilder.ui/META-INF/MANIFEST.MF

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
22
Bundle-ManifestVersion: 2
33
Bundle-Name: %pluginName
44
Bundle-SymbolicName: org.eclipse.cdt.managedbuilder.ui; singleton:=true
5-
Bundle-Version: 9.1.200.qualifier
5+
Bundle-Version: 9.1.300.qualifier
66
Bundle-Activator: org.eclipse.cdt.managedbuilder.ui.properties.ManagedBuilderUIPlugin
77
Bundle-Vendor: %providerName
88
Bundle-Localization: plugin

build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/CPropertyVarsTab.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
import org.eclipse.jface.viewers.TableLayout;
6262
import org.eclipse.jface.viewers.TableViewer;
6363
import org.eclipse.jface.viewers.Viewer;
64-
import org.eclipse.jface.viewers.ViewerSorter;
64+
import org.eclipse.jface.viewers.ViewerComparator;
6565
import org.eclipse.swt.SWT;
6666
import org.eclipse.swt.events.KeyEvent;
6767
import org.eclipse.swt.events.KeyListener;
@@ -428,7 +428,7 @@ private void createTableControl() {
428428

429429
tableViewer.setContentProvider(new MacroContentProvider());
430430
tableViewer.setLabelProvider(new MacroLabelProvider());
431-
tableViewer.setSorter(new ViewerSorter());
431+
tableViewer.setComparator(new ViewerComparator());
432432

433433
tableViewer.setColumnProperties(fEditableTableColumnProps);
434434
tv = tableViewer;

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/THInformationControl.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
import org.eclipse.jface.viewers.IStructuredSelection;
3131
import org.eclipse.jface.viewers.StructuredSelection;
3232
import org.eclipse.jface.viewers.TreeViewer;
33-
import org.eclipse.jface.viewers.ViewerSorter;
33+
import org.eclipse.jface.viewers.ViewerComparator;
3434
import org.eclipse.osgi.util.NLS;
3535
import org.eclipse.swt.SWT;
3636
import org.eclipse.swt.events.DisposeEvent;
@@ -102,7 +102,7 @@ protected TreeViewer createTreeViewer(Composite parent, int style) {
102102
fHierarchyTreeViewer = new TreeViewer(parent, SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER);
103103
fHierarchyTreeViewer.setContentProvider(new THContentProvider());
104104
fHierarchyTreeViewer.setLabelProvider(fHierarchyLabelProvider);
105-
fHierarchyTreeViewer.setSorter(new ViewerSorter());
105+
fHierarchyTreeViewer.setComparator(new ViewerComparator());
106106
fHierarchyTreeViewer.setUseHashlookup(true);
107107
fHierarchyTreeViewer.getTree().addKeyListener(getKeyAdapter());
108108
return fHierarchyTreeViewer;

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/THViewPart.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@
6464
import org.eclipse.jface.viewers.TableViewer;
6565
import org.eclipse.jface.viewers.TreeViewer;
6666
import org.eclipse.jface.viewers.Viewer;
67+
import org.eclipse.jface.viewers.ViewerComparator;
6768
import org.eclipse.jface.viewers.ViewerFilter;
68-
import org.eclipse.jface.viewers.ViewerSorter;
6969
import org.eclipse.swt.SWT;
7070
import org.eclipse.swt.accessibility.ACC;
7171
import org.eclipse.swt.accessibility.AccessibleAdapter;
@@ -472,7 +472,7 @@ public void selectionChanged(final SelectionChangedEvent event) {
472472
onMemberSelectionChanged(event);
473473
}
474474
});
475-
fMemberViewer.setSorter(new ViewerSorter() {
475+
fMemberViewer.setComparator(new ViewerComparator() {
476476
@Override
477477
public int category(Object element) {
478478
if (element instanceof ICElement) {
@@ -535,7 +535,7 @@ private Control createHierarchyControl(ViewForm parent) {
535535
fHierarchyTreeViewer = new TreeViewer(parent, SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER);
536536
fHierarchyTreeViewer.setContentProvider(new THContentProvider());
537537
fHierarchyTreeViewer.setLabelProvider(new DecoratingCLabelProvider(fHierarchyLabelProvider, true));
538-
fHierarchyTreeViewer.setSorter(new ViewerSorter());
538+
fHierarchyTreeViewer.setComparator(new ViewerComparator());
539539
fHierarchyTreeViewer.setUseHashlookup(true);
540540
fHierarchyTreeViewer.addOpenListener(new IOpenListener() {
541541
@Override

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/conversion/ConvertProjectWizardPage.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
import org.eclipse.jface.viewers.SelectionChangedEvent;
3939
import org.eclipse.jface.viewers.TableLayout;
4040
import org.eclipse.jface.viewers.Viewer;
41-
import org.eclipse.jface.viewers.ViewerSorter;
41+
import org.eclipse.jface.viewers.ViewerComparator;
4242
import org.eclipse.jface.wizard.WizardPage;
4343
import org.eclipse.swt.SWT;
4444
import org.eclipse.swt.accessibility.AccessibleAdapter;
@@ -226,7 +226,7 @@ public void getName(AccessibleEvent e) {
226226
tableViewer.setInput(getElements());
227227

228228
// define and assign sorter
229-
tableViewer.setSorter(new ViewerSorter() {
229+
tableViewer.setComparator(new ViewerComparator() {
230230
@Override
231231
public int compare(Viewer viewer, Object object1, Object object2) {
232232

debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/AddSourceContainerDialog.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
import org.eclipse.jface.viewers.SelectionChangedEvent;
3232
import org.eclipse.jface.viewers.StructuredSelection;
3333
import org.eclipse.jface.viewers.TableViewer;
34-
import org.eclipse.jface.viewers.ViewerSorter;
34+
import org.eclipse.jface.viewers.ViewerComparator;
3535
import org.eclipse.swt.SWT;
3636
import org.eclipse.swt.events.SelectionAdapter;
3737
import org.eclipse.swt.events.SelectionEvent;
@@ -100,7 +100,7 @@ public void widgetDefaultSelected(SelectionEvent e) {
100100

101101
fViewer.setLabelProvider(new SourceContainerLabelProvider());
102102
fViewer.setContentProvider(ArrayContentProvider.getInstance());
103-
fViewer.setSorter(new ViewerSorter());
103+
fViewer.setComparator(new ViewerComparator());
104104
fViewer.addSelectionChangedListener(new ISelectionChangedListener() {
105105
@Override
106106
public void selectionChanged(SelectionChangedEvent event) {

0 commit comments

Comments
 (0)