summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--dozentenmodul/src/main/java/App.java6
-rw-r--r--dozentenmodul/src/main/java/gui/core/LoginGUI.java3
2 files changed, 7 insertions, 2 deletions
diff --git a/dozentenmodul/src/main/java/App.java b/dozentenmodul/src/main/java/App.java
index 541400e1..4cfef531 100644
--- a/dozentenmodul/src/main/java/App.java
+++ b/dozentenmodul/src/main/java/App.java
@@ -13,6 +13,8 @@ import org.apache.log4j.Logger;
import org.apache.log4j.PatternLayout;
import org.apache.log4j.spi.LoggingEvent;
+import org.openslx.thrifthelper.ThriftManager;
+
import config.Config;
import config.ConfigProxy;
@@ -109,6 +111,8 @@ public class App {
} catch (IOException e) {
LOGGER.error("IOException when trying to initialise the proxy, see trace: ", e);
}
+ // Set master server to use (TODO: make configurable via command line)
+ ThriftManager.setMasterServerAddress( "bwlp-masterserver.ruf.uni-freiburg.de" );
// // Set up thrift error message displaying
// ThriftManager.setErrorCallback(new ErrorCallback() {
@@ -132,4 +136,4 @@ public class App {
GuiManager.initGui();
}
-} \ No newline at end of file
+}
diff --git a/dozentenmodul/src/main/java/gui/core/LoginGUI.java b/dozentenmodul/src/main/java/gui/core/LoginGUI.java
index 9f204b1b..3e52df29 100644
--- a/dozentenmodul/src/main/java/gui/core/LoginGUI.java
+++ b/dozentenmodul/src/main/java/gui/core/LoginGUI.java
@@ -174,7 +174,8 @@ public class LoginGUI extends LoginComposite {
break;
}
} else {
- ThriftManager.setSatellite("132.230.8.113");
+ // TODO: FOR DEBUGGING/DEV PURPOSES!
+ ThriftManager.setSatelliteAddress( "132.230.8.113" );
GuiManager.addContent(new DisclaimerComposite(getShell()));
}
}