summaryrefslogtreecommitdiffstats
path: root/dozentenmodul/src/main/java/util
diff options
context:
space:
mode:
authorSimon Rettberg2015-03-05 17:30:32 +0100
committerSimon Rettberg2015-03-05 17:30:32 +0100
commitd6225d9c444822df05fa64191f4cba79f1bbd2c1 (patch)
treeedac0ea7bc34b2e729368511c51513ebbb355972 /dozentenmodul/src/main/java/util
parent[client] Restore RPC version check; add error message on thrift communication... (diff)
downloadtutor-module-d6225d9c444822df05fa64191f4cba79f1bbd2c1.tar.gz
tutor-module-d6225d9c444822df05fa64191f4cba79f1bbd2c1.tar.xz
tutor-module-d6225d9c444822df05fa64191f4cba79f1bbd2c1.zip
[client] Make SessionData a static class instead of a class that doesn't know if it's a singleton or not
Diffstat (limited to 'dozentenmodul/src/main/java/util')
-rw-r--r--dozentenmodul/src/main/java/util/ListAllOtherUsers_GUI.java2
-rw-r--r--dozentenmodul/src/main/java/util/News.java4
2 files changed, 3 insertions, 3 deletions
diff --git a/dozentenmodul/src/main/java/util/ListAllOtherUsers_GUI.java b/dozentenmodul/src/main/java/util/ListAllOtherUsers_GUI.java
index 270c783a..e03e1106 100644
--- a/dozentenmodul/src/main/java/util/ListAllOtherUsers_GUI.java
+++ b/dozentenmodul/src/main/java/util/ListAllOtherUsers_GUI.java
@@ -272,7 +272,7 @@ public class ListAllOtherUsers_GUI extends JFrame {
}
//get the info
- map = ThriftManager.getSatClient().getAllOtherSatelliteUsers(user,SessionData.session.getAuthToken());
+ map = ThriftManager.getSatClient().getAllOtherSatelliteUsers(user,SessionData.authToken);
Iterator<Person> i = map.iterator();
int x = 0;
diff --git a/dozentenmodul/src/main/java/util/News.java b/dozentenmodul/src/main/java/util/News.java
index 56b162ac..1c32209a 100644
--- a/dozentenmodul/src/main/java/util/News.java
+++ b/dozentenmodul/src/main/java/util/News.java
@@ -113,7 +113,7 @@ public class News {
private static void init(){
// Document representing the XML
Document doc = null;
- String satIp = SessionData.session.getServerAdress();
+ String satIp = SessionData.serverAdress;
// sanity check to see if we have the satellite IP
if (satIp == null || satIp.isEmpty()) {
LOGGER.error("No satellite IP adress is set in SessionData, aborting news fetching...");
@@ -123,7 +123,7 @@ public class News {
// URL to news API
URL url = null;
try {
- url = new URL("http://" + SessionData.session.getServerAdress() + "/slx-admin/api.php?do=news");
+ url = new URL("http://" + SessionData.serverAdress + "/slx-admin/api.php?do=news");
} catch (MalformedURLException e) {
LOGGER.error("Malformated URL to News-API, see trace: ", e);
}