Prepare next development cycle

[lgpl/argeo-commons.git] / swt / org.argeo.cms.swt / src / org / argeo / cms / swt / dialogs / ChangePasswordDialog.java

diff --git a/swt/org.argeo.cms.swt/src/org/argeo/cms/swt/dialogs/ChangePasswordDialog.java b/swt/org.argeo.cms.swt/src/org/argeo/cms/swt/dialogs/ChangePasswordDialog.java
index 06e4d0f9f996374b651ad3695e2ce23e88e62ba7..abb8227cd7de150f3421986370d9371c4231ef7f 100644 (file)
--- a/swt/org.argeo.cms.swt/src/org/argeo/cms/swt/dialogs/ChangePasswordDialog.java
+++ b/swt/org.argeo.cms.swt/src/org/argeo/cms/swt/dialogs/ChangePasswordDialog.java
@@ -1,13 +1,14 @@
 package org.argeo.cms.swt.dialogs;
 
-import java.security.PrivilegedAction;
 import java.util.Arrays;
+import java.util.concurrent.Callable;
 
 import org.argeo.api.cms.CmsLog;
+import org.argeo.api.cms.directory.CmsUserManager;
 import org.argeo.api.cms.ux.CmsView;
 import org.argeo.cms.CmsMsg;
-import org.argeo.cms.CmsUserManager;
 import org.argeo.cms.swt.CmsSwtUtils;
+import org.argeo.cms.ux.widgets.CmsDialog;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
@@ -22,7 +23,7 @@ public class ChangePasswordDialog extends CmsMessageDialog {
        private CmsUserManager cmsUserManager;
        private CmsView cmsView;
 
-       private PrivilegedAction<Integer> doIt;
+       private Callable<Integer> doIt;
 
        public ChangePasswordDialog(Shell parentShell, String message, int kind, CmsUserManager cmsUserManager) {
                super(parentShell, message, kind);
@@ -46,17 +47,17 @@ public class ChangePasswordDialog extends CmsMessageDialog {
                        if (Arrays.equals(newPassword.getTextChars(), confirmPassword.getTextChars())) {
                                try {
                                        cmsUserManager.changeOwnPassword(previousPassword.getTextChars(), newPassword.getTextChars());
-                                       return OK;
+                                       return CmsDialog.OK;
                                } catch (Exception e1) {
                                        log.error("Could not change password", e1);
                                        cancel();
                                        CmsMessageDialog.openError(CmsMsg.invalidPassword.lead());
-                                       return CANCEL;
+                                       return CmsDialog.CANCEL;
                                }
                        } else {
                                cancel();
                                CmsMessageDialog.openError(CmsMsg.repeatNewPassword.lead());
-                               return CANCEL;
+                               return CmsDialog.CANCEL;
                        }
                };
 
@@ -67,7 +68,7 @@ public class ChangePasswordDialog extends CmsMessageDialog {
        @Override
        protected void okPressed() {
                Integer returnCode = cmsView.doAs(doIt);
-               if (returnCode.equals(OK)) {
+               if (returnCode.equals(CmsDialog.OK)) {
                        super.okPressed();
                        CmsMessageDialog.openInformation(CmsMsg.passwordChanged.lead());
                }