Revision 8dd144df
Added by Andreas Müller almost 9 years ago
| eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNavigator.java | ||
|---|---|---|
| 32 | 32 |
import eu.etaxonomy.cdm.api.conversation.IConversationEnabled; |
| 33 | 33 |
import eu.etaxonomy.cdm.api.service.IClassificationService; |
| 34 | 34 |
import eu.etaxonomy.cdm.model.common.CdmBase; |
| 35 |
|
|
| 36 | 35 |
import eu.etaxonomy.cdm.model.taxon.TaxonNaturalComparator; |
| 37 |
import eu.etaxonomy.cdm.model.taxon.TaxonNodeComparator; |
|
| 36 |
import eu.etaxonomy.cdm.model.taxon.TaxonNode; |
|
| 37 |
import eu.etaxonomy.cdm.model.taxon.TaxonNodeByRankAndNameComparator; |
|
| 38 | 38 |
import eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeMap; |
| 39 | 39 |
import eu.etaxonomy.taxeditor.model.DataChangeBridge; |
| 40 | 40 |
import eu.etaxonomy.taxeditor.model.IDataChangeBehavior; |
| ... | ... | |
| 80 | 80 |
/** {@inheritDoc} */
|
| 81 | 81 |
@Override |
| 82 | 82 |
protected IAdaptable getInitialInput() {
|
| 83 |
Comparator comparator; |
|
| 83 |
Comparator<TaxonNode> comparator;
|
|
| 84 | 84 |
if (PreferencesUtil.getSortNodesNaturally()){
|
| 85 | 85 |
comparator = new TaxonNaturalComparator(); |
| 86 | 86 |
} else{
|
| 87 |
comparator = new TaxonNodeComparator(); |
|
| 87 |
comparator = new TaxonNodeByRankAndNameComparator();
|
|
| 88 | 88 |
} |
| 89 | 89 |
TaxonNodeNavigatorComparator viewerComparator = new TaxonNodeNavigatorComparator(comparator); |
| 90 | 90 |
this.getCommonViewer().setComparator(viewerComparator); |
| eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNodeNavigatorComparator.java | ||
|---|---|---|
| 1 | 1 |
package eu.etaxonomy.taxeditor.navigation.navigator; |
| 2 | 2 |
|
| 3 |
import java.util.Arrays; |
|
| 4 | 3 |
import java.util.Comparator; |
| 5 | 4 |
|
| 6 |
|
|
| 7 | 5 |
import org.eclipse.jface.viewers.Viewer; |
| 8 | 6 |
import org.eclipse.jface.viewers.ViewerComparator; |
| 9 | 7 |
|
| 10 |
|
|
| 11 |
import eu.etaxonomy.cdm.model.common.IdentifiableEntity; |
|
| 12 | 8 |
import eu.etaxonomy.cdm.model.taxon.Classification; |
| 13 |
import eu.etaxonomy.cdm.model.taxon.TaxonBase; |
|
| 14 |
|
|
| 15 | 9 |
import eu.etaxonomy.cdm.model.taxon.TaxonNaturalComparator; |
| 16 | 10 |
import eu.etaxonomy.cdm.model.taxon.TaxonNode; |
| 17 |
import eu.etaxonomy.taxeditor.ui.section.supplemental.IdentifiableSourceElement; |
|
| 18 | 11 |
|
| 19 | 12 |
public class TaxonNodeNavigatorComparator extends ViewerComparator{
|
| 20 | 13 |
|
| 21 | 14 |
|
| 22 |
public TaxonNodeNavigatorComparator(Comparator<TaxonBase> comparator){
|
|
| 15 |
public TaxonNodeNavigatorComparator(Comparator<TaxonNode> comparator){
|
|
| 23 | 16 |
super(comparator); |
| 24 | 17 |
} |
| 25 | 18 |
|
Also available in: Unified diff
Fix renamed TaxonNodeComparator