Resolve merge conflict

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 1418de783873e8b328ecf9fb06852c57daf1899f..5c0fb97a5aa694ffdc97da19130f842174313456 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
@@ -56,10 +56,6 @@ public class NewTaxonNodeWizard extends AbstractNewEntityWizard<ITaxonTreeNode>{
             Reference sec = taxon.getSec();
             taxon.setSec(null);
             try{
-<<<<<<< HEAD
-               UpdateResult result = CdmStore.getService(ITaxonNodeService.class).createNewTaxonNode(parent.getUuid(), taxon, parent.getReference(), parent.getMicroReference());
-                       
-=======
                UUID parentNodeUuid;
                if(parent instanceof Classification){
                    parentNodeUuid = ((Classification) parent).getRootNode().getUuid();
@@ -69,7 +65,6 @@ public class NewTaxonNodeWizard extends AbstractNewEntityWizard<ITaxonTreeNode>{
                }
                 UpdateResult result = CdmStore.getService(ITaxonNodeService.class).createNewTaxonNode(parentNodeUuid, taxon, parent.getReference(), parent.getMicroReference());
 
->>>>>>> hotfix/3.12.4
                 //TaxonNode taxonNode = parent.addChildTaxon(taxon, parent.getReference(), parent.getMicroReference());
 
               /*  if(CdmStore.getCurrentSessionManager().isRemoting()) {
@@ -80,30 +75,15 @@ public class NewTaxonNodeWizard extends AbstractNewEntityWizard<ITaxonTreeNode>{
                generatedTaxonNodeUuid = result.getCdmEntity().getUuid();
                TaxonNode taxonNode = CdmStore.getService(ITaxonNodeService.class).load(generatedTaxonNodeUuid);
                taxonNode.getTaxon().setSec(sec);
-<<<<<<< HEAD
-               CdmStore.getService(ITaxonNodeService.class).merge(taxonNode);
-=======
                CdmStore.getService(ITaxonNodeService.class).merge(taxonNode, true);
->>>>>>> hotfix/3.12.4
                 Set<CdmBase> affectedObjects = new HashSet<CdmBase>();
                 if (result.getUpdatedObjects().iterator().hasNext()){
                        TaxonNode parentNode = (TaxonNode)result.getUpdatedObjects().iterator().next();
                        if(parentNode.getParent() == null) {
                         affectedObjects.add(taxonNode.getClassification());
                     }
-                       if(parentNode instanceof TaxonNode) {
-                        affectedObjects.add(parentNode);
-                    }
+                       affectedObjects.add(parentNode);
                 }
-<<<<<<< HEAD
-                
-
-                
-=======
-
-
-
->>>>>>> hotfix/3.12.4
 
                 if(CdmStore.getCurrentSessionManager().isRemoting()) {
                     CdmApplicationState.getCurrentDataChangeService()