Project

General

Profile

« Previous | Next » 

Revision 4633f830

Added by Katja Luther almost 9 years ago

make the order of the taxon nodes editable

View differences:

eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNavigator.java
11 11
package eu.etaxonomy.taxeditor.navigation.navigator;
12 12

  
13 13
import java.util.ArrayList;
14
import java.util.Comparator;
14 15
import java.util.HashSet;
15 16
import java.util.List;
16 17
import java.util.Observable;
......
31 32
import eu.etaxonomy.cdm.api.conversation.IConversationEnabled;
32 33
import eu.etaxonomy.cdm.api.service.IClassificationService;
33 34
import eu.etaxonomy.cdm.model.common.CdmBase;
35
import eu.etaxonomy.cdm.model.taxon.TaxonComparator;
34 36
import eu.etaxonomy.cdm.model.taxon.TaxonComparatorSearch;
37
import eu.etaxonomy.cdm.model.taxon.TaxonNaturalComparator;
35 38
import eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeMap;
36 39
import eu.etaxonomy.taxeditor.model.DataChangeBridge;
37 40
import eu.etaxonomy.taxeditor.model.IDataChangeBehavior;
38 41
import eu.etaxonomy.taxeditor.model.MessagingUtils;
39 42
import eu.etaxonomy.taxeditor.navigation.NavigationUtil;
40 43
import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
44
import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
41 45
import eu.etaxonomy.taxeditor.store.CdmStore;
42 46
import eu.etaxonomy.taxeditor.store.LoginManager;
43 47

  
......
76 80
	/** {@inheritDoc} */
77 81
	@Override
78 82
	protected IAdaptable getInitialInput() {
79

  
80
		TaxonComparatorSearch comparator = new TaxonComparatorSearch();
83
		Comparator comparator;
84
		if (PreferencesUtil.getSortNodesNaturally()){
85
			comparator = new TaxonNaturalComparator();
86
		} else{
87
			comparator = new TaxonComparatorSearch();
88
		}
81 89
		TaxonNodeComparator viewerComparator = new TaxonNodeComparator(comparator);
82 90
		this.getCommonViewer().setComparator(viewerComparator);
83 91
        setLinkingEnabled(true);

Also available in: Unified diff