From 23a4c8ffd8d978ed660635d4c209f17a70e227f5 Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Tue, 21 Oct 2014 15:01:13 +0200
Subject:  [client] log errors of thread executing shibboleth Login

---
 dozentenmodul/src/main/java/gui/intro/Login_GUI.java | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'dozentenmodul/src/main/java/gui')

diff --git a/dozentenmodul/src/main/java/gui/intro/Login_GUI.java b/dozentenmodul/src/main/java/gui/intro/Login_GUI.java
index 261c6464..c45ec10d 100644
--- a/dozentenmodul/src/main/java/gui/intro/Login_GUI.java
+++ b/dozentenmodul/src/main/java/gui/intro/Login_GUI.java
@@ -416,11 +416,9 @@ public class Login_GUI extends JFrame {
 							setStatus(Color.red, "Fehler: bwIDM-Login fehlgeschlagen!", null);
 						}
 					} catch (InterruptedException e) {
-						
-						e.printStackTrace();
+						LOGGER.error("SwingWorker for ShibbolethECP got interrupted, see trace: ", e);
 					} catch (ExecutionException e) {
-						
-						e.printStackTrace();
+						LOGGER.error("Execution of SwingWorker for ShibbolethECP failed, see trace: ", e);
 					}
 				}
 				@Override
-- 
cgit v1.2.3-55-g7522


From 6931f57f165885c8b831a80b77ba653fc6f49c62 Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Tue, 21 Oct 2014 15:03:45 +0200
Subject: [client] fix typo in static variable

---
 dozentenmodul/src/main/java/gui/intro/Login_GUI.java | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'dozentenmodul/src/main/java/gui')

diff --git a/dozentenmodul/src/main/java/gui/intro/Login_GUI.java b/dozentenmodul/src/main/java/gui/intro/Login_GUI.java
index c45ec10d..1db8f847 100644
--- a/dozentenmodul/src/main/java/gui/intro/Login_GUI.java
+++ b/dozentenmodul/src/main/java/gui/intro/Login_GUI.java
@@ -57,7 +57,7 @@ public class Login_GUI extends JFrame {
 	// String constants representing the different login methods
 	private final static String LOGIN_TYPE_BWIDM = "bwidm";
 	private final static String LOGIN_TYPE_BWLEHRPOOL = "bwlp";
-	private final static String LOGIN_TYPE_SATLLITE = "sat";
+	private final static String LOGIN_TYPE_SATELLITE = "sat";
 	
 	private JPanel contentPane;
 	private JTextField lblusername;
@@ -267,7 +267,7 @@ public class Login_GUI extends JFrame {
 		
 		rdbtnDirekteVerbindung = new JRadioButton("Direkte Verbindung zum Satelliten");
 		rdbtnDirekteVerbindung.setBounds(32, 85, 244, 23);
-		rdbtnDirekteVerbindung.setActionCommand(LOGIN_TYPE_SATLLITE);
+		rdbtnDirekteVerbindung.setActionCommand(LOGIN_TYPE_SATELLITE);
 		rdbtnDirekteVerbindung.addActionListener(loginTypeActionListener);
 		bgLoginType.add(rdbtnDirekteVerbindung);
 		panel_1.add(rdbtnDirekteVerbindung);
@@ -528,7 +528,9 @@ public class Login_GUI extends JFrame {
 	 * 
 	 * @param type
 	 *            Type of the login to toggle. Valid are:
-	 *            'bwidm', 'bwlp', 'sat'
+	 *            	- LOGIN_TYPE_BWIDM
+	 *            	-	LOGIN_TYPE_BWLEHRPOOL
+	 *            	- LOGIN_TYPE_SATELLITE
 	 */
 	private void toggleLoginType(String type) {
 		LOGGER.info("Toggling to login method to: " + type);
@@ -561,7 +563,7 @@ public class Login_GUI extends JFrame {
 				panel.repaint();
 				panel.setVisible(true);
 				break;
-			case LOGIN_TYPE_SATLLITE:
+			case LOGIN_TYPE_SATELLITE:
 				panel.remove(choice);
 				panel.remove(lblIdp);
 				panel.remove(LabelPass);
-- 
cgit v1.2.3-55-g7522


From ac22f1c99a1027d9074cd118f7318e670fd5e399 Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Tue, 21 Oct 2014 15:28:52 +0200
Subject: [client] comments for showMainMenu function

---
 dozentenmodul/src/main/java/gui/intro/Login_GUI.java | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'dozentenmodul/src/main/java/gui')

diff --git a/dozentenmodul/src/main/java/gui/intro/Login_GUI.java b/dozentenmodul/src/main/java/gui/intro/Login_GUI.java
index 1db8f847..22cee572 100644
--- a/dozentenmodul/src/main/java/gui/intro/Login_GUI.java
+++ b/dozentenmodul/src/main/java/gui/intro/Login_GUI.java
@@ -456,10 +456,16 @@ public class Login_GUI extends JFrame {
 
 	}// end performLogin
 
+	/**
+	 * Shows the next GUI's til the main menu.
+	 * It checks if the user has already seen the bill of rights
+	 * and/or the vmware license windows and shows them before
+	 * continuing to the main menu.
+	 *
+	 * This function should be called on a successful login.
+	 */
 	private void showMainMenu() {
-		
-		
-		
+
 		/*
 		 * TODO check if user has already been regisistered. if not, do so
 		 * 
-- 
cgit v1.2.3-55-g7522