X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=security%2Fplugins%2Forg.argeo.security.ui%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fsecurity%2Fui%2Fdialogs%2FChangePasswordDialog.java;h=fe9b6ae9d452a9e8c51f1cb20caf20da3d75ebc9;hb=3a3d316af102ba410d1d9e6de349d0c8f7ac044f;hp=90d7320b004f7b9e54902f3e496f434b783e3488;hpb=2745f0c8c57d9468855179d56f858fb2448f779c;p=lgpl%2Fargeo-commons.git

diff --git a/security/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/dialogs/ChangePasswordDialog.java b/security/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/dialogs/ChangePasswordDialog.java
index 90d7320b0..fe9b6ae9d 100644
--- a/security/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/dialogs/ChangePasswordDialog.java
+++ b/security/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/dialogs/ChangePasswordDialog.java
@@ -1,6 +1,22 @@
+/*
+ * Copyright (C) 2007-2012 Argeo GmbH
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.argeo.security.ui.dialogs;
 
 import org.argeo.ArgeoException;
+import org.argeo.eclipse.ui.ErrorFeedback;
 import org.eclipse.jface.dialogs.IMessageProvider;
 import org.eclipse.jface.dialogs.TitleAreaDialog;
 import org.eclipse.swt.SWT;
@@ -48,9 +64,13 @@ public class ChangePasswordDialog extends TitleAreaDialog {
 	protected void okPressed() {
 		if (!newPassword1.getText().equals(newPassword2.getText()))
 			throw new ArgeoException("Passwords are different");
-		userDetailsManager.changePassword(currentPassword.getText(),
-				newPassword1.getText());
-		close();
+		try {
+			userDetailsManager.changePassword(currentPassword.getText(),
+					newPassword1.getText());
+			close();
+		} catch (Exception e) {
+			ErrorFeedback.show("Cannot change password", e);
+		}
 	}
 
 	/** Creates label and password. */