Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-module

Conflicts:
	Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$8.class
	Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI.class
	Dozentenmodul/bin/gui/image/FTPDownloader_GUI$1.class
	Dozentenmodul/bin/gui/image/FTPDownloader_GUI$2.class
	Dozentenmodul/bin/gui/image/FTPDownloader_GUI$3.class
	Dozentenmodul/bin/gui/image/FTPDownloader_GUI$4.class
	Dozentenmodul/bin/gui/image/FTPDownloader_GUI$5.class
	Dozentenmodul/bin/gui/image/FTPDownloader_GUI$6.class
	Dozentenmodul/bin/gui/image/FTPDownloader_GUI.class

1 files changed, 9 insertions, 0 deletions

diff --git a/Dozentenmodul/src/gui/intro/Login_GUI.java b/Dozentenmodul/src/gui/intro/Login_GUI.java
index 488c6b69..e2db747e 100644
--- a/Dozentenmodul/src/gui/intro/Login_GUI.java
+++ b/Dozentenmodul/src/gui/intro/Login_GUI.java
@@ -12,6 +12,8 @@ import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
 import java.io.File;
 import java.io.IOException;
+import java.nio.channels.SeekableByteChannel;
+
 import javax.swing.ImageIcon;
 import javax.swing.JButton;
 import javax.swing.JFrame;
@@ -23,6 +25,8 @@ import javax.swing.JTextField;
 import javax.swing.UIManager;
 import javax.swing.UnsupportedLookAndFeelException;
 import javax.swing.border.EmptyBorder;
+
+import models.SessionData;
 import models.person;
 import org.apache.thrift.TException;
 import org.ini4j.Wini;
@@ -179,6 +183,10 @@ public class Login_GUI extends JFrame {
 			String passText = new String(pass.getPassword());
 			System.out.println("Benutzer:" +username.getText() + "\nPasswort" + passText);
 			result = client.authenticate(username.getText(), passText);
+			SessionData.session.setAuthToken(result.authToken);
+			SessionData.session.setSessionID(result.sessionId);
+			SessionData.session.setServerAdress(result.serverAddress);
+			System.out.println("Server Adresse: "+result.serverAddress);
 			
 		} catch (thrift.AuthenticationException e) {
 			System.out.println("Authentifizierung fehlgeschlagen: " + e.message);
@@ -232,6 +240,7 @@ public class Login_GUI extends JFrame {
 						person.verantwortlicher.setVorname(user.firstName);
 						person.verantwortlicher.setEMail(user.eMail);
 						person.verantwortlicher.setHochschule(hochschule);
+						
 						// Öffne das Hauprmenü
 						MainMenue_GUI main = new MainMenue_GUI();
 						main.setVisible(true);