From 8dd144dfa0b91794e7d9ec40a8ed221bed600bc2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andreas=20M=C3=BCller?= Date: Fri, 17 Jul 2015 10:18:03 +0200 Subject: [PATCH] Fix renamed TaxonNodeComparator --- .../taxeditor/navigation/navigator/TaxonNavigator.java | 8 ++++---- .../navigator/TaxonNodeNavigatorComparator.java | 9 +-------- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNavigator.java b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNavigator.java index 813701c91..273d9ad36 100644 --- a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNavigator.java +++ b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNavigator.java @@ -32,9 +32,9 @@ import eu.etaxonomy.cdm.api.conversation.ConversationHolder; import eu.etaxonomy.cdm.api.conversation.IConversationEnabled; import eu.etaxonomy.cdm.api.service.IClassificationService; import eu.etaxonomy.cdm.model.common.CdmBase; - import eu.etaxonomy.cdm.model.taxon.TaxonNaturalComparator; -import eu.etaxonomy.cdm.model.taxon.TaxonNodeComparator; +import eu.etaxonomy.cdm.model.taxon.TaxonNode; +import eu.etaxonomy.cdm.model.taxon.TaxonNodeByRankAndNameComparator; import eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeMap; import eu.etaxonomy.taxeditor.model.DataChangeBridge; import eu.etaxonomy.taxeditor.model.IDataChangeBehavior; @@ -80,11 +80,11 @@ public class TaxonNavigator extends CommonNavigator implements /** {@inheritDoc} */ @Override protected IAdaptable getInitialInput() { - Comparator comparator; + Comparator comparator; if (PreferencesUtil.getSortNodesNaturally()){ comparator = new TaxonNaturalComparator(); } else{ - comparator = new TaxonNodeComparator(); + comparator = new TaxonNodeByRankAndNameComparator(); } TaxonNodeNavigatorComparator viewerComparator = new TaxonNodeNavigatorComparator(comparator); this.getCommonViewer().setComparator(viewerComparator); diff --git a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNodeNavigatorComparator.java b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNodeNavigatorComparator.java index 2e5da6688..ee6ecbc03 100644 --- a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNodeNavigatorComparator.java +++ b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNodeNavigatorComparator.java @@ -1,25 +1,18 @@ package eu.etaxonomy.taxeditor.navigation.navigator; -import java.util.Arrays; import java.util.Comparator; - import org.eclipse.jface.viewers.Viewer; import org.eclipse.jface.viewers.ViewerComparator; - -import eu.etaxonomy.cdm.model.common.IdentifiableEntity; import eu.etaxonomy.cdm.model.taxon.Classification; -import eu.etaxonomy.cdm.model.taxon.TaxonBase; - import eu.etaxonomy.cdm.model.taxon.TaxonNaturalComparator; import eu.etaxonomy.cdm.model.taxon.TaxonNode; -import eu.etaxonomy.taxeditor.ui.section.supplemental.IdentifiableSourceElement; public class TaxonNodeNavigatorComparator extends ViewerComparator{ - public TaxonNodeNavigatorComparator(Comparator comparator){ + public TaxonNodeNavigatorComparator(Comparator comparator){ super(comparator); } -- 2.34.1