Test

3 files changed, 10 insertions, 2 deletions

diff --git a/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java b/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java
index e8c0c4b9..81e34dcc 100644
--- a/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java
+++ b/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java
@@ -350,6 +350,7 @@ public class FTPCreateUploader_GUI extends JFrame implements
 				btnZurck.addActionListener(new ActionListener() {
 					public void actionPerformed(ActionEvent e) {
 						dispose();
+						thrift.closeThriftConnection();
 						CreateImageTechnisch_GUI m = new CreateImageTechnisch_GUI();
 						m.setVisible(true);
 					}
diff --git a/Dozentenmodul/src/gui/image/FTPDownloader_GUI.java b/Dozentenmodul/src/gui/image/FTPDownloader_GUI.java
index 4a54e346..dd8782f3 100644
--- a/Dozentenmodul/src/gui/image/FTPDownloader_GUI.java
+++ b/Dozentenmodul/src/gui/image/FTPDownloader_GUI.java
@@ -47,8 +47,6 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener
 	JProgressBar progressBar;
 	String host = "141.79.128.121";
 	int port = 21;
-	String username = "openslx";
-	String password = "openslx-ng";
 	String downloadFile = "";
 	static String arg = "";
 	DownloadTask task;
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);