Revision d9c55cdf
Added by Katja Luther about 10 years ago
| .gitattributes | ||
|---|---|---|
| 884 | 884 |
eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonLinkHelper.java -text |
| 885 | 885 |
eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNavigator.java -text |
| 886 | 886 |
eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNavigatorDataChangeBehavior.java -text |
| 887 |
eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNodeComparator.java -text |
|
| 887 | 888 |
eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNodeContentProvider.java -text |
| 888 | 889 |
eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNodeLabelProvider.java -text |
| 889 | 890 |
eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNodePropertyTester.java -text |
| eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNavigator.java | ||
|---|---|---|
| 31 | 31 |
import eu.etaxonomy.cdm.api.conversation.IConversationEnabled; |
| 32 | 32 |
import eu.etaxonomy.cdm.api.service.IClassificationService; |
| 33 | 33 |
import eu.etaxonomy.cdm.model.common.CdmBase; |
| 34 |
import eu.etaxonomy.cdm.model.taxon.TaxonComparatorSearch; |
|
| 34 | 35 |
import eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeMap; |
| 35 | 36 |
import eu.etaxonomy.taxeditor.model.DataChangeBridge; |
| 36 | 37 |
import eu.etaxonomy.taxeditor.model.IDataChangeBehavior; |
| ... | ... | |
| 74 | 75 |
/** {@inheritDoc} */
|
| 75 | 76 |
@Override |
| 76 | 77 |
protected IAdaptable getInitialInput() {
|
| 78 |
|
|
| 79 |
TaxonComparatorSearch comparator = new TaxonComparatorSearch(); |
|
| 80 |
TaxonNodeComparator viewerComparator = new TaxonNodeComparator(comparator); |
|
| 81 |
this.getCommonViewer().setComparator(viewerComparator); |
|
| 77 | 82 |
if (CdmStore.isActive()) {
|
| 83 |
|
|
| 78 | 84 |
// TODO when closing and reopening the taxon navigator |
| 79 | 85 |
// we do not preserve state. Closing the view, in contrary to |
| 80 | 86 |
// closing the whole application |
| eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNodeComparator.java | ||
|---|---|---|
| 1 |
package eu.etaxonomy.taxeditor.navigation.navigator; |
|
| 2 |
|
|
| 3 |
import java.util.Arrays; |
|
| 4 |
|
|
| 5 |
|
|
| 6 |
import org.eclipse.jface.viewers.Viewer; |
|
| 7 |
import org.eclipse.jface.viewers.ViewerComparator; |
|
| 8 |
|
|
| 9 |
|
|
| 10 |
import eu.etaxonomy.cdm.model.taxon.TaxonBase; |
|
| 11 |
import eu.etaxonomy.cdm.model.taxon.TaxonComparatorSearch; |
|
| 12 |
import eu.etaxonomy.cdm.model.taxon.TaxonNode; |
|
| 13 |
|
|
| 14 |
public class TaxonNodeComparator extends ViewerComparator{
|
|
| 15 |
|
|
| 16 |
|
|
| 17 |
public TaxonNodeComparator(TaxonComparatorSearch comparator) {
|
|
| 18 |
super(comparator); |
|
| 19 |
} |
|
| 20 |
|
|
| 21 |
@Override |
|
| 22 |
public void sort(final Viewer viewer, Object[] elements) {
|
|
| 23 |
|
|
| 24 |
TaxonBase[] nodesArray = new TaxonBase[elements.length]; |
|
| 25 |
if (elements.length>1){
|
|
| 26 |
for(int i=0; i<elements.length; i++){
|
|
| 27 |
nodesArray[i] = ((TaxonNode)elements[i]).getTaxon(); |
|
| 28 |
} |
|
| 29 |
Arrays.sort(nodesArray, this.getComparator()); |
|
| 30 |
} |
|
| 31 |
} |
|
| 32 |
} |
|
Also available in: Unified diff
with the fixed compareTo method the TaxonNodeComparator should work (#4114)