X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=swt%2Forg.argeo.cms.swt%2Fsrc%2Forg%2Fargeo%2Fcms%2Fswt%2Fdialogs%2FChangePasswordDialog.java;h=abb8227cd7de150f3421986370d9371c4231ef7f;hb=3b45f571938e0eb6803084aac3f2bd298e6026ba;hp=dedf61dea0f31acd0a4ac01e90a00218d5b2abc9;hpb=a81a19a9a3e45a89ed3b7c783bd5747cc27f6aa1;p=lgpl%2Fargeo-commons.git

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 dedf61dea..abb8227cd 100644
--- 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
@@ -4,10 +4,11 @@ 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;
@@ -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());
 		}