From c252113586de70ffabba2f2d710ad03566d831d1 Mon Sep 17 00:00:00 2001 From: Alexander Kurtakov Date: Thu, 8 Aug 2019 17:15:09 +0300 Subject: Replace ViewerSorter with ViewerComparator. Change-Id: I3013723be25fef063f382456166f6e5a622316d3 Signed-off-by: Alexander Kurtakov --- build/org.eclipse.cdt.make.ui/META-INF/MANIFEST.MF | 2 +- .../src/org/eclipse/cdt/make/ui/views/MakeView.java | 4 ++-- build/org.eclipse.cdt.managedbuilder.ui/META-INF/MANIFEST.MF | 2 +- .../eclipse/cdt/managedbuilder/ui/properties/CPropertyVarsTab.java | 4 ++-- .../eclipse/cdt/internal/ui/typehierarchy/THInformationControl.java | 4 ++-- .../src/org/eclipse/cdt/internal/ui/typehierarchy/THViewPart.java | 6 +++--- .../eclipse/cdt/ui/wizards/conversion/ConvertProjectWizardPage.java | 4 ++-- .../debug/internal/ui/sourcelookup/AddSourceContainerDialog.java | 4 ++-- 8 files changed, 15 insertions(+), 15 deletions(-) diff --git a/build/org.eclipse.cdt.make.ui/META-INF/MANIFEST.MF b/build/org.eclipse.cdt.make.ui/META-INF/MANIFEST.MF index de180d8dce6..76920fe95a5 100644 --- a/build/org.eclipse.cdt.make.ui/META-INF/MANIFEST.MF +++ b/build/org.eclipse.cdt.make.ui/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.cdt.make.ui; singleton:=true -Bundle-Version: 7.3.1.qualifier +Bundle-Version: 7.3.100.qualifier Bundle-Activator: org.eclipse.cdt.make.internal.ui.MakeUIPlugin Bundle-Vendor: %providerName Bundle-Localization: plugin diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/views/MakeView.java b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/views/MakeView.java index 98b6298da86..de3957e0071 100644 --- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/views/MakeView.java +++ b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/views/MakeView.java @@ -48,7 +48,7 @@ import org.eclipse.jface.viewers.ISelectionChangedListener; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.SelectionChangedEvent; import org.eclipse.jface.viewers.TreeViewer; -import org.eclipse.jface.viewers.ViewerSorter; +import org.eclipse.jface.viewers.ViewerComparator; import org.eclipse.swt.SWT; import org.eclipse.swt.dnd.Clipboard; import org.eclipse.swt.dnd.DND; @@ -125,7 +125,7 @@ public class MakeView extends ViewPart { } }); - fViewer.setSorter(new ViewerSorter() { + fViewer.setComparator(new ViewerComparator() { @Override public int category(Object element) { if (element instanceof TargetSourceContainer) { diff --git a/build/org.eclipse.cdt.managedbuilder.ui/META-INF/MANIFEST.MF b/build/org.eclipse.cdt.managedbuilder.ui/META-INF/MANIFEST.MF index b1a1afd6ffc..ccd25f10192 100644 --- a/build/org.eclipse.cdt.managedbuilder.ui/META-INF/MANIFEST.MF +++ b/build/org.eclipse.cdt.managedbuilder.ui/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.cdt.managedbuilder.ui; singleton:=true -Bundle-Version: 9.1.200.qualifier +Bundle-Version: 9.1.300.qualifier Bundle-Activator: org.eclipse.cdt.managedbuilder.ui.properties.ManagedBuilderUIPlugin Bundle-Vendor: %providerName Bundle-Localization: plugin diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/CPropertyVarsTab.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/CPropertyVarsTab.java index bbed363c19f..989cc3fb010 100644 --- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/CPropertyVarsTab.java +++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/CPropertyVarsTab.java @@ -61,7 +61,7 @@ import org.eclipse.jface.viewers.SelectionChangedEvent; import org.eclipse.jface.viewers.TableLayout; import org.eclipse.jface.viewers.TableViewer; 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.KeyEvent; import org.eclipse.swt.events.KeyListener; @@ -428,7 +428,7 @@ public class CPropertyVarsTab extends AbstractCPropertyTab { tableViewer.setContentProvider(new MacroContentProvider()); tableViewer.setLabelProvider(new MacroLabelProvider()); - tableViewer.setSorter(new ViewerSorter()); + tableViewer.setComparator(new ViewerComparator()); tableViewer.setColumnProperties(fEditableTableColumnProps); tv = tableViewer; 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) { diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/AddSourceContainerDialog.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/AddSourceContainerDialog.java index dc97bb758ec..c61cb4aa0ac 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/AddSourceContainerDialog.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/AddSourceContainerDialog.java @@ -31,7 +31,7 @@ import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.SelectionChangedEvent; import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.jface.viewers.TableViewer; -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; @@ -100,7 +100,7 @@ public class AddSourceContainerDialog extends TitleAreaDialog { fViewer.setLabelProvider(new SourceContainerLabelProvider()); fViewer.setContentProvider(ArrayContentProvider.getInstance()); - fViewer.setSorter(new ViewerSorter()); + fViewer.setComparator(new ViewerComparator()); fViewer.addSelectionChangedListener(new ISelectionChangedListener() { @Override public void selectionChanged(SelectionChangedEvent event) { -- cgit v1.2.3