From 20ebc923cc36d47fbfd41f70b231cd97716f3c0d Mon Sep 17 00:00:00 2001
From: Patric Plitzner
Date: Wed, 30 Oct 2013 09:11:04 +0000
Subject: [PATCH] - created utility method in AbstractUtility for
sorting/ordering IEnumTerms according to the term hierarchy - used method
for EnumComboElement and OccurenceCreator (fixes #3736)
---
.../entitycreator/OccurrenceCreator.java | 62 +----
.../taxeditor/model/AbstractUtility.java | 222 +++++++++++++-----
.../taxeditor/ui/combo/EnumComboElement.java | 70 +++---
3 files changed, 204 insertions(+), 150 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 3796a11f4..4c4e12549 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
@@ -10,13 +10,9 @@
package eu.etaxonomy.taxeditor.bulkeditor.input.entitycreator;
-import java.util.Comparator;
-import java.util.LinkedHashMap;
+import java.util.Arrays;
+import java.util.HashMap;
import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-import java.util.TreeMap;
-import java.util.TreeSet;
import org.apache.log4j.Logger;
import org.eclipse.core.runtime.IStatus;
@@ -27,6 +23,7 @@ import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;
import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationType;
import eu.etaxonomy.taxeditor.annotatedlineeditor.IEntityCreator;
import eu.etaxonomy.taxeditor.bulkeditor.BulkEditorUtil;
+import eu.etaxonomy.taxeditor.model.AbstractUtility;
import eu.etaxonomy.taxeditor.newWizard.NewDerivedUnitBaseWizard;
/**
@@ -77,56 +74,9 @@ public class OccurrenceCreator implements
*/
@Override
public Map