diff options
| author | Simon Rettberg | 2015-02-19 17:52:27 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2015-02-19 17:52:27 +0100 |
| commit | 265946d452f1374d2a43c71f1403a4da7712194c (patch) | |
| tree | aeb90854ef722b6da780fdb5134bc2d140b1ee81 /dozentenmodul/src/main/java/gui/intro/Login_GUI.java | |
| parent | • changed contact information from michael.wilson to bwlehrpool (diff) | |
| download | tutor-module-265946d452f1374d2a43c71f1403a4da7712194c.tar.gz tutor-module-265946d452f1374d2a43c71f1403a4da7712194c.tar.xz tutor-module-265946d452f1374d2a43c71f1403a4da7712194c.zip | |
Remove client -> server dependency, move thrift classes to master-sync-shared
Diffstat (limited to 'dozentenmodul/src/main/java/gui/intro/Login_GUI.java')
| -rw-r--r-- | dozentenmodul/src/main/java/gui/intro/Login_GUI.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/dozentenmodul/src/main/java/gui/intro/Login_GUI.java b/dozentenmodul/src/main/java/gui/intro/Login_GUI.java index 0b22792d..0af27fee 100644 --- a/dozentenmodul/src/main/java/gui/intro/Login_GUI.java +++ b/dozentenmodul/src/main/java/gui/intro/Login_GUI.java @@ -44,6 +44,7 @@ import org.apache.thrift.TException; import org.openslx.imagemaster.thrift.iface.ImageServer.Client; import org.openslx.imagemaster.thrift.iface.OrganizationData; import org.openslx.imagemaster.thrift.iface.UserInfo; +import org.openslx.sat.thrift.iface.Server; import thrift.MasterThriftConnection; import thrift.ThriftConnection; @@ -72,7 +73,6 @@ public class Login_GUI extends JFrame { JLabel lblConnectionInfo = new JLabel(""); boolean isClientReturnedCorrectly = false; JCheckBox chckbxBenutzernameSpeichern; - private static final String HELP_MESSAGE = ""; Component c = null; String[] args = null; @@ -361,7 +361,7 @@ public class Login_GUI extends JFrame { setStatus(Color.black, "Hole Verbindungsdaten von Server...", null); // set connection to bwLehrpoolSuiteServer ThriftConnection bwthrift = new ThriftConnection(); - server.generated.Server.Client bwClient = bwthrift.getThriftConnection(); + Server.Client bwClient = bwthrift.getThriftConnection(); models.Client.clientcon.setClient(bwClient); // User-Info @@ -487,7 +487,7 @@ public class Login_GUI extends JFrame { * */ //import server.generated.Server.Client; - server.generated.Server.Client client_2 = models.Client.clientcon.getClient(); + Server.Client client_2 = models.Client.clientcon.getClient(); try { boolean authenticated = client_2.authenticated(authToken); |