summaryrefslogtreecommitdiffstats
path: root/Dozentenmodul/src/thrift/MasterThriftConnection.java
diff options
context:
space:
mode:
authorunknown2014-04-14 16:07:31 +0200
committerunknown2014-04-14 16:07:31 +0200
commitc303590f13bd3f624d18ca427dc0257ceadc7572 (patch)
tree96e6fb9a744455d6f10c29cd4faf58bad30ecd77 /Dozentenmodul/src/thrift/MasterThriftConnection.java
parenttesttttt (diff)
parentGUI-Texte angepasst (diff)
downloadtutor-module-c303590f13bd3f624d18ca427dc0257ceadc7572.tar.gz
tutor-module-c303590f13bd3f624d18ca427dc0257ceadc7572.tar.xz
tutor-module-c303590f13bd3f624d18ca427dc0257ceadc7572.zip
Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-module
Conflicts: Dozentenmodul/bin/gui/intro/MainMenue_GUI.class
Diffstat (limited to 'Dozentenmodul/src/thrift/MasterThriftConnection.java')
-rw-r--r--Dozentenmodul/src/thrift/MasterThriftConnection.java7
1 files changed, 5 insertions, 2 deletions
diff --git a/Dozentenmodul/src/thrift/MasterThriftConnection.java b/Dozentenmodul/src/thrift/MasterThriftConnection.java
index ecbc689c..7ddbd1a5 100644
--- a/Dozentenmodul/src/thrift/MasterThriftConnection.java
+++ b/Dozentenmodul/src/thrift/MasterThriftConnection.java
@@ -11,7 +11,10 @@ import thrift.ImageServer.Client;
public class MasterThriftConnection {
- final TTransport transport = new TSocket("132.230.4.16", 9090);
+
+ public static final String MASTERSERVERIP="132.230.4.16";
+ final TTransport transport = new TSocket(MASTERSERVERIP, 9090);
+
public Client getMasterThriftConnection()
{
@@ -26,7 +29,7 @@ public class MasterThriftConnection {
final Client client = new Client(protocol);
- System.out.println("Der Server läuft!");
+ System.out.println("\nDer Server läuft!");
return client;
}