Skip to content

Deprecated ViewerSorter cleanups #2392

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
HeikoKlare merged 1 commit into from
Jan 4, 2026
+17 −17
Merged

Deprecated ViewerSorter cleanups #2392

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 5 additions & 5 deletions ...clipse.team.ui/src/org/eclipse/team/internal/ui/dialogs/ResourceMappingHierarchyArea.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2000, 2025 IBM Corporation and others.
* Copyright (c) 2000, 2026 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 @@ -24,11 +24,11 @@
import org.eclipse.swt.widgets.Composite;
import org.eclipse.team.core.mapping.ISynchronizationContext;
import org.eclipse.team.core.mapping.ISynchronizationScope;
import org.eclipse.team.internal.ui.mapping.TeamViewerSorter;
import org.eclipse.team.internal.ui.mapping.TeamViewerComparator;
import org.eclipse.team.ui.TeamUI;
import org.eclipse.team.ui.mapping.ITeamContentProviderManager;
import org.eclipse.ui.navigator.CommonViewer;
import org.eclipse.ui.navigator.CommonViewerSorter;
import org.eclipse.ui.navigator.CommonViewerComparator;
import org.eclipse.ui.navigator.INavigatorContentExtension;
import org.eclipse.ui.navigator.INavigatorContentServiceListener;

Expand Down Expand Up @@ -63,8 +63,8 @@ public void createArea(Composite parent) {
}

viewer = new CommonViewer(TEAM_NAVIGATOR_CONTENT, composite, SWT.BORDER);
viewer.setComparator(new CommonViewerSorter());
viewer.setComparator(new TeamViewerSorter((CommonViewerSorter) viewer.getSorter()));
viewer.setComparator(new CommonViewerComparator());
viewer.setComparator(new TeamViewerComparator((CommonViewerComparator) viewer.getComparator()));
viewer.getNavigatorContentService().bindExtensions(TeamUI.getTeamContentProviderManager().getContentProviderIds(scope), true);
viewer.getNavigatorContentService().getActivationService().activateExtensions(TeamUI.getTeamContentProviderManager().getContentProviderIds(scope), true);
GridData data = new GridData(GridData.FILL_BOTH);
Expand Down
8 changes: 4 additions & 4 deletions ...les/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/CommonViewerAdvisor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2000, 2025 IBM Corporation and others.
* Copyright (c) 2000, 2026 IBM Corporation and others.
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
Expand Down Expand Up @@ -74,8 +74,8 @@
import org.eclipse.ui.SubActionBars;
import org.eclipse.ui.actions.ActionContext;
import org.eclipse.ui.navigator.CommonViewer;
import org.eclipse.ui.navigator.CommonViewerComparator;
import org.eclipse.ui.navigator.CommonViewerSiteFactory;
import org.eclipse.ui.navigator.CommonViewerSorter;
import org.eclipse.ui.navigator.ICommonViewerSite;
import org.eclipse.ui.navigator.INavigatorContentExtension;
import org.eclipse.ui.navigator.INavigatorContentServiceListener;
Expand Down Expand Up @@ -270,8 +270,8 @@ public void updateActionBars() {
*/
private static CommonViewer createViewer(Composite parent, final ISynchronizePageConfiguration configuration, IEmptyTreeListener listener) {
final CommonViewer v = new NavigableCommonViewer(configuration.getViewerId(), parent, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL, listener);
v.setComparator(new CommonViewerSorter());
v.setComparator(new TeamViewerSorter((CommonViewerSorter) v.getSorter()));
v.setComparator(new CommonViewerComparator());
v.setComparator(new TeamViewerComparator((CommonViewerComparator) v.getComparator()));
ISynchronizationScope scope = getScope(configuration);
bindTeamContentProviders(v);
scope.addScopeChangeListener((scope1, newMappings, newTraversals) -> {
Expand Down
16 changes: 8 additions & 8 deletions ...internal/ui/mapping/TeamViewerSorter.java → ...rnal/ui/mapping/TeamViewerComparator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2006, 2010 IBM Corporation and others.
* Copyright (c) 2006, 2026 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 @@ -17,19 +17,19 @@
import org.eclipse.core.resources.mapping.IModelProviderDescriptor;
import org.eclipse.core.resources.mapping.ModelProvider;
import org.eclipse.jface.viewers.TreePath;
import org.eclipse.jface.viewers.TreePathViewerSorter;
import org.eclipse.jface.viewers.TreePathViewerComparator;
import org.eclipse.jface.viewers.Viewer;
import org.eclipse.team.internal.ui.Utils;
import org.eclipse.ui.navigator.CommonViewerSorter;
import org.eclipse.ui.navigator.CommonViewerComparator;
import org.eclipse.ui.views.navigator.ResourceComparator;

public class TeamViewerSorter extends TreePathViewerSorter {
public class TeamViewerComparator extends TreePathViewerComparator {

private final CommonViewerSorter sorter;
private final CommonViewerComparator comparator;
private final ResourceComparator resourceComparator;

public TeamViewerSorter(CommonViewerSorter sorter) {
this.sorter = sorter;
public TeamViewerComparator(CommonViewerComparator comparator) {
this.comparator = comparator;
this.resourceComparator = new ResourceComparator(ResourceComparator.NAME);
}

Expand Down Expand Up @@ -72,7 +72,7 @@ public int compare(Viewer viewer, TreePath parentPath, Object e1, Object e2) {
return resourceComparator.compare(viewer, r1, r2);
}
}
return sorter.compare(viewer, parentPath, e1, e2);
return comparator.compare(viewer, parentPath, e1, e2);
}

private boolean isExtends(ModelProvider mp1, IModelProviderDescriptor desc) {
Expand Down
Loading