Merge branch 'develop' of https://dev.e-taxonomy.eu/git/taxeditor into develop

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/MoveSynonymToAnotherAcceptedTaxonOperation.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/MoveSynonymToAnotherAcceptedTaxonOperation.java
index ac1aca5ecb507148d3d198a5a6c089179e5b5ecb..1e3b300ded473df1a50d7b42f89c222035ed5ecb 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/MoveSynonymToAnotherAcceptedTaxonOperation.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/MoveSynonymToAnotherAcceptedTaxonOperation.java
@@ -11,6 +11,7 @@ import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;\r
 \r
 import eu.etaxonomy.cdm.api.service.ITaxonService;\r
+import eu.etaxonomy.cdm.api.service.UpdateResult;\r
 import eu.etaxonomy.cdm.api.service.exception.HomotypicalGroupChangeException;\r
 import eu.etaxonomy.cdm.model.name.TaxonNameBase;\r
 import eu.etaxonomy.cdm.model.taxon.Synonym;\r
@@ -76,17 +77,17 @@ public class MoveSynonymToAnotherAcceptedTaxonOperation extends
 \r
 \r
                ((TaxonNameEditor)EditorUtil.getActiveMultiPageTaxonEditor().getActiveEditor()).getConversationHolder().commit();\r
-\r
+               UpdateResult result;\r
 \r
 \r
                try {\r
-                       synRel = (SynonymRelationship) CdmStore.getService(ITaxonService.class).moveSynonymToAnotherTaxon(synRel,\r
+                       result = CdmStore.getService(ITaxonService.class).moveSynonymToAnotherTaxon(synRel,\r
                                this.element.getUuid(),\r
                                true,\r
                                synRel.getType(),\r
                                null,\r
                                null,\r
-                               true).getCdmEntity();\r
+                               true);\r
                } catch (HomotypicalGroupChangeException e) {\r
                        // TODO Auto-generated catch block\r
                        e.printStackTrace();\r

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/DefinedTermEditor.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/DefinedTermEditor.java
index 11bea5cfb7573b68bc2063613dac4034cdbfd511..d4592ef3fb6d9d9f1d5cf103e7a8b0d3c962d310 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/DefinedTermEditor.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/DefinedTermEditor.java
@@ -247,10 +247,10 @@ public class DefinedTermEditor extends EditorPart implements IConversationEnable
                    OrderedTermBase otbe2 = (OrderedTermBase)e2;\r
                    if(otbe1.getOrderIndex() == otbe2.getOrderIndex()) {\r
                        return 0;\r
-                   } else if(otbe1.isHigher(otbe2)) {\r
-                       return 1;\r
-                   } else {\r
-                       return -1;\r
+                   } else if (otbe1.getOrderIndex() < otbe2.getOrderIndex()){\r
+                       return -1;\r
+                   } else{\r
+                       return 1;\r
                    }\r
                } else {\r
                    return super.compare(viewer, e1, e2);\r