BGBM BDI Projects
/
taxeditor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' into remoting-4.0
[taxeditor.git]
/
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 c80a7c4d7b4ea19ad1ec961d48653068a913a4da..e9469eca101555416640a607d1cbfdbeb6d9e92d 100644
(file)
--- 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
* @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()) {
if(CdmStore.getCurrentSessionManager().isRemoting()) {
- return CdmStore.getService(IUserService.class).merge(entity)
!= null
;
+ return CdmStore.getService(IUserService.class).merge(entity);
} else {
} 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());
}
return String.format("%s, %s", entity.getUsername(), entity.getPerson());
}
+ /* (non-Javadoc)
+ * @see eu.etaxonomy.taxeditor.editor.CdmEntitySessionInput#merge()
+ */
+ @Override
+ public void merge() {
+
+ }
+
}
}