Project

General

Profile

« Previous | Next » 

Revision 5039be8c

Added by Katja Luther about 7 years ago

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

View differences:

eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/entitycreator/NameCreator.java
1 1
/**
2 2
* Copyright (C) 2007 EDIT
3
* European Distributed Institute of Taxonomy 
3
* European Distributed Institute of Taxonomy
4 4
* http://www.e-taxonomy.eu
5
* 
5
*
6 6
* The contents of this file are subject to the Mozilla Public License Version 1.1
7 7
* See LICENSE.TXT at the top of this package for the full license terms.
8 8
*/
9 9

  
10 10
package eu.etaxonomy.taxeditor.bulkeditor.input.entitycreator;
11 11

  
12
import java.util.HashMap;
12
import java.util.List;
13 13
import java.util.Map;
14
import java.util.TreeMap;
14 15

  
15 16
import eu.etaxonomy.cdm.model.name.Rank;
16 17
import eu.etaxonomy.cdm.model.name.TaxonNameBase;
......
32 33
	 * @see eu.etaxonomy.taxeditor.bulkeditor.IEntityCreator#createEntity(java.lang.String)
33 34
	 */
34 35
	/** {@inheritDoc} */
35
	public TaxonNameBase createEntity(String text) {
36
    @Override
37
    public TaxonNameBase createEntity(String text) {
36 38
		TaxonNameBase name = PreferencesUtil.getPreferredNomenclaturalCode().getNewTaxonNameInstance(null);
37 39
		name.setTitleCache(text, true);
38 40
		//name.setTitleCache(text);
......
43 45
	 * @see eu.etaxonomy.taxeditor.annotatedlineeditor.IEntityCreator#createEntity(java.lang.Class, java.lang.String)
44 46
	 */
45 47
	/** {@inheritDoc} */
46
	public TaxonNameBase createEntity(Object key, String text) {
48
    @Override
49
    public TaxonNameBase createEntity(Object key, String text) {
47 50
		return ParseHandler.parseName(text, (Rank) key);
48 51
	}
49 52

  
......
55 58
	 *
56 59
	 * @return a {@link java.util.Map} object.
57 60
	 */
58
	public Map<Object, String> getKeyLabelPairs() {
59
		Map<Object, String> result = new HashMap<Object, String>();
60
		for (Rank rank : CdmStore.getTermManager().getPreferredTerms(Rank.class)) {
61
	 @Override
62
    public Map<Object, String> getKeyLabelPairs() {
63
		Map<Object, String> result = new TreeMap<Object, String>();
64
		List<Rank> ranks = CdmStore.getTermManager().getPreferredTerms(Rank.class);
65
		for (Rank rank : ranks) {
61 66
			result.put(rank, rank.getLabel());
62 67
		}
63 68
		return result;

Also available in: Unified diff