X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/blobdiff_plain/487e442c0c7d6f6a114d11cd3a2494f6ea9094f9..667025a545eb8a1553ec97e1bd3d4fe3a0101f36:/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 c80a7c4d7..e9469eca1 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
@@ -61,11 +61,12 @@ public class UserEditorInput extends AbstractBulkEditorInput<User> {
 	 * @see eu.etaxonomy.taxeditor.annotatedlineeditor.IEntityPersistenceService#save(java.lang.Object)
 	 */
 	@Override
-	public boolean save(User entity) {
+	public User save(User entity) {
 	    if(CdmStore.getCurrentSessionManager().isRemoting()) {
-	        return CdmStore.getService(IUserService.class).merge(entity) != null;
+	        return CdmStore.getService(IUserService.class).merge(entity);
 	    } else {
-	        return CdmStore.getService(IUserService.class).saveOrUpdate(entity) != null;
+	        CdmStore.getService(IUserService.class).saveOrUpdate(entity);
+	        return entity;
 	    }
 
 	}
@@ -113,5 +114,13 @@ public class UserEditorInput extends AbstractBulkEditorInput<User> {
 		return String.format("%s, %s", entity.getUsername(), entity.getPerson());
 	}
 
+    /* (non-Javadoc)
+     * @see eu.etaxonomy.taxeditor.editor.CdmEntitySessionInput#merge()
+     */
+    @Override
+    public void merge() {
+
+    }
+
 
 }