diff options
Diffstat (limited to 'dozentenmodul/src/main/java/org/openslx/dozmod')
3 files changed, 12 insertions, 2 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"); |