Refactoring of selection elements. Additional minor refactoring. Fixed a bug with...

[taxeditor.git] / eu.etaxonomy.taxeditor.store / src / main / java / eu / etaxonomy / taxeditor / ui / section / user / UserDetailElement.java

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/user/UserDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/user/UserDetailElement.java
index 05ac8a62c1f4444518d593964988ee10e00a90f7..ad14db124aaa8cbd95178152583c78e3c9411297 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/user/UserDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/user/UserDetailElement.java
@@ -3,18 +3,15 @@
  */
 package eu.etaxonomy.taxeditor.ui.section.user;
 
-import eu.etaxonomy.cdm.api.service.IUserService;
+import eu.etaxonomy.cdm.model.agent.Person;
 import eu.etaxonomy.cdm.model.common.User;
 import eu.etaxonomy.taxeditor.store.CdmStore;
 import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
-import eu.etaxonomy.taxeditor.ui.element.CdmPropertyChangeEvent;
 import eu.etaxonomy.taxeditor.ui.element.CheckboxElement;
 import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
 import eu.etaxonomy.taxeditor.ui.element.TextWithLabelElement;
-import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory.SelectionType;
-import eu.etaxonomy.taxeditor.ui.password.EditPasswordElement;
 import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement;
-import eu.etaxonomy.taxeditor.ui.selection.PersonSelectionElement;
+import eu.etaxonomy.taxeditor.ui.selection.EntitySelectionElement;
 
 /**
  * @author n.hoffmann
@@ -23,9 +20,8 @@ import eu.etaxonomy.taxeditor.ui.selection.PersonSelectionElement;
 public class UserDetailElement extends AbstractCdmDetailElement<User> {
 
        private TextWithLabelElement text_username;
-       private EditPasswordElement element_editPassword;
        private TextWithLabelElement text_emailAdress;
-       private PersonSelectionElement selection_person;
+       private EntitySelectionElement<Person> selection_person;
        private CheckboxElement checkbox_credentialsNonExpired;
        private CheckboxElement checkbox_enabled;
        private CheckboxElement checkbox_accountNonLocked;
@@ -50,7 +46,7 @@ public class UserDetailElement extends AbstractCdmDetailElement<User> {
                                "Username", entity.getUsername(), style);
 
                if (userIsAuthenticated() || CdmStore.getLoginManager().isAdmin()) {
-                       element_editPassword = formFactory.createEditPasswordElement(
+                       formFactory.createEditPasswordElement(
                                        formElement, "Change Password", getConversationHolder(),
                                        entity, style);
                }
@@ -58,10 +54,13 @@ public class UserDetailElement extends AbstractCdmDetailElement<User> {
                text_emailAdress = formFactory.createTextWithLabelElement(formElement,
                                "Email Adress", entity.getEmailAddress(), style);
 
-               selection_person = (PersonSelectionElement) formFactory
-                               .createSelectionElement(SelectionType.PERSON,
-                                               getConversationHolder(), formElement, "Person",
-                                               entity.getPerson(), PersonSelectionElement.DEFAULT,
+               selection_person = formFactory
+                               .createSelectionElement(Person.class,
+                                               getConversationHolder(), 
+                                               formElement, 
+                                               "Person",
+                                               entity.getPerson(), 
+                                               EntitySelectionElement.EDITABLE | EntitySelectionElement.SELECTABLE,
                                                style);
 
                checkbox_accountNonExpired = formFactory.createCheckbox(formElement,