diff options
author | Jonathan Bauer | 2016-01-13 13:08:49 +0100 |
---|---|---|
committer | Jonathan Bauer | 2016-01-13 13:08:49 +0100 |
commit | 6ddad848d942a4240ed2391fc62a860f9195ff32 (patch) | |
tree | 6c5763c742658f39c3ca4c8f26dcfa403d83bd09 /dozentenmodul/src/main/java/org/openslx/dozmod/thrift/cache | |
parent | [server] Use GrowingThreadPoolExecutor everywhere (diff) | |
download | tutor-module-6ddad848d942a4240ed2391fc62a860f9195ff32.tar.gz tutor-module-6ddad848d942a4240ed2391fc62a860f9195ff32.tar.xz tutor-module-6ddad848d942a4240ed2391fc62a860f9195ff32.zip |
[client] fix LectureWizard not accepting "Done" when no locations are selected
* removed the test code for the location cache, activated the real call
* not showing the LocationSelectionPage if no locations are returned from the cache
Diffstat (limited to 'dozentenmodul/src/main/java/org/openslx/dozmod/thrift/cache')
-rw-r--r-- | dozentenmodul/src/main/java/org/openslx/dozmod/thrift/cache/MetaDataCache.java | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/thrift/cache/MetaDataCache.java b/dozentenmodul/src/main/java/org/openslx/dozmod/thrift/cache/MetaDataCache.java index 6c3d2be5..f7ed44e3 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/thrift/cache/MetaDataCache.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/thrift/cache/MetaDataCache.java @@ -1,6 +1,5 @@ package org.openslx.dozmod.thrift.cache; -import java.util.ArrayList; import java.util.List; import org.apache.log4j.Logger; @@ -51,19 +50,20 @@ public class MetaDataCache { CACHE_TIME_MS) { @Override protected List<Location> update() throws TException { - List<Location> testLocationList = new ArrayList<Location>(); - testLocationList.add(new Location(1, "RZ - Raum 100")); - testLocationList.add(new Location(2, "RZ - Raum 101")); - testLocationList.add(new Location(3, "RZ - Raum 113")); - testLocationList.add(new Location(4, "RZ - Raum 114")); - return testLocationList; // enable this code when the server call is implemented -// try { -// return ThriftManager.getSatClient().getLocations(); -// } catch (TException e) { -// LOGGER.warn("Could not get location list from satellite, trying master for backup...", e); -// } -// return null; // HACK + try { + return ThriftManager.getSatClient().getLocations(); + } catch (TException e) { + LOGGER.warn("Could not get locations list from the satellite...", e); + } + // querying masterserver does not make sense for locations + return null; +// List<Location> testLocationList = new ArrayList<Location>(); +// testLocationList.add(new Location(1, "RZ - Raum 100")); +// testLocationList.add(new Location(2, "RZ - Raum 101")); +// testLocationList.add(new Location(3, "RZ - Raum 113")); +// testLocationList.add(new Location(4, "RZ - Raum 114")); +// return testLocationList; } }; |