[client] Got rid of ini4j, store config as java properties file, simplified config handling

1 files changed, 15 insertions, 38 deletions

diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LoginWindowLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LoginWindowLayout.java
index 683780c9..7d637b37 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LoginWindowLayout.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LoginWindowLayout.java
@@ -16,39 +16,16 @@ import org.openslx.dozmod.gui.helper.Gui;
 
 public abstract class LoginWindowLayout extends Composite {
 
-	// TODO add ids to use for the authButtons group!
+	// TODO This has nothing to to with the layout
 	protected static enum LOGIN_TYPE {
-		BWIDM(0, "bwidm"),
-		BWLP(1, "bwlp"),
-		SAT(2, "sat");
+		ECP(0),
+		TEST_ACCOUNT(1),
+		DIRECT_CONNECT(2);
 
-		private final int id;
-		private final String tag;
+		public final int id;
 
-		private LOGIN_TYPE(final int id, final String tag) {
+		private LOGIN_TYPE(final int id) {
 			this.id = id;
-			this.tag = tag;
-		}
-
-		public int getId() {
-			return this.id;
-		}
-
-		public String getTag() {
-			return this.tag;
-		}
-
-		public static LOGIN_TYPE getEnum(String tag) {
-			switch (tag) {
-			case "bwidm":
-				return LOGIN_TYPE.BWIDM;
-			case "bwlp":
-				return LOGIN_TYPE.BWLP;
-			case "sat":
-				return LOGIN_TYPE.SAT;
-			default:
-				return null;
-			}
 		}
 	}
 
@@ -112,20 +89,20 @@ public abstract class LoginWindowLayout extends Composite {
 
 		// add the authentication method selection buttons
 		authButtons = new Button[3];
-		authButtons[LOGIN_TYPE.BWIDM.id] = new Button(authGroup, SWT.RADIO);
-		authButtons[LOGIN_TYPE.BWIDM.id].setText("Authentifizierung über bwIDM");
+		authButtons[LOGIN_TYPE.ECP.id] = new Button(authGroup, SWT.RADIO);
+		authButtons[LOGIN_TYPE.ECP.id].setText("Authentifizierung über bwIDM");
 		gridData = new GridData(GridData.FILL, GridData.FILL, true, true);
-		authButtons[LOGIN_TYPE.BWIDM.id].setLayoutData(gridData);
+		authButtons[LOGIN_TYPE.ECP.id].setLayoutData(gridData);
 
-		authButtons[LOGIN_TYPE.BWLP.id] = new Button(authGroup, SWT.RADIO);
-		authButtons[LOGIN_TYPE.BWLP.id].setText("Test-Zugang mit festem Benutzernamen");
+		authButtons[LOGIN_TYPE.TEST_ACCOUNT.id] = new Button(authGroup, SWT.RADIO);
+		authButtons[LOGIN_TYPE.TEST_ACCOUNT.id].setText("Test-Zugang mit festem Benutzernamen");
 		gridData = new GridData(GridData.FILL, GridData.FILL, true, true);
-		authButtons[LOGIN_TYPE.BWLP.id].setLayoutData(gridData);
+		authButtons[LOGIN_TYPE.TEST_ACCOUNT.id].setLayoutData(gridData);
 
-		authButtons[LOGIN_TYPE.SAT.id] = new Button(authGroup, SWT.RADIO);
-		authButtons[LOGIN_TYPE.SAT.id].setText("Direkte Verbindung zum Satelliten");
+		authButtons[LOGIN_TYPE.DIRECT_CONNECT.id] = new Button(authGroup, SWT.RADIO);
+		authButtons[LOGIN_TYPE.DIRECT_CONNECT.id].setText("Direkte Verbindung zum Satelliten");
 		gridData = new GridData(GridData.FILL, GridData.FILL, true, true);
-		authButtons[LOGIN_TYPE.SAT.id].setLayoutData(gridData);
+		authButtons[LOGIN_TYPE.DIRECT_CONNECT.id].setLayoutData(gridData);
 
 		// group for the login mask
 		final Group loginGroup = new Group(this, SWT.NONE);