From: Katja Luther <k.luther@bgbm.org>
Date: Thu, 20 Apr 2017 09:17:55 +0000 (+0200)
Subject: fix #6570: use treeMap for getKeyLabelPairs() to sort the ranks
X-Git-Tag: 4.7.0^2~57
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/5039be8cb876e8be10ca29a7f80fadbb7869d224?ds=sidebyside

fix #6570: use treeMap for getKeyLabelPairs() to sort the ranks
---

diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/entitycreator/NameCreator.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/entitycreator/NameCreator.java
index 8cb943b83..98458d1b5 100644
--- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/entitycreator/NameCreator.java
+++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/entitycreator/NameCreator.java
@@ -1,16 +1,17 @@
 /**
 * Copyright (C) 2007 EDIT
-* European Distributed Institute of Taxonomy 
+* European Distributed Institute of Taxonomy
 * http://www.e-taxonomy.eu
-* 
+*
 * The contents of this file are subject to the Mozilla Public License Version 1.1
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
 package eu.etaxonomy.taxeditor.bulkeditor.input.entitycreator;
 
-import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
+import java.util.TreeMap;
 
 import eu.etaxonomy.cdm.model.name.Rank;
 import eu.etaxonomy.cdm.model.name.TaxonNameBase;
@@ -32,7 +33,8 @@ public class NameCreator implements IEntityCreator<TaxonNameBase> {
 	 * @see eu.etaxonomy.taxeditor.bulkeditor.IEntityCreator#createEntity(java.lang.String)
 	 */
 	/** {@inheritDoc} */
-	public TaxonNameBase createEntity(String text) {
+    @Override
+    public TaxonNameBase createEntity(String text) {
 		TaxonNameBase name = PreferencesUtil.getPreferredNomenclaturalCode().getNewTaxonNameInstance(null);
 		name.setTitleCache(text, true);
 		//name.setTitleCache(text);
@@ -43,7 +45,8 @@ public class NameCreator implements IEntityCreator<TaxonNameBase> {
 	 * @see eu.etaxonomy.taxeditor.annotatedlineeditor.IEntityCreator#createEntity(java.lang.Class, java.lang.String)
 	 */
 	/** {@inheritDoc} */
-	public TaxonNameBase createEntity(Object key, String text) {
+    @Override
+    public TaxonNameBase createEntity(Object key, String text) {
 		return ParseHandler.parseName(text, (Rank) key);
 	}
 
@@ -55,9 +58,11 @@ public class NameCreator implements IEntityCreator<TaxonNameBase> {
 	 *
 	 * @return a {@link java.util.Map} object.
 	 */
-	public Map<Object, String> getKeyLabelPairs() {
-		Map<Object, String> result = new HashMap<Object, String>();
-		for (Rank rank : CdmStore.getTermManager().getPreferredTerms(Rank.class)) {
+	 @Override
+    public Map<Object, String> getKeyLabelPairs() {
+		Map<Object, String> result = new TreeMap<Object, String>();
+		List<Rank> ranks = CdmStore.getTermManager().getPreferredTerms(Rank.class);
+		for (Rank rank : ranks) {
 			result.put(rank, rank.getLabel());
 		}
 		return result;