From 736e7cfa8a597c7efab8109f9c5941514f75e731 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Andreas=20M=C3=BCller?= <a.mueller@bgbm.org>
Date: Wed, 30 Oct 2013 11:21:54 +0000
Subject: [PATCH] fixing ordering in enums and remove dash  #3752, #3736

---
 .../bulkeditor/input/entitycreator/OccurrenceCreator.java     | 4 ++--
 .../java/eu/etaxonomy/taxeditor/model/AbstractUtility.java    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/entitycreator/OccurrenceCreator.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/entitycreator/OccurrenceCreator.java
index 4c4e12549..0bb685ed7 100644
--- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/entitycreator/OccurrenceCreator.java
+++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/entitycreator/OccurrenceCreator.java
@@ -12,6 +12,7 @@ package eu.etaxonomy.taxeditor.bulkeditor.input.entitycreator;
 
 import java.util.Arrays;
 import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.Map;
 
 import org.apache.log4j.Logger;
@@ -74,14 +75,13 @@ public class OccurrenceCreator implements
 	 */
 	@Override
 	public Map<Object, String> getKeyLabelPairs() {
-	    Map<Object, String> keyLabelPairs = new HashMap<Object, String>();
+	    Map<Object, String> keyLabelPairs = new LinkedHashMap<Object, String>();
 	    keyLabelPairs.putAll(AbstractUtility.orderTerms(Arrays.asList(SpecimenOrObservationType.values())));
 	    return keyLabelPairs;
 	}
 
 	@Override
 	public boolean savesEntity() {
-		// TODO Auto-generated method stub
 		return true;
 	}
 
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/AbstractUtility.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/AbstractUtility.java
index 5ad338254..b40d34932 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/AbstractUtility.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/AbstractUtility.java
@@ -954,7 +954,7 @@ public abstract class AbstractUtility {
         Comparator<T> comparator = new Comparator<T>() {
             @Override
             public int compare(T t1, T t2) {
-                return t1.getKey().compareTo(t2.getKey());
+                return t1.getMessage().compareTo(t2.getMessage());
             }
         };
         Map<T, String> result = new LinkedHashMap<T, String>();
@@ -984,7 +984,7 @@ public abstract class AbstractUtility {
             T root = entry.getKey();
             result.put(root, root.getMessage());
             for(T child:entry.getValue()){
-                result.put(child, " - " + child.getMessage());
+                result.put(child, "  " + child.getMessage());
             }
         }
         return result;
-- 
2.34.1