Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-module

1 files changed, 17 insertions, 11 deletions

diff --git a/dozentenmodul/src/main/java/gui/intro/Login_GUI.java b/dozentenmodul/src/main/java/gui/intro/Login_GUI.java
index 261c6464..22cee572 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);
@@ -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
@@ -458,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
 		 * 
@@ -530,7 +534,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);
@@ -563,7 +569,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);