X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/blobdiff_plain/95ee1b51f476e72636aa96a830f85b9e41861c59..d637e4bab9be3f8bb6d7192555593a71e3f3a4e3:/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/AgentEditorInput.java

diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/AgentEditorInput.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/AgentEditorInput.java
index 4c2dccc55..c4c785474 100644
--- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/AgentEditorInput.java
+++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/AgentEditorInput.java
@@ -48,11 +48,13 @@ public class AgentEditorInput extends AbstractBulkEditorInput<TeamOrPersonBase>
 		return ID;
 	}
 
+
 	@Override
     public String getName() {
 		return BulkEditorInputType.AGENT.label;
 	}
 
+
 	@Override
     public String getToolTipText() {
 		return getName();
@@ -71,6 +73,7 @@ public class AgentEditorInput extends AbstractBulkEditorInput<TeamOrPersonBase>
 		return true;
 	}
 
+
 	/** {@inheritDoc} */
 	@Override
 	public boolean isConvertingEnabled() {
@@ -117,7 +120,6 @@ public class AgentEditorInput extends AbstractBulkEditorInput<TeamOrPersonBase>
 
 
 	public boolean delete(AgentBase entity) throws ReferencedObjectUndeletableException  {
-
 			return CdmStore.getService(IAgentService.class).delete(entity) != null;
 
 	}
@@ -137,14 +139,20 @@ public class AgentEditorInput extends AbstractBulkEditorInput<TeamOrPersonBase>
 		return sortProviders;
 	}
 
+
 	@Override
 	protected IEntityCreator<TeamOrPersonBase> createEntityCreator() {
 		return new AgentCreator();
 	}
 
 	@Override
-	public boolean save(TeamOrPersonBase entity) {
-		return CdmStore.getService(IAgentService.class).saveOrUpdate(entity) != null;
+	public TeamOrPersonBase save(TeamOrPersonBase entity) {
+	    if(CdmStore.getCurrentSessionManager().isRemoting()) {
+	        return (TeamOrPersonBase) CdmStore.getService(IAgentService.class).merge(entity);
+	    } else {
+	        CdmStore.getService(IAgentService.class).saveOrUpdate(entity) ;
+	        return entity;
+	    }
 	}
 
 	@Override
@@ -154,4 +162,13 @@ public class AgentEditorInput extends AbstractBulkEditorInput<TeamOrPersonBase>
 		return false;
 	}
 
+    /* (non-Javadoc)
+     * @see eu.etaxonomy.taxeditor.editor.CdmEntitySessionInput#merge()
+     */
+    @Override
+    public void merge() {
+
+    }
+
+
 }