fixing ordering in enums and remove dash #3752, #3736

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 4c4e1254959cee76dafc334d5c15d784725edac4..0bb685ed7deb3452948462d0549b73c7ac39756c 100644 (file)
--- 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 5ad338254660731a209eadc31e0c840fa98844ea..b40d349320f1c713889dd6af26036c69c3cadcd9 100644 (file)
--- 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;