diff options
| author | Alexander Kurtakov | 2019-08-08 14:15:09 +0000 |
|---|---|---|
| committer | Alexander Kurtakov | 2019-08-09 05:50:29 +0000 |
| commit | c252113586de70ffabba2f2d710ad03566d831d1 (patch) | |
| tree | 2a7c516243cb53c4d84409c29a18cd2116506409 /core/org.eclipse.cdt.ui | |
| parent | 2deb21119463725d57a370af780fb8092ae1d8ba (diff) | |
| download | org.eclipse.cdt-c252113586de70ffabba2f2d710ad03566d831d1.tar.gz org.eclipse.cdt-c252113586de70ffabba2f2d710ad03566d831d1.tar.xz org.eclipse.cdt-c252113586de70ffabba2f2d710ad03566d831d1.zip | |
Replace ViewerSorter with ViewerComparator.
Change-Id: I3013723be25fef063f382456166f6e5a622316d3
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
Diffstat (limited to 'core/org.eclipse.cdt.ui')
3 files changed, 7 insertions, 7 deletions
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/THInformationControl.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/THInformationControl.java index 3d1cb6258cd..e1da1459b29 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/THInformationControl.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/THInformationControl.java @@ -30,7 +30,7 @@ import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.IStructuredSelection; 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.osgi.util.NLS; import org.eclipse.swt.SWT; import org.eclipse.swt.events.DisposeEvent; @@ -102,7 +102,7 @@ public class THInformationControl extends AbstractInformationControl implements fHierarchyTreeViewer = new TreeViewer(parent, SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER); fHierarchyTreeViewer.setContentProvider(new THContentProvider()); fHierarchyTreeViewer.setLabelProvider(fHierarchyLabelProvider); - fHierarchyTreeViewer.setSorter(new ViewerSorter()); + fHierarchyTreeViewer.setComparator(new ViewerComparator()); fHierarchyTreeViewer.setUseHashlookup(true); fHierarchyTreeViewer.getTree().addKeyListener(getKeyAdapter()); return fHierarchyTreeViewer; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/THViewPart.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/THViewPart.java index e3b1fcd4334..d7638ea3fa9 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/THViewPart.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/THViewPart.java @@ -64,8 +64,8 @@ import org.eclipse.jface.viewers.StructuredViewer; import org.eclipse.jface.viewers.TableViewer; import org.eclipse.jface.viewers.TreeViewer; 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.swt.SWT; import org.eclipse.swt.accessibility.ACC; import org.eclipse.swt.accessibility.AccessibleAdapter; @@ -472,7 +472,7 @@ public class THViewPart extends ViewPart implements ITHModelPresenter { onMemberSelectionChanged(event); } }); - fMemberViewer.setSorter(new ViewerSorter() { + fMemberViewer.setComparator(new ViewerComparator() { @Override public int category(Object element) { if (element instanceof ICElement) { @@ -535,7 +535,7 @@ public class THViewPart extends ViewPart implements ITHModelPresenter { fHierarchyTreeViewer = new TreeViewer(parent, SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER); fHierarchyTreeViewer.setContentProvider(new THContentProvider()); fHierarchyTreeViewer.setLabelProvider(new DecoratingCLabelProvider(fHierarchyLabelProvider, true)); - fHierarchyTreeViewer.setSorter(new ViewerSorter()); + fHierarchyTreeViewer.setComparator(new ViewerComparator()); fHierarchyTreeViewer.setUseHashlookup(true); fHierarchyTreeViewer.addOpenListener(new IOpenListener() { @Override diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/conversion/ConvertProjectWizardPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/conversion/ConvertProjectWizardPage.java index 7ec5f86869a..e55138733f2 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/conversion/ConvertProjectWizardPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/conversion/ConvertProjectWizardPage.java @@ -38,7 +38,7 @@ import org.eclipse.jface.viewers.LabelProvider; 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.WizardPage; import org.eclipse.swt.SWT; import org.eclipse.swt.accessibility.AccessibleAdapter; @@ -226,7 +226,7 @@ public abstract class ConvertProjectWizardPage extends WizardPage { tableViewer.setInput(getElements()); // define and assign sorter - tableViewer.setSorter(new ViewerSorter() { + tableViewer.setComparator(new ViewerComparator() { @Override public int compare(Viewer viewer, Object object1, Object object2) { |