Merge branch 'release/4.6.0'

[taxeditor.git] / eu.etaxonomy.taxeditor.navigation / src / main / java / eu / etaxonomy / taxeditor / navigation / navigator / TaxonNodeNavigatorComparator.java

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 ee6ecbc03c8dfab5e81fbae3fa36a4409fcfcf66..5e6ef66baef75a3be39ed3afe23cecc8579d0435 100644 (file)
--- 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
@@ -11,9 +11,11 @@ import eu.etaxonomy.cdm.model.taxon.TaxonNode;
 
 public class TaxonNodeNavigatorComparator extends ViewerComparator{
 
+       Comparator<TaxonNode> comparator;
        
        public TaxonNodeNavigatorComparator(Comparator<TaxonNode> comparator){
-               super(comparator);
+               super();
+               this.comparator = comparator;
        }
 
        
@@ -23,11 +25,8 @@ public class TaxonNodeNavigatorComparator extends ViewerComparator{
                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);
-                       }
+                       return comparator.compare((TaxonNode)e1, (TaxonNode)e2);
+                       
                }
        }
 }