X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=security%2Feclipse%2Fplugins%2Forg.argeo.security.ui%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fsecurity%2Fui%2Feditors%2FDefaultUserMainPage.java;h=ee63e24dbd20bbfdea76c64fc1c5062c8e6ce446;hb=d685633924a5ee0328f5053b375564ca8fe969e6;hp=3da89f37c72f515570d13ab615e4b9f5c4d91d4a;hpb=97f324b3c3287950acbac6bff52a67587ca9ce3b;p=lgpl%2Fargeo-commons.git diff --git a/security/eclipse/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/editors/DefaultUserMainPage.java b/security/eclipse/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/editors/DefaultUserMainPage.java index 3da89f37c..ee63e24db 100644 --- a/security/eclipse/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/editors/DefaultUserMainPage.java +++ b/security/eclipse/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/editors/DefaultUserMainPage.java @@ -4,6 +4,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.argeo.security.ArgeoSecurityService; import org.argeo.security.ArgeoUser; +import org.argeo.security.SimpleArgeoUser; import org.argeo.security.nature.SimpleUserNature; import org.argeo.security.ui.SecurityUiPlugin; import org.eclipse.jface.viewers.CellEditor; @@ -41,9 +42,9 @@ import org.eclipse.ui.forms.widgets.Section; public class DefaultUserMainPage extends FormPage { final static String ID = "argeoUserEditor.mainPage"; + private final static Log log = LogFactory.getLog(DefaultUserMainPage.class); private final static Image ROLE_CHECKED = SecurityUiPlugin .getImageDescriptor("icons/security.gif").createImage(); - private final static Log log = LogFactory.getLog(ArgeoUserEditor.class); private ArgeoUser user; private SimpleUserNature simpleNature; @@ -55,7 +56,7 @@ public class DefaultUserMainPage extends FormPage { super(editor, ID, "Main"); this.securityService = securityService; this.user = user; - this.simpleNature = SecurityUiPlugin.findSimpleUserNature(user, + this.simpleNature = SimpleUserNature.findSimpleUserNature(user, simpleNatureType); } @@ -89,8 +90,14 @@ public class DefaultUserMainPage extends FormPage { body.setLayout(layout); // add widgets (view) - tk.createLabel(body, "Username"); - tk.createLabel(body, user.getUsername()); + final Text username; + if (user.getUsername() != null) { + tk.createLabel(body, "Username"); + tk.createLabel(body, user.getUsername()); + username = null; + } else { + username = createLT(body, "Username", ""); + } final Text firstName = createLT(body, "First name", simpleNature.getFirstName()); final Text lastName = createLT(body, "Last name", @@ -102,13 +109,18 @@ public class DefaultUserMainPage extends FormPage { // create form part (controller) AbstractFormPart part = new SectionPart(section) { public void commit(boolean onSave) { + if (username != null) { + ((SimpleArgeoUser) user).setUsername(username.getText()); + username.setEditable(false); + username.setEnabled(false); + } simpleNature.setFirstName(firstName.getText()); simpleNature.setLastName(lastName.getText()); simpleNature.setEmail(email.getText()); simpleNature.setDescription(description.getText()); super.commit(onSave); - if (log.isDebugEnabled()) - log.debug("General part committed"); + if (log.isTraceEnabled()) + log.trace("General part committed"); } }; firstName.addModifyListener(new FormPartML(part)); @@ -134,8 +146,8 @@ public class DefaultUserMainPage extends FormPage { public void commit(boolean onSave) { // roles have already been modified in editing super.commit(onSave); - if (log.isDebugEnabled()) - log.debug("Role part committed"); + if (log.isTraceEnabled()) + log.trace("Role part committed"); } }; getManagedForm().addPart(part);