Fix manifest generation

[lgpl/argeo-commons.git] / swt / org.argeo.cms.e4 / src / org / argeo / cms / e4 / handlers / ChangePassword.java

diff --git a/swt/org.argeo.cms.e4/src/org/argeo/cms/e4/handlers/ChangePassword.java b/swt/org.argeo.cms.e4/src/org/argeo/cms/e4/handlers/ChangePassword.java
index 393aede8fc3e92caf78eaaf5e41e0b6652f35ef6..9624c2d7011b82a7df0ee9df95506f588a11d9ff 100644 (file)
--- a/swt/org.argeo.cms.e4/src/org/argeo/cms/e4/handlers/ChangePassword.java
+++ b/swt/org.argeo.cms.e4/src/org/argeo/cms/e4/handlers/ChangePassword.java
@@ -12,14 +12,14 @@ import javax.inject.Inject;
 import javax.naming.InvalidNameException;
 import javax.naming.ldap.LdapName;
 
-import org.argeo.cms.auth.CurrentUser;
-import org.argeo.cms.security.CryptoKeyring;
+import org.argeo.api.cms.keyring.CryptoKeyring;
+import org.argeo.api.cms.transaction.WorkTransaction;
+import org.argeo.cms.CurrentUser;
 import org.argeo.cms.swt.dialogs.CmsFeedback;
 import org.argeo.cms.swt.dialogs.CmsMessageDialog;
-import org.argeo.util.transaction.WorkTransaction;
+import org.argeo.cms.ux.widgets.CmsDialog;
 import org.eclipse.e4.core.di.annotations.Execute;
 import org.eclipse.e4.core.di.annotations.Optional;
-import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
@@ -45,7 +45,7 @@ public class ChangePassword {
        @Execute
        public void execute() {
                ChangePasswordDialog dialog = new ChangePasswordDialog(Display.getCurrent().getActiveShell(), userAdmin);
-               if (dialog.open() == Dialog.OK) {
+               if (dialog.open() == CmsDialog.OK) {
                        new CmsMessageDialog(Display.getCurrent().getActiveShell(), passwordChanged.lead(),
                                        CmsMessageDialog.INFORMATION).open();
                }
@@ -117,7 +117,7 @@ public class ChangePassword {
                                if (!newPassword1.getText().equals(newPassword2.getText()))
                                        throw new IllegalArgumentException("New passwords are different");
                                changePassword(oldPassword.getTextChars(), newPassword1.getTextChars());
-                               closeShell(OK);
+                               closeShell(CmsDialog.OK);
                        } catch (Exception e) {
                                CmsFeedback.error("Cannot change password", e);
                        }