summaryrefslogtreecommitdiffstats
path: root/dozentenmodul/src/main/java/gui/intro/Login_GUI.java
diff options
context:
space:
mode:
authorJonathan Bauer2015-03-04 17:03:25 +0100
committerJonathan Bauer2015-03-04 17:03:25 +0100
commit17c7608810c023354068699b21a8c6882d9f130a (patch)
tree4ab23ccb171bc0fab98cd58cd905667eada70a33 /dozentenmodul/src/main/java/gui/intro/Login_GUI.java
parentfix wrong class for logging (diff)
downloadtutor-module-17c7608810c023354068699b21a8c6882d9f130a.tar.gz
tutor-module-17c7608810c023354068699b21a8c6882d9f130a.tar.xz
tutor-module-17c7608810c023354068699b21a8c6882d9f130a.zip
Thrift: reconnect on transport error
Moved ThriftManager and ThriftHandler 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.java5
1 files changed, 2 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 02660011..fb46335a 100644
--- a/dozentenmodul/src/main/java/gui/intro/Login_GUI.java
+++ b/dozentenmodul/src/main/java/gui/intro/Login_GUI.java
@@ -19,7 +19,6 @@ import javax.swing.ImageIcon;
import javax.swing.JButton;
import javax.swing.JCheckBox;
import javax.swing.JComboBox;
-import javax.swing.JFrame;
import javax.swing.JInternalFrame;
import javax.swing.JLabel;
import javax.swing.JList;
@@ -43,8 +42,8 @@ import org.apache.thrift.TException;
import org.openslx.imagemaster.thrift.iface.ImageServer;
import org.openslx.imagemaster.thrift.iface.OrganizationData;
import org.openslx.imagemaster.thrift.iface.UserInfo;
+import org.openslx.thrifthelper.ThriftManager;
-import thrift.ThriftManager;
import util.GuiManager;
import util.ResourceLoader;
import util.ShibbolethECP;
@@ -280,7 +279,7 @@ public class Login_GUI extends JInternalFrame {
// start the authentication process against the masterserver
org.openslx.imagemaster.thrift.iface.SessionData result = null;
// Connect to Master
- ImageServer.Client client = ThriftManager.getMasterClient();
+ ImageServer.Iface client = ThriftManager.getMasterClient();
String passText = new String(lblpass.getPassword());
UserInfo user = null;
// Log user in