Compare taxon editor input based on taxon instead of taxon node (Revert

93c6e0a894d2e4b0c9df6c7c3feff2f20e0b9e38)

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/TaxonEditorInput.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/TaxonEditorInput.java
index 5b5bcb9f15d390d53e3ba2a714cb6cc7204645ae..98481d45899bd15cccfc78bdce04592fdf508221 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/TaxonEditorInput.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/TaxonEditorInput.java
@@ -337,10 +337,9 @@ public class TaxonEditorInput  extends CdmEntitySessionInput implements IEditorI
     @Override
     public boolean equals(Object obj) {
         if (TaxonEditorInput.class.equals(obj.getClass())
-                && getTaxonNode() != null
-                && getTaxonNode().equals(((TaxonEditorInput) obj).getTaxonNode())
-                ){
-            if(((TaxonEditorInput) obj).getInitiallySelectedTaxonBase() != null){
+                && getTaxon() != null
+                && getTaxon().equals(((TaxonEditorInput) obj).getTaxon())) {
+            if (((TaxonEditorInput) obj).getInitiallySelectedTaxonBase() != null){
                 setInitiallySelectedTaxonBase(((TaxonEditorInput) obj).getInitiallySelectedTaxonBase());
             }
             return true;
@@ -456,7 +455,7 @@ public class TaxonEditorInput  extends CdmEntitySessionInput implements IEditorI
     @Override
     public void merge() {
        CdmStore.getService(ITaxonNodeService.class).merge(taxonNode, true);
-       
+
     }
 
     @Override