[client] Show satellite selection dialog again if connect failed but login succeeded

1 files changed, 15 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 fc7d6ca4..33bcdf5b 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
@@ -7,7 +7,6 @@ import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.ItemEvent;
 import java.awt.event.ItemListener;
-import java.awt.event.KeyAdapter;
 import java.awt.event.KeyEvent;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
@@ -131,7 +130,7 @@ public class LoginWindow extends LoginWindowLayout {
 
 		if (savedLoginType == LoginType.ECP) {
 			// disable login button til the idp list is here
-			loginButton.setEnabled(false);
+			enableLogin(false);
 		}
 		// While filling, disable
 		idpCombo.setEnabled(false);
@@ -166,7 +165,7 @@ public class LoginWindow extends LoginWindowLayout {
 					@Override
 					public void run() {
 						populateIdpCombo(orgs);
-						loginButton.setEnabled(true);
+						enableLogin(true);
 					}
 				});
 			}
@@ -348,7 +347,7 @@ public class LoginWindow extends LoginWindowLayout {
 					Gui.showMessageBox(me, "Internal error!", MessageType.ERROR, LOGGER, null);
 					break;
 				}
-				loginButton.setEnabled(true);
+				enableLogin(true);
 			}
 		};
 
@@ -369,7 +368,7 @@ public class LoginWindow extends LoginWindowLayout {
 			return;
 		}
 
-		loginButton.setEnabled(false);
+		enableLogin(false);
 		final String finalUsername = username;
 		QuickTimer.scheduleOnce(new Task() {
 			@Override
@@ -385,7 +384,7 @@ public class LoginWindow extends LoginWindowLayout {
 					Gui.showMessageBox(LoginWindow.this, "Anmeldung fehlgeschlagen", MessageType.ERROR,
 							LOGGER, e);
 				}
-				loginButton.setEnabled(true);
+				enableLogin(true);
 			}
 		});
 	}
@@ -412,7 +411,16 @@ public class LoginWindow extends LoginWindowLayout {
 			dispose();
 			return;
 		}
-		loginButton.setEnabled(true);
+		enableLogin(true);
+	}
+	
+	private void enableLogin(boolean enable) {
+		loginButton.setEnabled(enable);
+		usernameField.setEnabled(enable);
+		passwordField.setEnabled(enable);
+		loginTypePanel.setEnabled(enable);
+		loginFormPanel.setEnabled(enable);
+		saveUsernameCheck.setEnabled(enable);
 	}
 
 	/**