Fixes from Katja for commit issue

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientClassificationService.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientClassificationService.java
index 9dd40da171472dfb0b3ea4ec4b9b8545e693ea52..5e33668e57a1e86744a9c0a8e23b71c23bab8058 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientClassificationService.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientClassificationService.java
@@ -942,10 +942,5 @@ public class TransientClassificationService implements IClassificationService {
        return defaultService.createHierarchyInClassification(arg1, arg2);
     }
 
-       @Override
-       public DeleteResult delete(UUID arg0) {
-               return defaultService.delete(arg0);
-       }
-
 
 }

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientCollectionService.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientCollectionService.java
index 290e5cfaef36467c773fbca324cc1617bceb9c16..bfd484b5e2a4e0c609c316f0d12e4a93301a48e4 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientCollectionService.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientCollectionService.java
@@ -704,9 +704,12 @@ public class TransientCollectionService implements ICollectionService {
                return defaultService.findByIdentifier(clazz, identifier, identifierType, matchmode, includeEntity, pageSize, pageNumber, propertyPaths);
        }
 
+<<<<<<< Updated upstream
        @Override
        public DeleteResult delete(UUID arg0) {
 
                return defaultService.delete(arg0);
        }
+=======
+>>>>>>> Stashed changes
 }

diff --git a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNavigator.java b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNavigator.java
index 3913e0a2922c3eec1cc9e992e54b697fa4413d30..813701c91f55f4c041d29d407b69d3f6bd54f40e 100644 (file)
--- a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNavigator.java
+++ b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNavigator.java
@@ -32,8 +32,9 @@ import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.api.conversation.IConversationEnabled;
 import eu.etaxonomy.cdm.api.service.IClassificationService;
 import eu.etaxonomy.cdm.model.common.CdmBase;
-import eu.etaxonomy.cdm.model.taxon.TaxonComparatorSearch;
+
 import eu.etaxonomy.cdm.model.taxon.TaxonNaturalComparator;
+import eu.etaxonomy.cdm.model.taxon.TaxonNodeComparator;
 import eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeMap;
 import eu.etaxonomy.taxeditor.model.DataChangeBridge;
 import eu.etaxonomy.taxeditor.model.IDataChangeBehavior;
@@ -83,9 +84,9 @@ public class TaxonNavigator extends CommonNavigator implements
                if (PreferencesUtil.getSortNodesNaturally()){
                        comparator = new TaxonNaturalComparator();
                } else{
-                       comparator = new TaxonComparatorSearch();
+                       comparator = new TaxonNodeComparator();
                }
-               TaxonNodeComparator viewerComparator = new TaxonNodeComparator(comparator);
+               TaxonNodeNavigatorComparator viewerComparator = new TaxonNodeNavigatorComparator(comparator);
                this.getCommonViewer().setComparator(viewerComparator);
         setLinkingEnabled(true);
 //             this.getCommonViewer().addSelectionChangedListener(new ISelectionChangedListener() {

diff --git a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNodeNavigatorComparator.java b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNodeNavigatorComparator.java
new file mode 100644 (file)
index 0000000..04aa2f7
--- /dev/null
+++ b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNodeNavigatorComparator.java
@@ -0,0 +1,40 @@
+package eu.etaxonomy.taxeditor.navigation.navigator;
+
+import java.util.Arrays;
+import java.util.Comparator;
+
+
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.jface.viewers.ViewerComparator;
+
+
+import eu.etaxonomy.cdm.model.common.IdentifiableEntity;
+import eu.etaxonomy.cdm.model.taxon.Classification;
+import eu.etaxonomy.cdm.model.taxon.TaxonBase;
+
+import eu.etaxonomy.cdm.model.taxon.TaxonNaturalComparator;
+import eu.etaxonomy.cdm.model.taxon.TaxonNode;
+import eu.etaxonomy.taxeditor.ui.section.supplemental.IdentifiableSourceElement;
+
+public class TaxonNodeNavigatorComparator extends ViewerComparator{
+
+       
+       public TaxonNodeNavigatorComparator(Comparator<TaxonBase> comparator){
+               super(comparator);
+       }
+
+       
+       
+       @Override
+       public int compare(Viewer viewer, Object e1, Object e2){
+               if (e1 instanceof Classification && e2 instanceof Classification){
+                       return ((Classification)e1).getTitleCache().compareTo(((Classification)e2).getTitleCache());
+               } else{
+                       if (this.getComparator() instanceof TaxonNaturalComparator){
+                               return this.getComparator().compare((TaxonNode)e1, (TaxonNode)e2);
+                       }else{
+                               return this.getComparator().compare(((TaxonNode)e1).getTaxon(),((TaxonNode)e2).getTaxon());
+                       }
+               }
+       }
+}