X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/blobdiff_plain/e3bcf9949a000ee3d35875dc200d51cfb60fc70c..7dce04a4ef06e30769a711c8b6aceb11b2137c31:/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/UserEditorInput.java

diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/UserEditorInput.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/UserEditorInput.java
index e9469eca1..06bd812f7 100644
--- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/UserEditorInput.java
+++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/UserEditorInput.java
@@ -10,9 +10,12 @@
 
 package eu.etaxonomy.taxeditor.bulkeditor.input;
 
+import java.util.Arrays;
 import java.util.List;
+import java.util.UUID;
 
 import eu.etaxonomy.cdm.api.service.IUserService;
+import eu.etaxonomy.cdm.api.service.config.DeleteConfiguratorBase;
 import eu.etaxonomy.cdm.api.service.config.IIdentifiableEntityServiceConfigurator;
 import eu.etaxonomy.cdm.api.service.exception.ReferencedObjectUndeletableException;
 import eu.etaxonomy.cdm.model.common.User;
@@ -62,20 +65,14 @@ public class UserEditorInput extends AbstractBulkEditorInput<User> {
 	 */
 	@Override
 	public User save(User entity) {
-	    if(CdmStore.getCurrentSessionManager().isRemoting()) {
-	        return CdmStore.getService(IUserService.class).merge(entity);
-	    } else {
-	        CdmStore.getService(IUserService.class).saveOrUpdate(entity);
-	        return entity;
-	    }
-
+	    return CdmStore.getService(IUserService.class).merge(entity, true).getMergedEntity();
 	}
 
 	/* (non-Javadoc)
 	 * @see eu.etaxonomy.taxeditor.annotatedlineeditor.IEntityPersistenceService#delete(java.lang.Object)
 	 */
 	@Override
-	public boolean delete(User entity) throws ReferencedObjectUndeletableException {
+	public boolean delete(User entity, DeleteConfiguratorBase config) throws ReferencedObjectUndeletableException {
 		return CdmStore.getService(IUserService.class).delete(entity) != null;
 	}
 
@@ -121,6 +118,14 @@ public class UserEditorInput extends AbstractBulkEditorInput<User> {
     public void merge() {
 
     }
+    
+
+	@Override
+	protected User loadEntity(UUID entityUuid) {
+		List<String> propertyPaths = Arrays.asList(new String[]{});
+		return CdmStore.getService(IUserService.class).load(entityUuid, propertyPaths);
+	}
+
 
 
 }