diff options
| author | Jonathan Bauer | 2016-04-27 17:24:15 +0200 |
|---|---|---|
| committer | Jonathan Bauer | 2016-04-27 17:24:15 +0200 |
| commit | a40ddb0a580348d68ff0c515275ffa252b686c1e (patch) | |
| tree | e2436a05c935fd7b6c408e4cafb5be5dce6e16ce /dozentenmodul/src/main/java/org/openslx/dozmod/util | |
| parent | [server] Fix upload handling if image already exists (diff) | |
| download | tutor-module-a40ddb0a580348d68ff0c515275ffa252b686c1e.tar.gz tutor-module-a40ddb0a580348d68ff0c515275ffa252b686c1e.tar.xz tutor-module-a40ddb0a580348d68ff0c515275ffa252b686c1e.zip | |
[client] first working draft for published images stuff
Diffstat (limited to 'dozentenmodul/src/main/java/org/openslx/dozmod/util')
| -rw-r--r-- | dozentenmodul/src/main/java/org/openslx/dozmod/util/FormatHelper.java | 13 | ||||
| -rw-r--r-- | dozentenmodul/src/main/java/org/openslx/dozmod/util/ProxyConfigurator.java | 2 |
2 files changed, 14 insertions, 1 deletions
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/util/FormatHelper.java b/dozentenmodul/src/main/java/org/openslx/dozmod/util/FormatHelper.java index 34108eaa..2580e209 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/util/FormatHelper.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/util/FormatHelper.java @@ -11,6 +11,7 @@ import org.joda.time.format.PeriodFormat; import org.joda.time.format.PeriodFormatter; import org.openslx.bwlp.thrift.iface.Location; import org.openslx.bwlp.thrift.iface.OperatingSystem; +import org.openslx.bwlp.thrift.iface.Organization; import org.openslx.bwlp.thrift.iface.UserInfo; public class FormatHelper { @@ -162,4 +163,16 @@ public class FormatHelper { return "Unknown"; return location.getLocationName(); } + + /** + * Format the given organisation name. + * + * @param Organisation a {@link Organisation} instance + * @return Display name for that organisation, string "unknown" otherwise + */ + public static String orgName(Organization org) { + if (org == null) + return "Unknown"; + return org.getDisplayName(); + } } diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/util/ProxyConfigurator.java b/dozentenmodul/src/main/java/org/openslx/dozmod/util/ProxyConfigurator.java index 96659989..cadae6f8 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/util/ProxyConfigurator.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/util/ProxyConfigurator.java @@ -33,7 +33,7 @@ public class ProxyConfigurator { * Initialization method. */ public static void init() { - MasterServer.Client masterClient = ThriftManager.getNewMasterClient(null, App.MASTER_SERVER_ADDRESS, + MasterServer.Client masterClient = ThriftManager.getNewMasterClient(null, App.getMasterServerAddress(), App.THRIFT_PORT, 4000); if (masterClient != null) { try { |