From 68686268e4d0e33f6f829f0e3fee69c7286cca3a Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Fri, 10 Jul 2015 14:50:23 +0200
Subject: [client] fix idpCombo beeing shown even though TestAccount auth
 method was saved

check if loginWindow.isDisposed() in populateIdpCombo() to make sure have the widgets before doing anything
---
 .../main/java/org/openslx/dozmod/authentication/EcpAuthenticator.java  | 3 ---
 .../org/openslx/dozmod/authentication/TestAccountAuthenticator.java    | 1 +
 2 files changed, 1 insertion(+), 3 deletions(-)

(limited to 'dozentenmodul/src/main/java/org/openslx/dozmod/authentication')

diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/authentication/EcpAuthenticator.java b/dozentenmodul/src/main/java/org/openslx/dozmod/authentication/EcpAuthenticator.java
index 288a4cbc..9bbc4175 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/authentication/EcpAuthenticator.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/authentication/EcpAuthenticator.java
@@ -1,13 +1,10 @@
 package org.openslx.dozmod.authentication;
 
 import org.apache.log4j.Logger;
-import org.apache.thrift.TException;
 import org.openslx.bwlp.thrift.iface.TAuthenticationException;
-import org.openslx.bwlp.thrift.iface.TInvalidTokenException;
 import org.openslx.bwlp.thrift.iface.UserInfo;
 import org.openslx.dozmod.authentication.ShibbolethEcp.ReturnCode;
 import org.openslx.dozmod.thrift.Session;
-import org.openslx.thrifthelper.ThriftManager;
 
 /**
  * @author Jonathan Bauer
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/authentication/TestAccountAuthenticator.java b/dozentenmodul/src/main/java/org/openslx/dozmod/authentication/TestAccountAuthenticator.java
index bdb92023..0c83ad0b 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/authentication/TestAccountAuthenticator.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/authentication/TestAccountAuthenticator.java
@@ -36,6 +36,7 @@ public class TestAccountAuthenticator implements Authenticator {
 
 		// handle answer from server
 		if (authResult != null && authResult.authToken != null) {
+			// TODO: Session.fromClientSessionData(authResult);
 			UserInfo userInfo = null;
 			try {
 				userInfo = ThriftManager.getMasterClient().getUserFromToken(authResult.authToken);
-- 
cgit v1.2.3-55-g7522