Add remoting checks for merge, Move to merge call which returns updated transient...
authorCherian Mathew <c.mathew@bgbm.org>
Fri, 2 Oct 2015 08:59:08 +0000 (10:59 +0200)
committerCherian Mathew <c.mathew@bgbm.org>
Fri, 2 Oct 2015 08:59:08 +0000 (10:59 +0200)
28 files changed:
eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/AgentEditorInput.java
eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/GroupEditorInput.java
eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/NameEditorInput.java
eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/OccurrenceEditorInput.java
eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/ReferenceEditorInput.java
eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/TaxonEditorInput.java
eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/UserEditorInput.java
eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/session/CdmEntitySession.java
eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/session/NullSession.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/group/authority/CdmAuthorityEditorInput.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateViewEditorInput.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/contextMenu/CreateDerivateContextMenu.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/DefinedTermEditor.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewAmplificationWizard.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewClassificationWizard.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewCollectionWizard.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewDerivedUnitBaseWizard.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewFieldUnitWizard.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewGrantedAuthorityWizard.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewGroupWizard.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewInstitutionWizard.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewNonViralNameWizard.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewPersonWizard.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewPolytomousKeyWizard.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewPrimerWizard.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewTaxonNodeWizard.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewTeamWizard.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewUserWizard.java

index c4c7854749c2c204e9b9d83d8cfec3b16ae8a917..cff075cc25788937175a05579a6445730732f74a 100644 (file)
@@ -148,7 +148,7 @@ public class AgentEditorInput extends AbstractBulkEditorInput<TeamOrPersonBase>
        @Override
        public TeamOrPersonBase save(TeamOrPersonBase entity) {
            if(CdmStore.getCurrentSessionManager().isRemoting()) {
-               return (TeamOrPersonBase) CdmStore.getService(IAgentService.class).merge(entity);
+               return (TeamOrPersonBase) CdmStore.getService(IAgentService.class).merge(entity, true);
            } else {
                CdmStore.getService(IAgentService.class).saveOrUpdate(entity) ;
                return entity;
index 1ec68333958a42b6fe3c518f45d7e3b0ffe25a85..6e44e52f6837dfd71e54852649148e4c3695ab65 100644 (file)
@@ -63,7 +63,7 @@ public class GroupEditorInput extends AbstractBulkEditorInput<Group> {
        @Override
        public Group save(Group entity) {
            if(CdmStore.getCurrentSessionManager().isRemoting()) {
-               return CdmStore.getService(IGroupService.class).merge(entity) ;
+               return CdmStore.getService(IGroupService.class).merge(entity, true) ;
            } else {
                CdmStore.getService(IGroupService.class).saveOrUpdate(entity);
                return entity;
index 2763b2f634f71e56540df838364ad4a38ea31460..8b56ea1a8c2e0399e99bd2ea15f7d464f2c71cb8 100644 (file)
@@ -119,7 +119,7 @@ public class NameEditorInput extends AbstractBulkEditorInput<TaxonNameBase> {
        @Override
     public TaxonNameBase save(TaxonNameBase entity) {
            if(CdmStore.getCurrentSessionManager().isRemoting()) {
-               return CdmStore.getService(INameService.class).merge(entity) ;
+               return CdmStore.getService(INameService.class).merge(entity, true) ;
            } else {
                CdmStore.getService(INameService.class).saveOrUpdate(entity);
                return entity;
index 1e66ad04702b96ff4d0664ef703bddefdd71a489..e219a500f5742ab117107a819ad8e06147729950 100644 (file)
@@ -138,7 +138,7 @@ public class OccurrenceEditorInput extends AbstractBulkEditorInput<SpecimenOrObs
        @Override
     public SpecimenOrObservationBase<IIdentifiableEntityCacheStrategy> save(SpecimenOrObservationBase entity) {
            if(CdmStore.getCurrentSessionManager().isRemoting()) {
-               return CdmStore.getService(IOccurrenceService.class).merge(entity) ;
+               return CdmStore.getService(IOccurrenceService.class).merge(entity, true) ;
            } else {
                CdmStore.getService(IOccurrenceService.class).save(entity);
                return entity;
index ea8598b67b1742711062f184bf8c071be87bbecd..32df06a57bba415052508f4c43776c4341b41e0f 100644 (file)
@@ -140,7 +140,7 @@ public class ReferenceEditorInput extends AbstractBulkEditorInput<Reference> {
        @Override
     public Reference save(Reference entity) {
            if(CdmStore.getCurrentSessionManager().isRemoting()) {
-               return CdmStore.getService(IReferenceService.class).merge(entity);
+               return CdmStore.getService(IReferenceService.class).merge(entity, true);
            } else {
                CdmStore.getService(IReferenceService.class).saveOrUpdate(entity);
                return entity;
index 1ce4878383e72f4dd9cd266a448669bc6fa51eac..4f8473544da1aafee7478afb87b8e45248a73b78 100644 (file)
@@ -72,7 +72,7 @@ public class TaxonEditorInput extends AbstractBulkEditorInput<TaxonBase>{
        @Override\r
        public TaxonBase save(TaxonBase entity) {\r
            if(CdmStore.getCurrentSessionManager().isRemoting()) {\r
-               return CdmStore.getService(ITaxonService.class).merge(entity);\r
+               return CdmStore.getService(ITaxonService.class).merge(entity, true);\r
            } else {\r
                CdmStore.getService(ITaxonService.class).saveOrUpdate(entity);\r
                return entity;\r
index e9469eca101555416640a607d1cbfdbeb6d9e92d..bcbff535c0bf5d4714358ab9d172089b4df89f10 100644 (file)
@@ -63,7 +63,7 @@ public class UserEditorInput extends AbstractBulkEditorInput<User> {
        @Override
        public User save(User entity) {
            if(CdmStore.getCurrentSessionManager().isRemoting()) {
-               return CdmStore.getService(IUserService.class).merge(entity);
+               return CdmStore.getService(IUserService.class).merge(entity, true);
            } else {
                CdmStore.getService(IUserService.class).saveOrUpdate(entity);
                return entity;
index 4bb1c3d58c500ddcd90073e74ba4111fef2be9a8..85c7d33bbaa76f044a2c33ce694ff5f3f2e94760 100644 (file)
@@ -247,7 +247,7 @@ public class CdmEntitySession implements ICdmEntitySession  {
      */
     @Override
     public <T extends CdmBase> T remoteUpdate(IService<T> service, T cdmBase) {
-        T mergedCdmBase = service.merge(cdmBase);
+        T mergedCdmBase = service.merge(cdmBase, true);
         return mergedCdmBase;
     }
 
index fcb6c69b6fdab0f38dbb13b0b41953c8c83d76b6..130167c2cea250a02d8fb99d3b9dc88726615e73 100644 (file)
@@ -177,7 +177,7 @@ public class NullSession implements ICdmEntitySession {
      */
     @Override
     public <T extends CdmBase> T remoteUpdate(IService<T> service, T cdmBase) {
-        T mergedCdmBase = service.merge(cdmBase);
+        T mergedCdmBase = service.merge(cdmBase, true);
         return mergedCdmBase;
     }
 
index 77de015f12235de15deff65670b805486e22df27..59fa37378eb43b00b039cb4957041edb1a978fd3 100644 (file)
@@ -158,7 +158,7 @@ public class CdmAuthorityEditorInput extends CdmEntitySessionInput implements IE
     @Override
     public void merge() {
         if(CdmStore.getCurrentSessionManager().isRemoting()) {
-            group = CdmStore.getService(IGroupService.class).merge(group);
+            group = CdmStore.getService(IGroupService.class).merge(group, true);
         }
     }
 }
index a2a7982feb3aac5fc414056f13775fc0d424a86d..f0d3afe2dfaab718431fceff60fec1ca0dc56a84 100644 (file)
@@ -238,7 +238,7 @@ public class DerivateViewEditorInput extends CdmEntitySessionInput implements IE
     @Override
     public void merge() {
         if(CdmStore.getCurrentSessionManager().isRemoting()) {
-            List<SpecimenOrObservationBase> mergedEntities = CdmApplicationState.getCurrentAppConfig().getOccurrenceService().merge(new ArrayList(getRootEntities()));
+            List<SpecimenOrObservationBase> mergedEntities = CdmApplicationState.getCurrentAppConfig().getOccurrenceService().merge(new ArrayList(getRootEntities()), true);
         }
 
     }
index a491a7abfcbab933ae08c9684d0719cbfe129526..b3c0bd85cf6b933bbc9e33c791ddc6e0f016fe88 100644 (file)
@@ -138,7 +138,9 @@ public class CreateDerivateContextMenu extends CompoundContributionItem {
                         specimenOrObservationBase.addDerivationEvent(DerivationEvent.NewSimpleInstance(specimenOrObservationBase, mediaSpecimen, derivationEventType));
                         mediaSpecimen.setCacheStrategy(new DerivedUnitFacadeCacheStrategy());
                         mediaSpecimen.getTitleCache(); //update title cache
-                        CdmStore.getService(IOccurrenceService.class).merge(specimenOrObservationBase);
+                        if(CdmStore.getCurrentSessionManager().isRemoting()) {
+                            CdmStore.getService(IOccurrenceService.class).merge(specimenOrObservationBase, true);
+                        }
                     }
 
                     //refresh view
@@ -202,13 +204,17 @@ public class CreateDerivateContextMenu extends CompoundContributionItem {
                     Sequence newInstance = Sequence.NewInstance(dnaSample, "", 0); //$NON-NLS-1$
                     createdElement = newInstance;
                 }
-                CdmStore.getService(IOccurrenceService.class).merge((SpecimenOrObservationBase) selectedDerivate);
+                if(CdmStore.getCurrentSessionManager().isRemoting()) {
+                    CdmStore.getService(IOccurrenceService.class).merge((SpecimenOrObservationBase) selectedDerivate, true);
+                }
             }
             else if(selectedDerivate instanceof Sequence){
                 SingleRead newInstance = SingleRead.NewInstance();
                 ((Sequence) selectedDerivate).addSingleRead(newInstance);
                 createdElement = newInstance;
-                CdmApplicationState.getCurrentAppConfig().getSequenceService().merge((Sequence)selectedDerivate);
+                if(CdmStore.getCurrentSessionManager().isRemoting()) {
+                    CdmApplicationState.getCurrentAppConfig().getSequenceService().merge((Sequence)selectedDerivate, true);
+                }
             }
             else if(selectedDerivate instanceof SpecimenOrObservationBase && DerivedUnit.class.isAssignableFrom(childClass)){
                 SpecimenOrObservationBase<?> specimenOrObservationBase = (SpecimenOrObservationBase<?>)selectedDerivate;
@@ -234,12 +240,13 @@ public class CreateDerivateContextMenu extends CompoundContributionItem {
                 derivedUnit.setCacheStrategy(new DerivedUnitFacadeCacheStrategy());
                 derivedUnit.getTitleCache(); //update title cache
                 createdElement = derivedUnit;
-                CdmStore.getService(IOccurrenceService.class).merge((SpecimenOrObservationBase) selectedDerivate);
+                if(CdmStore.getCurrentSessionManager().isRemoting()) {
+                    CdmStore.getService(IOccurrenceService.class).merge((SpecimenOrObservationBase) selectedDerivate, true);
+                }
             }
 
             //refresh view
             if(derivateView!=null){
-                //CdmStore.getService(IOccurrenceService.class).merge((SpecimenOrObservationBase) selectedDerivate);
                 derivateView.getConversationHolder().commit();
                 derivateView.refreshTree(createdElement);
             }
index d83a187cb3fb349a39a54d2ce709478ef7100f12..3c1622449a607285cf67c703adf7986b26447cc9 100644 (file)
@@ -161,7 +161,9 @@ public class DefinedTermEditor extends EditorPart implements IConversationEnable
        @Override\r
        public void doSave(IProgressMonitor monitor) {\r
                getConversationHolder().commit();\r
-               CdmStore.getService(IVocabularyService.class).merge(new ArrayList<TermVocabulary>(getRootEntities()));\r
+               if(CdmStore.getCurrentSessionManager().isRemoting()) {\r
+                   CdmStore.getService(IVocabularyService.class).merge(new ArrayList<TermVocabulary>(getRootEntities()), true);\r
+               }\r
                setDirty(false);\r
                getDefinedTermEditorInput().initialiseVocabularies();\r
                viewer.refresh();\r
index 02012cdbb023b2670ad4cc66e5cf982ded21293f..69fc04ed2b324d6ad69b5d93f8589af99796bff6 100644 (file)
@@ -38,7 +38,11 @@ public class NewAmplificationWizard  extends AbstractNewEntityWizard<Amplificati
     /** {@inheritDoc} */
     @Override
     protected void saveEntity() {
-        CdmStore.getService(IAmplificationService.class).merge(getEntity());
+        if(CdmStore.getCurrentSessionManager().isRemoting()) {
+            CdmStore.getService(IAmplificationService.class).merge(getEntity(), true);
+        } else {
+            CdmStore.getService(IAmplificationService.class).save(getEntity());
+        }
     }
 
     /** {@inheritDoc} */
index c298a5781a61d905f78707b0ae8c436de73d8b82..4586b9275e2329e4580b97a9361e51ec122c32d3 100644 (file)
@@ -50,10 +50,13 @@ public class NewClassificationWizard extends AbstractNewEntityWizard<Classificat
        protected void saveEntity() {
                //CdmStore.getService(IClassificationService.class).saveOrUpdate(getEntity());
            Classification classification = getEntity();
-           CdmStore.getService(IClassificationService.class).merge(getEntity());
-
-           CdmApplicationState.getCurrentDataChangeService()
-        .fireChangeEvent(new CdmChangeEvent(Action.Create, classification, NewTaxonNodeWizard.class), true);
+           if(CdmStore.getCurrentSessionManager().isRemoting()) {
+               CdmStore.getService(IClassificationService.class).merge(getEntity(), true);
+               CdmApplicationState.getCurrentDataChangeService()
+               .fireChangeEvent(new CdmChangeEvent(Action.Create, classification, NewTaxonNodeWizard.class), true);
+           } else {
+               CdmStore.getService(IClassificationService.class).save(getEntity());
+           }
 
        }
 
index e81a0e50b70b331b31d21fbadbdb773dfdbce9b4..8efc02f8cfa1f4db1f0fad5c2ea5e4b80353e2b3 100644 (file)
@@ -36,7 +36,11 @@ public class NewCollectionWizard extends AbstractNewEntityWizard<Collection> {
        /** {@inheritDoc} */
        @Override
        protected void saveEntity() {
-               CdmStore.getService(ICollectionService.class).merge(getEntity());
+           if(CdmStore.getCurrentSessionManager().isRemoting()) {
+               CdmStore.getService(ICollectionService.class).merge(getEntity(), true);
+           } else {
+               CdmStore.getService(ICollectionService.class).save(getEntity());
+           }
        }
 
        /* (non-Javadoc)
index 59dee8496855c1bac5928fe4b999b16cd9d67b00..4905b26f77bfbe66ce559604d5affc2ab9a9b3b6 100644 (file)
@@ -113,7 +113,11 @@ public class NewDerivedUnitBaseWizard extends AbstractNewEntityWizard<SpecimenOr
        /** {@inheritDoc} */
        @Override
        protected void saveEntity() {
-               CdmStore.getService(IOccurrenceService.class).merge(getEntity());
+           if(CdmStore.getCurrentSessionManager().isRemoting()) {
+               CdmStore.getService(IOccurrenceService.class).merge(getEntity(), true);
+           } else {
+               CdmStore.getService(IOccurrenceService.class).save(getEntity());
+           }
        }
 
 
index 48bff08362a3577ea85f75b404616fbbb147e29a..59086434ccdf25bb50bd22367971a78dfbb995f9 100644 (file)
@@ -38,7 +38,11 @@ public class NewFieldUnitWizard extends AbstractNewEntityWizard<FieldUnit> {
        /** {@inheritDoc} */
        @Override
        protected void saveEntity() {
-               CdmStore.getService(IOccurrenceService.class).merge(getEntity());
+           if(CdmStore.getCurrentSessionManager().isRemoting()) {
+               CdmStore.getService(IOccurrenceService.class).merge(getEntity(), true);
+           } else {
+               CdmStore.getService(IOccurrenceService.class).save(getEntity());
+           }
        }
 
        @Override
index 4a3fb425ce38408e5695e3b8c0bb06b5a3c4422a..c3342795473dbd318516f80f6dea016b12186660 100644 (file)
@@ -38,7 +38,11 @@ public class NewGrantedAuthorityWizard extends AbstractNewEntityWizard<GrantedAu
         */
        @Override
        protected void saveEntity() {
-               CdmStore.getService(IGrantedAuthorityService.class).merge(getEntity());
+           if(CdmStore.getCurrentSessionManager().isRemoting()) {
+               CdmStore.getService(IGrantedAuthorityService.class).merge(getEntity(), true);
+           } else {
+               CdmStore.getService(IGrantedAuthorityService.class).save(getEntity());
+           }
        }
 
        /* (non-Javadoc)
index 54758d1fac71bbe74fc701bb26c699e04d4ce692..6f6b52236b12ff50c4d513070ad4cd05b43318a6 100644 (file)
@@ -38,7 +38,11 @@ public class NewGroupWizard extends AbstractNewEntityWizard<Group> {
         */
        @Override
        protected void saveEntity() {
-               CdmStore.getService(IGroupService.class).merge(getEntity());
+           if(CdmStore.getCurrentSessionManager().isRemoting()) {
+               CdmStore.getService(IGroupService.class).merge(getEntity(), true);
+           } else {
+               CdmStore.getService(IGroupService.class).save(getEntity());
+           }
        }
 
        /* (non-Javadoc)
index c14d13ab09867d7f12096a1af40f2d4ec8b1c804..6ac2d44407d5d86204df615c1bf8493c72aef7f4 100644 (file)
@@ -35,7 +35,11 @@ public class NewInstitutionWizard extends AbstractNewEntityWizard<Institution> {
         */
        @Override
        protected void saveEntity() {
-               CdmStore.getService(IAgentService.class).merge(getEntity());
+           if(CdmStore.getCurrentSessionManager().isRemoting()) {
+               CdmStore.getService(IAgentService.class).merge(getEntity(), true);
+           } else {
+               CdmStore.getService(IAgentService.class).save(getEntity());
+           }
        }
 
        /* (non-Javadoc)
index 575f6a7ee615cba3e3ef3ccf1719095b48568534..cfdd27d18fb41f4559b99ca07567dcf9baecd50e 100644 (file)
@@ -49,7 +49,11 @@ public class NewNonViralNameWizard extends AbstractNewEntityWizard<NonViralName>
        /** {@inheritDoc} */
        @Override
        protected void saveEntity() {
-               CdmStore.getService(INameService.class).merge(getEntity());
+           if(CdmStore.getCurrentSessionManager().isRemoting()) {
+               CdmStore.getService(INameService.class).merge(getEntity(), true);
+           } else {
+               CdmStore.getService(INameService.class).save(getEntity());
+           }
        }
 
        @Override
index abb03bd1cbc80543739685411758b2d742c55344..ab5f7038d644a9df499ff241b833b0d777147968 100644 (file)
@@ -39,7 +39,11 @@ public class NewPersonWizard extends AbstractNewEntityWizard<Person> {
        /** {@inheritDoc} */
        @Override
        protected void saveEntity() {
-               CdmStore.getService(IAgentService.class).merge(getEntity());
+           if(CdmStore.getCurrentSessionManager().isRemoting()) {
+               CdmStore.getService(IAgentService.class).merge(getEntity(), true);
+           } else {
+               CdmStore.getService(IAgentService.class).save(getEntity());
+           }
        }
 
        @Override
index 9333780ac38c754dc66e000de69a81ceacd63563..daade68014f9bb41c4229a9533f89d58c70cf284 100644 (file)
@@ -31,7 +31,11 @@ public class NewPolytomousKeyWizard extends AbstractNewEntityWizard<PolytomousKe
        @Override
        protected void saveEntity() {
            if(!polytomousKeyPage.getPolytomousKeyName().equals("")) {
-               CdmStore.getService(IPolytomousKeyService.class).merge(getEntity());
+               if(CdmStore.getCurrentSessionManager().isRemoting()) {
+                   CdmStore.getService(IPolytomousKeyService.class).merge(getEntity(), true);
+               } else {
+                   CdmStore.getService(IPolytomousKeyService.class).save(getEntity());
+               }
            }
        }
 
index 1e31797d6e9ba9905dd5bbf588c17272fdf01928..de52e18d14f64ec84e2786057f8796a511366066 100644 (file)
@@ -38,7 +38,11 @@ public class NewPrimerWizard  extends AbstractNewEntityWizard<Primer> {
     /** {@inheritDoc} */
     @Override
     protected void saveEntity() {
-        CdmStore.getService(IPrimerService.class).merge(getEntity());
+        if(CdmStore.getCurrentSessionManager().isRemoting()) {
+            CdmStore.getService(IPrimerService.class).merge(getEntity(),true);
+        } else {
+            CdmStore.getService(IPrimerService.class).save(getEntity());
+        }
     }
 
     /** {@inheritDoc} */
index a792ed4d3c5da5a9b02325a61fc53c8ef6079145..7cbc1e76d0fcce6278a3b0c43e398776f40a2d89 100644 (file)
@@ -54,7 +54,7 @@ public class NewTaxonNodeWizard extends AbstractNewEntityWizard<ITaxonTreeNode>{
             try{
                 TaxonNode taxonNode = parent.addChildTaxon(taxon, parent.getReference(), parent.getMicroReference());
                 if(CdmStore.getCurrentSessionManager().isRemoting()) {
-                    taxonNode = CdmStore.getService(ITaxonNodeService.class).merge(taxonNode);
+                    taxonNode = CdmStore.getService(ITaxonNodeService.class).merge(taxonNode, true);
                 } else {
                     taxonNode = CdmStore.getService(ITaxonNodeService.class).save(taxonNode);
                 }
index faf7cb34069f5be98e870b5f8b565ba0c431af7c..74c82db1a9064ed36573da6b2efda2e088190184 100644 (file)
@@ -42,7 +42,11 @@ public class NewTeamWizard extends AbstractNewEntityWizard<Team> {
        /** {@inheritDoc} */
        @Override
        protected void saveEntity() {
-               CdmStore.getService(IAgentService.class).merge(getEntity());
+           if(CdmStore.getCurrentSessionManager().isRemoting()) {
+               CdmStore.getService(IAgentService.class).merge(getEntity(), true);
+           } else {
+               CdmStore.getService(IAgentService.class).save(getEntity());
+           }
        }
 
        @Override
index 322b798dca2084d9669f4a86177d43e6782deae4..d14363c33c899f83f9c2fcf07c8c9faeee52b8cc 100644 (file)
@@ -24,7 +24,11 @@ public class NewUserWizard extends AbstractNewEntityWizard<User> {
 
        @Override
        protected void saveEntity() {
-               CdmStore.getService(IUserService.class).merge(getEntity());
+           if(CdmStore.getCurrentSessionManager().isRemoting()) {
+               CdmStore.getService(IUserService.class).merge(getEntity(), true);
+           } else {
+               CdmStore.getService(IUserService.class).save(getEntity());
+           }
        }
 
        @Override