From 7dd8460fc7941c8e3f29dd30c431e17a366ae1a0 Mon Sep 17 00:00:00 2001 From: "k.luther" Date: Thu, 13 Aug 2015 14:13:04 +0200 Subject: [PATCH] minor --- .../TaxonNodeNavigatorComparator.java | 73 +++++++++---------- 1 file changed, 33 insertions(+), 40 deletions(-) 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..5f243cacb 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,40 +1,33 @@ -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){ - super(comparator); - } - - - - @Override - public int compare(Viewer viewer, Object e1, Object e2){ - if (e1 instanceof Classification && e2 instanceof Classification){ - return ((Classification)e1).getTitleCache().compareTo(((Classification)e2).getTitleCache()); - } else{ - if (this.getComparator() instanceof TaxonNaturalComparator){ - return this.getComparator().compare((TaxonNode)e1, (TaxonNode)e2); - }else{ - return this.getComparator().compare(e1,e2); - } - } - } -} +package eu.etaxonomy.taxeditor.navigation.navigator; + +import java.util.Comparator; + +import org.eclipse.jface.viewers.Viewer; +import org.eclipse.jface.viewers.ViewerComparator; + +import eu.etaxonomy.cdm.model.taxon.Classification; +import eu.etaxonomy.cdm.model.taxon.TaxonNaturalComparator; +import eu.etaxonomy.cdm.model.taxon.TaxonNode; + +public class TaxonNodeNavigatorComparator extends ViewerComparator{ + + + public TaxonNodeNavigatorComparator(Comparator comparator){ + super(comparator); + } + + + + @Override + public int compare(Viewer viewer, Object e1, Object e2){ + if (e1 instanceof Classification && e2 instanceof Classification){ + return ((Classification)e1).getTitleCache().compareTo(((Classification)e2).getTitleCache()); + } else{ + if (this.getComparator() instanceof TaxonNaturalComparator){ + return this.getComparator().compare((TaxonNode)e1, (TaxonNode)e2); + }else{ + return this.getComparator().compare(e1,e2); + } + } + } +} -- 2.34.1