diff options
author | Simon Rettberg | 2016-01-21 20:12:11 +0100 |
---|---|---|
committer | Simon Rettberg | 2016-01-21 20:12:11 +0100 |
commit | f3f614818f0a66e48f6733465ff2cc93fe6dfc53 (patch) | |
tree | ba1792f46ae9db14b81e117ca233cbabda7aa852 /dozentenmodul/src/main/java/org/openslx/dozmod/thrift | |
parent | [client] Lower caching time for lectures and images from 2min to 30sec (diff) | |
download | tutor-module-f3f614818f0a66e48f6733465ff2cc93fe6dfc53.tar.gz tutor-module-f3f614818f0a66e48f6733465ff2cc93fe6dfc53.tar.xz tutor-module-f3f614818f0a66e48f6733465ff2cc93fe6dfc53.zip |
[client] Hide satellite servers starting with {x} when not pressing SHIFT
Diffstat (limited to 'dozentenmodul/src/main/java/org/openslx/dozmod/thrift')
-rw-r--r-- | dozentenmodul/src/main/java/org/openslx/dozmod/thrift/ThriftActions.java | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/thrift/ThriftActions.java b/dozentenmodul/src/main/java/org/openslx/dozmod/thrift/ThriftActions.java index 455cb2ad..b5c50ba1 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/thrift/ThriftActions.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/thrift/ThriftActions.java @@ -7,6 +7,7 @@ import java.io.FileNotFoundException; import java.io.IOException; import java.util.ArrayList; import java.util.HashMap; +import java.util.Iterator; import java.util.List; import java.util.Map; @@ -113,6 +114,15 @@ public class ThriftActions { } if (sat == null) { + if (!forceCustomSatellite) { + // Remove testing servers (those starting with {x}) if shift was not pressed + for (Iterator<Satellite> it = data.satellites.iterator(); it.hasNext();) { + Satellite entry = it.next(); + if (entry.displayName != null && entry.displayName.startsWith("{x}")) { + it.remove(); + } + } + } sat = SatelliteListWindow.open(window, data.satellites); if (sat == null) return false; |