diff options
| author | Jonathan Bauer | 2015-09-02 14:00:18 +0200 |
|---|---|---|
| committer | Jonathan Bauer | 2015-09-02 14:00:18 +0200 |
| commit | 1e777a3ca149d7288b3306239fa821cba04d196b (patch) | |
| tree | 731eef34485d2ebba252ec195ae3d3824b502ce2 /dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LoginWindow.java | |
| parent | [client] LoginWindow: fix Shibboleth login throwing a NPE when no IDP was sel... (diff) | |
| download | tutor-module-1e777a3ca149d7288b3306239fa821cba04d196b.tar.gz tutor-module-1e777a3ca149d7288b3306239fa821cba04d196b.tar.xz tutor-module-1e777a3ca149d7288b3306239fa821cba04d196b.zip | |
[client] only if login == ECP ...
Diffstat (limited to 'dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LoginWindow.java')
| -rw-r--r-- | dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LoginWindow.java | 8 |
1 files changed, 1 insertions, 7 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 6340c377..8351ab89 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 @@ -19,10 +19,6 @@ import javax.swing.JOptionPane; import org.apache.log4j.Logger; import org.openslx.bwlp.thrift.iface.Organization; -import org.openslx.bwlp.thrift.iface.SatelliteServer.Client; -import org.openslx.bwlp.thrift.iface.TAuthorizationException; -import org.openslx.bwlp.thrift.iface.TInvocationException; -import org.openslx.bwlp.thrift.iface.WhoamiInfo; import org.openslx.dozmod.App; import org.openslx.dozmod.Config; import org.openslx.dozmod.authentication.Authenticator; @@ -32,7 +28,6 @@ import org.openslx.dozmod.authentication.EcpAuthenticator; import org.openslx.dozmod.authentication.ShibbolethEcp; import org.openslx.dozmod.authentication.ShibbolethEcp.ReturnCode; import org.openslx.dozmod.authentication.TestAccountAuthenticator; -import org.openslx.dozmod.gui.GraphicalCertHandler; import org.openslx.dozmod.gui.Gui; import org.openslx.dozmod.gui.MainWindow; import org.openslx.dozmod.gui.helper.MessageType; @@ -41,7 +36,6 @@ import org.openslx.dozmod.thrift.Session; import org.openslx.dozmod.thrift.Sorters; import org.openslx.dozmod.thrift.ThriftActions; import org.openslx.dozmod.thrift.cache.OrganizationCache; -import org.openslx.thrifthelper.ThriftManager; import org.openslx.util.QuickTimer; import org.openslx.util.QuickTimer.Task; @@ -242,7 +236,7 @@ public class LoginWindow extends LoginWindowLayout { MessageType.ERROR, LOGGER, null); return; } - if (idpCombo.getSelectedIndex() == -1) { + if (loginType == LoginType.ECP && idpCombo.getSelectedIndex() == -1) { Gui.showMessageBox(this, "Bitte wählen Sie ihre Organisation als 'Identity Provider'.", MessageType.ERROR, LOGGER, null); idpCombo.requestFocus(); |