fix #9365: fix reuse taxon in newTaxonNodeWizard

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewTaxonNodeWizard.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewTaxonNodeWizard.java
index 0282d89fb90f84f429a13ebc3c26ec5dcfcb54ce..e84ac607c6fbaa197ec5597657249722890c73e1 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewTaxonNodeWizard.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewTaxonNodeWizard.java
@@ -72,8 +72,12 @@ public class NewTaxonNodeWizard extends AbstractNewEntityWizardParentChild<Taxon
                if (status == null){
                    notes = null;
                }
-               result = CdmStore.getService(ITaxonNodeService.class).createNewTaxonNode(parent.getUuid(), taxon, source, parent.getMicroReference(),
+               if (taxonNodePage.getExistingTaxon() != null){
+                   result = CdmStore.getService(ITaxonNodeService.class).createNewTaxonNode(parent.getUuid(), taxonNodePage.getExistingTaxon().getUuid(), null, null);
+               }else{
+                   result = CdmStore.getService(ITaxonNodeService.class).createNewTaxonNode(parent.getUuid(), taxon, source, parent.getMicroReference(),
                         status, notes);
+               }
 
                if (result.isOk()){
                    this.setEntity((TaxonNode)result.getCdmEntity());

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/TaxonNodeWizardPage.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/TaxonNodeWizardPage.java
index c5d680c0168fafc136744e8427a58c7612e281ea..0e0a074060357f8c5bacfe9e1d5dab19c492e88c 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/TaxonNodeWizardPage.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/TaxonNodeWizardPage.java
@@ -19,6 +19,7 @@ import org.eclipse.swt.widgets.Listener;
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.api.service.dto.CreateTaxonDTO;
 import eu.etaxonomy.cdm.common.CdmUtils;
+import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.cdm.model.taxon.TaxonNode;
 import eu.etaxonomy.taxeditor.l10n.Messages;
 import eu.etaxonomy.taxeditor.newWizard.IWizardPageListener;
@@ -154,6 +155,10 @@ public class TaxonNodeWizardPage extends AbstractCdmEntityWizardPage<TaxonNode>
           return ((TaxonNodeDetailElement) getDetailElement()).getEntity();
        }
 
+       public Taxon getExistingTaxon(){
+              return ((TaxonNodeDetailElement) getDetailElement()).getTaxon();
+           }
+
        @Override
        public void dispose() {
                formFactory.removePropertyChangeListener(this);