cleanup

[taxeditor.git] / eu.etaxonomy.taxeditor.store / src / main / java / eu / etaxonomy / taxeditor / newWizard / NewUserWizard.java

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewUserWizard.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewUserWizard.java
index aa3cd19dd733d2ae274bbc270091134c2b05eb6c..95baf5fe82c35d133e4b097259d2dd29e8cd6b98 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewUserWizard.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewUserWizard.java
@@ -1,10 +1,10 @@
 /**
 /**

- * 
+ *

  */
 package eu.etaxonomy.taxeditor.newWizard;
 
 import eu.etaxonomy.cdm.api.service.IUserService;
  */
 package eu.etaxonomy.taxeditor.newWizard;
 
 import eu.etaxonomy.cdm.api.service.IUserService;

-import eu.etaxonomy.cdm.model.common.User;
+import eu.etaxonomy.cdm.model.permission.User;

 import eu.etaxonomy.taxeditor.store.CdmStore;
 import eu.etaxonomy.taxeditor.ui.section.user.UserDetailWizardPage;
 
 import eu.etaxonomy.taxeditor.store.CdmStore;
 import eu.etaxonomy.taxeditor.ui.section.user.UserDetailWizardPage;
 


@@ -15,16 +15,16 @@ import eu.etaxonomy.taxeditor.ui.section.user.UserDetailWizardPage;
 public class NewUserWizard extends AbstractNewEntityWizard<User> {
 
        private UserDetailWizardPage userPage;
 public class NewUserWizard extends AbstractNewEntityWizard<User> {
 
        private UserDetailWizardPage userPage;

-       
+

        @Override
        public void addPages() {
                userPage = new UserDetailWizardPage(formFactory, getConversationHolder(), getEntity());
                addPage(userPage);
        }
        @Override
        public void addPages() {
                userPage = new UserDetailWizardPage(formFactory, getConversationHolder(), getEntity());
                addPage(userPage);
        }

-       
+

        @Override
        protected void saveEntity() {
        @Override
        protected void saveEntity() {

-               CdmStore.getService(IUserService.class).saveOrUpdate(getEntity());
+           CdmStore.getService(IUserService.class).merge(getEntity(), true);

        }
 
        @Override
        }
 
        @Override


@@ -34,7 +34,7 @@ public class NewUserWizard extends AbstractNewEntityWizard<User> {
 
        @Override
        protected String getEntityName() {
 
        @Override
        protected String getEntityName() {

-               return "Institution";
+               return "User";

        }
 
 }
        }
 
 }