From 0500957b7dacebd6836fb98bfd3e6d0a21ac7f8d Mon Sep 17 00:00:00 2001
From: Patric Plitzner <p.plitzner@bgbm.org>
Date: Tue, 5 Nov 2013 16:55:40 +0000
Subject: [PATCH]  - sorting/ordering ONLY for SpecimenOrObservationType
 (#3736)

---
 .../taxeditor/ui/combo/EnumComboElement.java  | 24 +++++++++++++------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/combo/EnumComboElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/combo/EnumComboElement.java
index c73a79271..04f64ab05 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/combo/EnumComboElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/combo/EnumComboElement.java
@@ -192,13 +192,23 @@ public class EnumComboElement<T extends IEnumTerm<T>> extends
 	 * populateTypes
 	 * </p>
 	 */
-	private void populateTypes(){
-	    Collection<T> elementsForClass = getElementsForClass(enumType);
-        LinkedHashMap<T, String> orderedTerms = AbstractUtility.orderTerms(elementsForClass);
-		for(Entry<T, String> keyLabelPair : orderedTerms.entrySet()){
-			elementTypeList.add(keyLabelPair.getKey());
-			combo.add(keyLabelPair.getValue());
-		}
+    private void populateTypes(){
+        Collection<T> elementsForClass = getElementsForClass(enumType);
+        // special hierarchical order for specimens
+        if(enumType.equals(SpecimenOrObservationType.class)){
+            LinkedHashMap<T, String> orderedTerms = AbstractUtility.orderTerms(elementsForClass);
+            for(Entry<T, String> keyLabelPair : orderedTerms.entrySet()){
+                elementTypeList.add(keyLabelPair.getKey());
+                combo.add(keyLabelPair.getValue());
+            }
+        }
+        // default order
+        else{
+            for(T enumElement : getElementsForClass(enumType)){
+                elementTypeList.add(enumElement);
+                combo.add(((Enum) enumElement).name());
+            }
+        }
 	}
 
 	/**
-- 
2.34.1