diff options
| author | Simon Rettberg | 2015-09-09 17:52:14 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2015-09-09 17:52:14 +0200 |
| commit | 32f7b08d7c0bdd61bafe6779e5f919f73f177d19 (patch) | |
| tree | 12da8b363b2a22e66acc78845332ab3c0f55807b | |
| parent | [client] Use new authentication RPC to master (diff) | |
| download | tutor-module-32f7b08d7c0bdd61bafe6779e5f919f73f177d19.tar.gz tutor-module-32f7b08d7c0bdd61bafe6779e5f919f73f177d19.tar.xz tutor-module-32f7b08d7c0bdd61bafe6779e5f919f73f177d19.zip | |
[client] Improve error messages on login failure
| -rw-r--r-- | dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LoginWindow.java | 7 | ||||
| -rw-r--r-- | dozentenmodul/src/main/java/org/openslx/dozmod/thrift/ThriftError.java | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LoginWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LoginWindow.java index c0c68b55..c16c4f0a 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LoginWindow.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LoginWindow.java @@ -17,6 +17,7 @@ import javax.swing.DefaultComboBoxModel; import javax.swing.JFrame; import org.apache.log4j.Logger; +import org.apache.thrift.TException; import org.openslx.bwlp.thrift.iface.Organization; import org.openslx.dozmod.App; import org.openslx.dozmod.Config; @@ -34,6 +35,7 @@ import org.openslx.dozmod.gui.window.layout.LoginWindowLayout; import org.openslx.dozmod.thrift.Session; import org.openslx.dozmod.thrift.Sorters; import org.openslx.dozmod.thrift.ThriftActions; +import org.openslx.dozmod.thrift.ThriftError; import org.openslx.dozmod.thrift.cache.OrganizationCache; import org.openslx.util.QuickTimer; import org.openslx.util.QuickTimer.Task; @@ -314,9 +316,10 @@ public class LoginWindow extends LoginWindowLayout { App.waitForInit(); try { authenticator.login(username, password, authenticatorCallback); + } catch (TException e) { + ThriftError.showMessage(this, LOGGER, e, "Anmeldung fehlgeschlagen"); } catch (Exception e) { - Gui.showMessageBox(this, "Authentication failed: " + e.getMessage(), MessageType.ERROR, LOGGER, e); - return; + Gui.showMessageBox(this, "Anmeldung fehlgeschlagen", MessageType.ERROR, LOGGER, e); } } diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/thrift/ThriftError.java b/dozentenmodul/src/main/java/org/openslx/dozmod/thrift/ThriftError.java index 33fd98b6..ec4d7cb3 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/thrift/ThriftError.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/thrift/ThriftError.java @@ -84,7 +84,7 @@ public class ThriftError { case GENERIC_ERROR: return "Generischer Fehler"; case INVALID_CREDENTIALS: - return "Ungültige Zugangsdaten"; + return "Ungültige Zugangsdaten\nStellen Sie sicher, dass Benutzername und Passwort korrekt sind"; case INVALID_KEY: return "Ungültiger Schlüssel"; case INVALID_ORGANIZATION: |