From 41eb24f1c2400ad0d63cea7f878989ce62db1b85 Mon Sep 17 00:00:00 2001
From: Katja Luther <k.luther@bgbm.org>
Date: Thu, 20 Mar 2014 12:51:00 +0000
Subject: [PATCH] #4114 sort order in taxon navigator

---
 .../navigation/navigator/TaxonNavigator.java  |  4 ++--
 .../navigator/TaxonNodeComparator.java        | 19 +++++++++++--------
 2 files changed, 13 insertions(+), 10 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 15afb2149..1e30eb0b2 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
@@ -76,10 +76,10 @@ public class TaxonNavigator extends CommonNavigator implements
 	@Override
 	protected IAdaptable getInitialInput() {
 		
-		/*TaxonComparatorSearch comparator = new TaxonComparatorSearch();
+		TaxonComparatorSearch comparator = new TaxonComparatorSearch();
 		TaxonNodeComparator viewerComparator = new TaxonNodeComparator(comparator);
 		this.getCommonViewer().setComparator(viewerComparator);
-		*/
+		
 		if (CdmStore.isActive()) {
 			
 			// TODO when closing and reopening the taxon navigator
diff --git a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNodeComparator.java b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNodeComparator.java
index 395d202e5..b049f86c0 100644
--- a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNodeComparator.java
+++ b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNodeComparator.java
@@ -1,15 +1,19 @@
 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.TaxonComparatorSearch;
 import eu.etaxonomy.cdm.model.taxon.TaxonNode;
+import eu.etaxonomy.taxeditor.ui.section.supplemental.IdentifiableSourceElement;
 
 public class TaxonNodeComparator extends ViewerComparator{
 
@@ -18,15 +22,14 @@ public class TaxonNodeComparator extends ViewerComparator{
 		super(comparator);
 	}
 
+	
+	
 	@Override
-	 public void sort(final Viewer viewer, Object[] elements) {
-		
-		TaxonBase[] nodesArray = new TaxonBase[elements.length];
-		if (elements.length>1){
-			for(int i=0; i<elements.length; i++){
-				nodesArray[i] = ((TaxonNode)elements[i]).getTaxon();
-			}
-			Arrays.sort(nodesArray, this.getComparator());
+	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{
+			return this.getComparator().compare(((TaxonNode)e1).getTaxon(),((TaxonNode)e2).getTaxon());
 		}
 	}
 }
-- 
2.34.1