X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms.ui.workbench%2Fsrc%2Forg%2Fargeo%2Fcms%2Fui%2Fworkbench%2Fcommands%2FOpenChangePasswordDialog.java;h=f8c93693875c73cc65fdcc07e780f10dd07787ba;hb=b20d9443fc46845df95ae47ead3ecf431689d311;hp=d48291f385645c5b3352e77f260fbd1ba8c55dd9;hpb=23b7a170cae60b500e9d45551f26b5075eba73a4;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/commands/OpenChangePasswordDialog.java b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/commands/OpenChangePasswordDialog.java
index d48291f38..f8c936938 100644
--- a/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/commands/OpenChangePasswordDialog.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/commands/OpenChangePasswordDialog.java
@@ -53,19 +53,17 @@ import org.eclipse.ui.handlers.HandlerUtil;
 import org.osgi.service.useradmin.User;
 import org.osgi.service.useradmin.UserAdmin;
 
-/** Opens the change password dialog. */
+/** Open the change password dialog */
 public class OpenChangePasswordDialog extends AbstractHandler {
-	private final static Log log = LogFactory
-			.getLog(OpenChangePasswordDialog.class);
+	private final static Log log = LogFactory.getLog(OpenChangePasswordDialog.class);
 	private UserAdmin userAdmin;
 	private UserTransaction userTransaction;
 
 	public Object execute(ExecutionEvent event) throws ExecutionException {
-		ChangePasswordDialog dialog = new ChangePasswordDialog(
-				HandlerUtil.getActiveShell(event), userAdmin);
+		ChangePasswordDialog dialog = new ChangePasswordDialog(HandlerUtil.getActiveShell(event), userAdmin);
 		if (dialog.open() == Dialog.OK) {
-			MessageDialog.openInformation(HandlerUtil.getActiveShell(event),
-					passwordChanged.lead(), passwordChanged.lead());
+			MessageDialog.openInformation(HandlerUtil.getActiveShell(event), passwordChanged.lead(),
+					passwordChanged.lead());
 		}
 		return null;
 	}
@@ -73,8 +71,7 @@ public class OpenChangePasswordDialog extends AbstractHandler {
 	@SuppressWarnings("unchecked")
 	protected void changePassword(char[] oldPassword, char[] newPassword) {
 		Subject subject = Subject.getSubject(AccessController.getContext());
-		String name = subject.getPrincipals(X500Principal.class).iterator()
-				.next().toString();
+		String name = subject.getPrincipals(X500Principal.class).iterator().next().toString();
 		LdapName dn;
 		try {
 			dn = new LdapName(name);
@@ -103,14 +100,6 @@ public class OpenChangePasswordDialog extends AbstractHandler {
 		}
 	}
 
-	public void setUserAdmin(UserAdmin userDetailsManager) {
-		this.userAdmin = userDetailsManager;
-	}
-
-	public void setUserTransaction(UserTransaction userTransaction) {
-		this.userTransaction = userTransaction;
-	}
-
 	class ChangePasswordDialog extends TitleAreaDialog {
 		private static final long serialVersionUID = -6963970583882720962L;
 		private Text oldPassword, newPassword1, newPassword2;
@@ -125,18 +114,17 @@ public class OpenChangePasswordDialog extends AbstractHandler {
 
 		protected Control createDialogArea(Composite parent) {
 			Composite dialogarea = (Composite) super.createDialogArea(parent);
-			dialogarea.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true,
-					true));
+			dialogarea.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
 			Composite composite = new Composite(dialogarea, SWT.NONE);
 			composite.setLayout(new GridLayout(2, false));
-			composite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true,
-					false));
+			composite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
 			oldPassword = createLP(composite, currentPassword.lead());
 			newPassword1 = createLP(composite, newPassword.lead());
 			newPassword2 = createLP(composite, repeatNewPassword.lead());
 
 			setMessage(changePassword.lead(), INFORMATION);
 			parent.pack();
+			oldPassword.setFocus();
 			return composite;
 		}
 
@@ -145,8 +133,7 @@ public class OpenChangePasswordDialog extends AbstractHandler {
 			try {
 				if (!newPassword1.getText().equals(newPassword2.getText()))
 					throw new CmsException("New passwords are different");
-				changePassword(oldPassword.getTextChars(),
-						newPassword1.getTextChars());
+				changePassword(oldPassword.getTextChars(), newPassword1.getTextChars());
 				close();
 			} catch (Exception e) {
 				ErrorFeedback.show("Cannot change password", e);
@@ -156,8 +143,7 @@ public class OpenChangePasswordDialog extends AbstractHandler {
 		/** Creates label and password. */
 		protected Text createLP(Composite parent, String label) {
 			new Label(parent, SWT.NONE).setText(label);
-			Text text = new Text(parent, SWT.SINGLE | SWT.LEAD | SWT.PASSWORD
-					| SWT.BORDER);
+			Text text = new Text(parent, SWT.SINGLE | SWT.LEAD | SWT.PASSWORD | SWT.BORDER);
 			text.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
 			return text;
 		}
@@ -166,6 +152,13 @@ public class OpenChangePasswordDialog extends AbstractHandler {
 			super.configureShell(shell);
 			shell.setText(changePassword.lead());
 		}
+	}
+
+	public void setUserAdmin(UserAdmin userAdmin) {
+		this.userAdmin = userAdmin;
+	}
 
+	public void setUserTransaction(UserTransaction userTransaction) {
+		this.userTransaction = userTransaction;
 	}
 }