Skip to content

Make WorkingSetSorter extend ViewerComparator #2613

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 10, 2024
Merged

Make WorkingSetSorter extend ViewerComparator #2613

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
59ce014
Make WorkingSetSorter extend ViewerComparator
akurtakov Dec 10, 2024
863287a
Version bump(s) for 4.35 stream
eclipse-platform-bot Dec 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bundles/org.eclipse.ui.navigator.resources/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Plugin.name
Bundle-SymbolicName: org.eclipse.ui.navigator.resources; singleton:=true
Bundle-Version: 3.9.500.qualifier
Bundle-Version: 3.9.600.qualifier
Bundle-Activator: org.eclipse.ui.internal.navigator.resources.plugin.WorkbenchNavigatorPlugin
Bundle-Vendor: %Plugin.providerName
Bundle-Localization: plugin
Expand Down
16 changes: 7 additions & 9 deletions ...vigator.resources/src/org/eclipse/ui/internal/navigator/workingsets/WorkingSetSorter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2006, 2016 IBM Corporation and others.
* Copyright (c) 2006, 2024 IBM Corporation and others.
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
Expand All @@ -21,12 +21,12 @@
import org.eclipse.jface.viewers.ILabelProvider;
import org.eclipse.jface.viewers.StructuredViewer;
import org.eclipse.jface.viewers.Viewer;
import org.eclipse.jface.viewers.ViewerSorter;
import org.eclipse.jface.viewers.ViewerComparator;

/**
* @since 3.2
*/
public class WorkingSetSorter extends ViewerSorter {
public class WorkingSetSorter extends ViewerComparator {

@Override
public int compare(Viewer viewer, Object e1, Object e2) {
Expand All @@ -36,15 +36,14 @@ public int compare(Viewer viewer, Object e1, Object e2) {
} else if (e2 == WorkingSetsContentProvider.OTHERS_WORKING_SET) {
return -1;
}
if(viewer instanceof StructuredViewer) {
ILabelProvider labelProvider = (ILabelProvider) ((StructuredViewer) viewer).getLabelProvider();
if (viewer instanceof StructuredViewer sViewer) {
ILabelProvider labelProvider = (ILabelProvider) sViewer.getLabelProvider();

if (labelProvider instanceof DecoratingStyledCellLabelProvider) {
if (labelProvider instanceof DecoratingStyledCellLabelProvider dprov) {
// Bug 512637: use the real label provider to avoid unstable
// sort behavior if the decoration is running while sorting.
// decorations are usually visual aids to the user and
// shouldn't be used in ordering.
DecoratingStyledCellLabelProvider dprov = (DecoratingStyledCellLabelProvider) labelProvider;
IStyledLabelProvider styledLabelProvider = dprov.getStyledStringProvider();
String text1 = styledLabelProvider.getStyledText(e1).getString();
String text2 = styledLabelProvider.getStyledText(e2).getString();
Expand All @@ -54,12 +53,11 @@ public int compare(Viewer viewer, Object e1, Object e2) {
return -1;
}

if (labelProvider instanceof DecoratingLabelProvider) {
if (labelProvider instanceof DecoratingLabelProvider dprov) {
// Bug 364735: use the real label provider to avoid unstable
// sort behavior if the decoration is running while sorting.
// decorations are usually visual aids to the user and
// shouldn't be used in ordering.
DecoratingLabelProvider dprov = (DecoratingLabelProvider) labelProvider;
labelProvider = dprov.getLabelProvider();
}

Expand Down
Loading