From 3127d8435f638d79de758127f5a7d8d0aac63a3e Mon Sep 17 00:00:00 2001
From: Marcus Proest
Date: Thu, 28 Mar 2019 11:26:15 +0100
Subject: [client] add idm name and proxy mode configuration to branding

---
 dozentenmodul/src/main/java/org/openslx/dozmod/Branding.java   | 10 ++++++++++
 dozentenmodul/src/main/java/org/openslx/dozmod/Config.java     |  2 +-
 .../openslx/dozmod/gui/window/layout/LoginWindowLayout.java    |  2 +-
 dozentenmodul/src/main/properties/branding.properties          |  4 +++-
 4 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/Branding.java b/dozentenmodul/src/main/java/org/openslx/dozmod/Branding.java
index ca7dcfcf..4165c670 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/Branding.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/Branding.java
@@ -21,6 +21,8 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Properties;
 
+import org.openslx.dozmod.Config.ProxyMode;
+
 import org.apache.log4j.Logger;
 
 public final class Branding {
@@ -46,6 +48,10 @@ public final class Branding {
 		return PROPERTIES.getProperty("masterserver.address", "bwlp-masterserver.ruf.uni-freiburg.de");
 	}
 
+	public final static String getMasterServerIdm() {
+		return PROPERTIES.getProperty("masterserver.idm", "bwIDM");
+	}
+
 	public final static String getApplicationName() {
 		return PROPERTIES.getProperty("application.name", "bwLehrpool-Suite");
 	}
@@ -66,6 +72,10 @@ public final class Branding {
 		return PROPERTIES.getProperty("service.email", "bwlehrpool@hs-offenburg.de");
 	}
 
+	public final static String getProxyMode() {
+		return PROPERTIES.getProperty("proxy.mode", ProxyMode.AUTO.toString());
+	}
+
 	public static void dump(final String localDir) {
 		if (localDir == null || localDir.isEmpty())
 			return;
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/Config.java b/dozentenmodul/src/main/java/org/openslx/dozmod/Config.java
index 1e243d5c..904d0693 100755
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/Config.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/Config.java
@@ -433,7 +433,7 @@ public class Config {
 	 */
 	public static ProxyMode getProxyMode() {
 		try {
-			return ProxyMode.valueOf(getString("proxy.mode", ProxyMode.AUTO.toString()));
+			return ProxyMode.valueOf(getString("proxy.mode", Branding.getProxyMode()));
 		} catch (Exception e) {
 			return ProxyMode.AUTO;
 		}
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 18e7133e..4696f392 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
@@ -86,7 +86,7 @@ public abstract class LoginWindowLayout extends JDialog {
 		grid.add(new QLabel(getScaledLogo()), 2);
 		grid.nextRow();
 
-		rdoLoginType[0] = new JRadioButton("Authentifizierung über bwIDM");
+		rdoLoginType[0] = new JRadioButton("Authentifizierung über " + Branding.getMasterServerIdm());
 		rdoLoginType[1] = new JRadioButton("Test-Zugang mit festem Benutzer");
 		rdoLoginType[2] = new JRadioButton("Direkter Zugang zum Satelliten");
 		btnSettings = new JButton("Einstellungen");
diff --git a/dozentenmodul/src/main/properties/branding.properties b/dozentenmodul/src/main/properties/branding.properties
index b37e7c70..ea05a5b3 100644
--- a/dozentenmodul/src/main/properties/branding.properties
+++ b/dozentenmodul/src/main/properties/branding.properties
@@ -1,6 +1,8 @@
 masterserver.address=bwlp-masterserver.ruf.uni-freiburg.de
+masterserver.idm=bwIDM
 application.name=bwLehrpool-Suite
 service.name=bwLehrpool
 service.faq.website=https://www.bwlehrpool.de
 service.email=bwlehrpool@hs-offenburg.de
-config.directory=bwSuite
\ No newline at end of file
+config.directory=bwSuite
+proxy.mode=AUTO
-- 
cgit v1.2.3-55-g7522