Bearbeiten von Images funktioniert nun vollständig

74 files changed, 147 insertions, 219 deletions

diff --git a/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI$1.class b/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI$1.class
index e01e6b79..062a5aeb 100644
--- a/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI$1.class
+++ b/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI$1.class
diff --git a/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI$2.class b/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI$2.class
index dc948767..9d0a3bea 100644
--- a/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI$2.class
+++ b/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI$2.class
diff --git a/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI$3.class b/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI$3.class
index e248fd06..69507f5e 100644
--- a/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI$3.class
+++ b/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI$3.class
diff --git a/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI$4.class b/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI$4.class
index 051431f2..e7af4c13 100644
--- a/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI$4.class
+++ b/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI$4.class
diff --git a/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI.class b/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI.class
index c0a38325..2287ca1a 100644
--- a/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI.class
+++ b/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI.class
diff --git a/Dozentenmodul/bin/GUI/EditImageTechnisch_GUI$1.class b/Dozentenmodul/bin/GUI/EditImageTechnisch_GUI$1.class
index b17e4eea..3ed6a8ca 100644
--- a/Dozentenmodul/bin/GUI/EditImageTechnisch_GUI$1.class
+++ b/Dozentenmodul/bin/GUI/EditImageTechnisch_GUI$1.class
diff --git a/Dozentenmodul/bin/GUI/EditImageTechnisch_GUI$2.class b/Dozentenmodul/bin/GUI/EditImageTechnisch_GUI$2.class
index dcfd7111..c334f61e 100644
--- a/Dozentenmodul/bin/GUI/EditImageTechnisch_GUI$2.class
+++ b/Dozentenmodul/bin/GUI/EditImageTechnisch_GUI$2.class
diff --git a/Dozentenmodul/bin/GUI/EditImageTechnisch_GUI$3.class b/Dozentenmodul/bin/GUI/EditImageTechnisch_GUI$3.class
index a0a6173c..0c45cb47 100644
--- a/Dozentenmodul/bin/GUI/EditImageTechnisch_GUI$3.class
+++ b/Dozentenmodul/bin/GUI/EditImageTechnisch_GUI$3.class
diff --git a/Dozentenmodul/bin/GUI/EditImageTechnisch_GUI$4.class b/Dozentenmodul/bin/GUI/EditImageTechnisch_GUI$4.class
index f5d01268..6b0b0760 100644
--- a/Dozentenmodul/bin/GUI/EditImageTechnisch_GUI$4.class
+++ b/Dozentenmodul/bin/GUI/EditImageTechnisch_GUI$4.class
diff --git a/Dozentenmodul/bin/GUI/EditImageTechnisch_GUI.class b/Dozentenmodul/bin/GUI/EditImageTechnisch_GUI.class
index 21658851..182e34ea 100644
--- a/Dozentenmodul/bin/GUI/EditImageTechnisch_GUI.class
+++ b/Dozentenmodul/bin/GUI/EditImageTechnisch_GUI.class
diff --git a/Dozentenmodul/bin/GUI/FTPDownloader_GUI$1.class b/Dozentenmodul/bin/GUI/FTPDownloader_GUI$1.class
index dabb4fbf..3067718e 100644
--- a/Dozentenmodul/bin/GUI/FTPDownloader_GUI$1.class
+++ b/Dozentenmodul/bin/GUI/FTPDownloader_GUI$1.class
diff --git a/Dozentenmodul/bin/GUI/FTPDownloader_GUI$2.class b/Dozentenmodul/bin/GUI/FTPDownloader_GUI$2.class
index f030114b..41ad1e3f 100644
--- a/Dozentenmodul/bin/GUI/FTPDownloader_GUI$2.class
+++ b/Dozentenmodul/bin/GUI/FTPDownloader_GUI$2.class
diff --git a/Dozentenmodul/bin/GUI/FTPDownloader_GUI$3.class b/Dozentenmodul/bin/GUI/FTPDownloader_GUI$3.class
index b1f9edc1..2af3aa99 100644
--- a/Dozentenmodul/bin/GUI/FTPDownloader_GUI$3.class
+++ b/Dozentenmodul/bin/GUI/FTPDownloader_GUI$3.class
diff --git a/Dozentenmodul/bin/GUI/FTPDownloader_GUI$4.class b/Dozentenmodul/bin/GUI/FTPDownloader_GUI$4.class
index fbed3457..6f093d26 100644
--- a/Dozentenmodul/bin/GUI/FTPDownloader_GUI$4.class
+++ b/Dozentenmodul/bin/GUI/FTPDownloader_GUI$4.class
diff --git a/Dozentenmodul/bin/GUI/FTPDownloader_GUI.class b/Dozentenmodul/bin/GUI/FTPDownloader_GUI.class
index a6af82a6..0d64e048 100644
--- a/Dozentenmodul/bin/GUI/FTPDownloader_GUI.class
+++ b/Dozentenmodul/bin/GUI/FTPDownloader_GUI.class
diff --git a/Dozentenmodul/bin/GUI/MainMenue_GUI.class b/Dozentenmodul/bin/GUI/MainMenue_GUI.class
index b39b43af..9c8c5535 100644
--- a/Dozentenmodul/bin/GUI/MainMenue_GUI.class
+++ b/Dozentenmodul/bin/GUI/MainMenue_GUI.class
diff --git a/Dozentenmodul/bin/Models/vm.class b/Dozentenmodul/bin/Models/vm.class
deleted file mode 100644
index 58709544..00000000
--- a/Dozentenmodul/bin/Models/vm.class
+++ /dev/null
diff --git a/Dozentenmodul/bin/gui/EditImageAllgemein_GUI$1.class b/Dozentenmodul/bin/gui/EditImageAllgemein_GUI$1.class
index e01e6b79..062a5aeb 100644
--- a/Dozentenmodul/bin/gui/EditImageAllgemein_GUI$1.class
+++ b/Dozentenmodul/bin/gui/EditImageAllgemein_GUI$1.class
diff --git a/Dozentenmodul/bin/gui/EditImageAllgemein_GUI$2.class b/Dozentenmodul/bin/gui/EditImageAllgemein_GUI$2.class
index dc948767..9d0a3bea 100644
--- a/Dozentenmodul/bin/gui/EditImageAllgemein_GUI$2.class
+++ b/Dozentenmodul/bin/gui/EditImageAllgemein_GUI$2.class
diff --git a/Dozentenmodul/bin/gui/EditImageAllgemein_GUI$3.class b/Dozentenmodul/bin/gui/EditImageAllgemein_GUI$3.class
index e248fd06..69507f5e 100644
--- a/Dozentenmodul/bin/gui/EditImageAllgemein_GUI$3.class
+++ b/Dozentenmodul/bin/gui/EditImageAllgemein_GUI$3.class
diff --git a/Dozentenmodul/bin/gui/EditImageAllgemein_GUI$4.class b/Dozentenmodul/bin/gui/EditImageAllgemein_GUI$4.class
index 051431f2..e7af4c13 100644
--- a/Dozentenmodul/bin/gui/EditImageAllgemein_GUI$4.class
+++ b/Dozentenmodul/bin/gui/EditImageAllgemein_GUI$4.class
diff --git a/Dozentenmodul/bin/gui/EditImageAllgemein_GUI.class b/Dozentenmodul/bin/gui/EditImageAllgemein_GUI.class
index c0a38325..2287ca1a 100644
--- a/Dozentenmodul/bin/gui/EditImageAllgemein_GUI.class
+++ b/Dozentenmodul/bin/gui/EditImageAllgemein_GUI.class
diff --git a/Dozentenmodul/bin/gui/EditImageTechnisch_GUI$1.class b/Dozentenmodul/bin/gui/EditImageTechnisch_GUI$1.class
index b17e4eea..3ed6a8ca 100644
--- a/Dozentenmodul/bin/gui/EditImageTechnisch_GUI$1.class
+++ b/Dozentenmodul/bin/gui/EditImageTechnisch_GUI$1.class
diff --git a/Dozentenmodul/bin/gui/EditImageTechnisch_GUI$2.class b/Dozentenmodul/bin/gui/EditImageTechnisch_GUI$2.class
index dcfd7111..c334f61e 100644
--- a/Dozentenmodul/bin/gui/EditImageTechnisch_GUI$2.class
+++ b/Dozentenmodul/bin/gui/EditImageTechnisch_GUI$2.class
diff --git a/Dozentenmodul/bin/gui/EditImageTechnisch_GUI$3.class b/Dozentenmodul/bin/gui/EditImageTechnisch_GUI$3.class
index a0a6173c..0c45cb47 100644
--- a/Dozentenmodul/bin/gui/EditImageTechnisch_GUI$3.class
+++ b/Dozentenmodul/bin/gui/EditImageTechnisch_GUI$3.class
diff --git a/Dozentenmodul/bin/gui/EditImageTechnisch_GUI$4.class b/Dozentenmodul/bin/gui/EditImageTechnisch_GUI$4.class
index f5d01268..6b0b0760 100644
--- a/Dozentenmodul/bin/gui/EditImageTechnisch_GUI$4.class
+++ b/Dozentenmodul/bin/gui/EditImageTechnisch_GUI$4.class
diff --git a/Dozentenmodul/bin/gui/EditImageTechnisch_GUI.class b/Dozentenmodul/bin/gui/EditImageTechnisch_GUI.class
index 21658851..182e34ea 100644
--- a/Dozentenmodul/bin/gui/EditImageTechnisch_GUI.class
+++ b/Dozentenmodul/bin/gui/EditImageTechnisch_GUI.class
diff --git a/Dozentenmodul/bin/gui/FTPDownloader_GUI$1.class b/Dozentenmodul/bin/gui/FTPDownloader_GUI$1.class
index dabb4fbf..3067718e 100644
--- a/Dozentenmodul/bin/gui/FTPDownloader_GUI$1.class
+++ b/Dozentenmodul/bin/gui/FTPDownloader_GUI$1.class
diff --git a/Dozentenmodul/bin/gui/FTPDownloader_GUI$2.class b/Dozentenmodul/bin/gui/FTPDownloader_GUI$2.class
index f030114b..41ad1e3f 100644
--- a/Dozentenmodul/bin/gui/FTPDownloader_GUI$2.class
+++ b/Dozentenmodul/bin/gui/FTPDownloader_GUI$2.class
diff --git a/Dozentenmodul/bin/gui/FTPDownloader_GUI$3.class b/Dozentenmodul/bin/gui/FTPDownloader_GUI$3.class
index b1f9edc1..2af3aa99 100644
--- a/Dozentenmodul/bin/gui/FTPDownloader_GUI$3.class
+++ b/Dozentenmodul/bin/gui/FTPDownloader_GUI$3.class
diff --git a/Dozentenmodul/bin/gui/FTPDownloader_GUI$4.class b/Dozentenmodul/bin/gui/FTPDownloader_GUI$4.class
index fbed3457..6f093d26 100644
--- a/Dozentenmodul/bin/gui/FTPDownloader_GUI$4.class
+++ b/Dozentenmodul/bin/gui/FTPDownloader_GUI$4.class
diff --git a/Dozentenmodul/bin/gui/FTPDownloader_GUI$5.class b/Dozentenmodul/bin/gui/FTPDownloader_GUI$5.class
deleted file mode 100644
index ffe0c1c4..00000000
--- a/Dozentenmodul/bin/gui/FTPDownloader_GUI$5.class
+++ /dev/null
diff --git a/Dozentenmodul/bin/gui/FTPDownloader_GUI.class b/Dozentenmodul/bin/gui/FTPDownloader_GUI.class
index a6af82a6..0d64e048 100644
--- a/Dozentenmodul/bin/gui/FTPDownloader_GUI.class
+++ b/Dozentenmodul/bin/gui/FTPDownloader_GUI.class
diff --git a/Dozentenmodul/bin/gui/FTPEditUploader_GUI$1.class b/Dozentenmodul/bin/gui/FTPEditUploader_GUI$1.class
index 9fa18b77..3f952241 100644
--- a/Dozentenmodul/bin/gui/FTPEditUploader_GUI$1.class
+++ b/Dozentenmodul/bin/gui/FTPEditUploader_GUI$1.class
diff --git a/Dozentenmodul/bin/gui/FTPEditUploader_GUI$2.class b/Dozentenmodul/bin/gui/FTPEditUploader_GUI$2.class
index c79031a8..0bff908a 100644
--- a/Dozentenmodul/bin/gui/FTPEditUploader_GUI$2.class
+++ b/Dozentenmodul/bin/gui/FTPEditUploader_GUI$2.class
diff --git a/Dozentenmodul/bin/gui/FTPEditUploader_GUI$3.class b/Dozentenmodul/bin/gui/FTPEditUploader_GUI$3.class
index dc628f0a..7bafe65d 100644
--- a/Dozentenmodul/bin/gui/FTPEditUploader_GUI$3.class
+++ b/Dozentenmodul/bin/gui/FTPEditUploader_GUI$3.class
diff --git a/Dozentenmodul/bin/gui/FTPEditUploader_GUI$4.class b/Dozentenmodul/bin/gui/FTPEditUploader_GUI$4.class
index 7aa1908d..a0883626 100644
--- a/Dozentenmodul/bin/gui/FTPEditUploader_GUI$4.class
+++ b/Dozentenmodul/bin/gui/FTPEditUploader_GUI$4.class
diff --git a/Dozentenmodul/bin/gui/FTPEditUploader_GUI$5.class b/Dozentenmodul/bin/gui/FTPEditUploader_GUI$5.class
index 01834329..034411c3 100644
--- a/Dozentenmodul/bin/gui/FTPEditUploader_GUI$5.class
+++ b/Dozentenmodul/bin/gui/FTPEditUploader_GUI$5.class
diff --git a/Dozentenmodul/bin/gui/FTPEditUploader_GUI$6.class b/Dozentenmodul/bin/gui/FTPEditUploader_GUI$6.class
index 9ebb41ee..043a33a4 100644
--- a/Dozentenmodul/bin/gui/FTPEditUploader_GUI$6.class
+++ b/Dozentenmodul/bin/gui/FTPEditUploader_GUI$6.class
diff --git a/Dozentenmodul/bin/gui/FTPEditUploader_GUI.class b/Dozentenmodul/bin/gui/FTPEditUploader_GUI.class
index fc6e665a..a3da591f 100644
--- a/Dozentenmodul/bin/gui/FTPEditUploader_GUI.class
+++ b/Dozentenmodul/bin/gui/FTPEditUploader_GUI.class
diff --git a/Dozentenmodul/bin/gui/Login_GUI$1.class b/Dozentenmodul/bin/gui/Login_GUI$1.class
index 47818348..b4388d57 100644
--- a/Dozentenmodul/bin/gui/Login_GUI$1.class
+++ b/Dozentenmodul/bin/gui/Login_GUI$1.class
diff --git a/Dozentenmodul/bin/gui/Login_GUI$2.class b/Dozentenmodul/bin/gui/Login_GUI$2.class
index 41243cbe..54cd4d69 100644
--- a/Dozentenmodul/bin/gui/Login_GUI$2.class
+++ b/Dozentenmodul/bin/gui/Login_GUI$2.class
diff --git a/Dozentenmodul/bin/gui/Login_GUI$3.class b/Dozentenmodul/bin/gui/Login_GUI$3.class
index 3122e95a..46796de6 100644
--- a/Dozentenmodul/bin/gui/Login_GUI$3.class
+++ b/Dozentenmodul/bin/gui/Login_GUI$3.class
diff --git a/Dozentenmodul/bin/gui/Login_GUI$4.class b/Dozentenmodul/bin/gui/Login_GUI$4.class
index 25dcca5e..22908f76 100644
--- a/Dozentenmodul/bin/gui/Login_GUI$4.class
+++ b/Dozentenmodul/bin/gui/Login_GUI$4.class
diff --git a/Dozentenmodul/bin/gui/Login_GUI$5.class b/Dozentenmodul/bin/gui/Login_GUI$5.class
index 102f386f..e1bf5be2 100644
--- a/Dozentenmodul/bin/gui/Login_GUI$5.class
+++ b/Dozentenmodul/bin/gui/Login_GUI$5.class
diff --git a/Dozentenmodul/bin/gui/Login_GUI.class b/Dozentenmodul/bin/gui/Login_GUI.class
index 90a674be..da10a7ca 100644
--- a/Dozentenmodul/bin/gui/Login_GUI.class
+++ b/Dozentenmodul/bin/gui/Login_GUI.class
diff --git a/Dozentenmodul/bin/gui/MainMenue_GUI.class b/Dozentenmodul/bin/gui/MainMenue_GUI.class
index b39b43af..9c8c5535 100644
--- a/Dozentenmodul/bin/gui/MainMenue_GUI.class
+++ b/Dozentenmodul/bin/gui/MainMenue_GUI.class
diff --git a/Dozentenmodul/bin/gui/SearchEditImage_GUI$1.class b/Dozentenmodul/bin/gui/SearchEditImage_GUI$1.class
index f7677e0d..4c8a49ba 100644
--- a/Dozentenmodul/bin/gui/SearchEditImage_GUI$1.class
+++ b/Dozentenmodul/bin/gui/SearchEditImage_GUI$1.class
diff --git a/Dozentenmodul/bin/gui/SearchEditImage_GUI$2.class b/Dozentenmodul/bin/gui/SearchEditImage_GUI$2.class
index 0e0f3195..0bb68dce 100644
--- a/Dozentenmodul/bin/gui/SearchEditImage_GUI$2.class
+++ b/Dozentenmodul/bin/gui/SearchEditImage_GUI$2.class
diff --git a/Dozentenmodul/bin/gui/SearchEditImage_GUI$3.class b/Dozentenmodul/bin/gui/SearchEditImage_GUI$3.class
index 3764900b..414b3a0c 100644
--- a/Dozentenmodul/bin/gui/SearchEditImage_GUI$3.class
+++ b/Dozentenmodul/bin/gui/SearchEditImage_GUI$3.class
diff --git a/Dozentenmodul/bin/gui/SearchEditImage_GUI$4.class b/Dozentenmodul/bin/gui/SearchEditImage_GUI$4.class
index e446614e..8ec22cf9 100644
--- a/Dozentenmodul/bin/gui/SearchEditImage_GUI$4.class
+++ b/Dozentenmodul/bin/gui/SearchEditImage_GUI$4.class
diff --git a/Dozentenmodul/bin/gui/SearchEditImage_GUI$5.class b/Dozentenmodul/bin/gui/SearchEditImage_GUI$5.class
index 1f2e2007..1758ada3 100644
--- a/Dozentenmodul/bin/gui/SearchEditImage_GUI$5.class
+++ b/Dozentenmodul/bin/gui/SearchEditImage_GUI$5.class
diff --git a/Dozentenmodul/bin/gui/SearchEditImage_GUI$6.class b/Dozentenmodul/bin/gui/SearchEditImage_GUI$6.class
index ae739673..b89857f4 100644
--- a/Dozentenmodul/bin/gui/SearchEditImage_GUI$6.class
+++ b/Dozentenmodul/bin/gui/SearchEditImage_GUI$6.class
diff --git a/Dozentenmodul/bin/gui/SearchEditImage_GUI$7.class b/Dozentenmodul/bin/gui/SearchEditImage_GUI$7.class
index 5ff30dec..ca1774f7 100644
--- a/Dozentenmodul/bin/gui/SearchEditImage_GUI$7.class
+++ b/Dozentenmodul/bin/gui/SearchEditImage_GUI$7.class
diff --git a/Dozentenmodul/bin/gui/SearchEditImage_GUI$8.class b/Dozentenmodul/bin/gui/SearchEditImage_GUI$8.class
index 2b56e122..08d744bd 100644
--- a/Dozentenmodul/bin/gui/SearchEditImage_GUI$8.class
+++ b/Dozentenmodul/bin/gui/SearchEditImage_GUI$8.class
diff --git a/Dozentenmodul/bin/gui/SearchEditImage_GUI$9.class b/Dozentenmodul/bin/gui/SearchEditImage_GUI$9.class
index 92895e7c..00e112de 100644
--- a/Dozentenmodul/bin/gui/SearchEditImage_GUI$9.class
+++ b/Dozentenmodul/bin/gui/SearchEditImage_GUI$9.class
diff --git a/Dozentenmodul/bin/gui/SearchEditImage_GUI.class b/Dozentenmodul/bin/gui/SearchEditImage_GUI.class
index ae28eddc..c562cc42 100644
--- a/Dozentenmodul/bin/gui/SearchEditImage_GUI.class
+++ b/Dozentenmodul/bin/gui/SearchEditImage_GUI.class
diff --git a/Dozentenmodul/bin/models/SessionData.class b/Dozentenmodul/bin/models/SessionData.class
new file mode 100644
index 00000000..f0ff4996
--- /dev/null
+++ b/Dozentenmodul/bin/models/SessionData.class
diff --git a/Dozentenmodul/bin/models/vm.class b/Dozentenmodul/bin/models/vm.class
deleted file mode 100644
index 58709544..00000000
--- a/Dozentenmodul/bin/models/vm.class
+++ /dev/null
diff --git a/Dozentenmodul/src/GUI/EditImageAllgemein_GUI.java b/Dozentenmodul/src/GUI/EditImageAllgemein_GUI.java
index 34009fc7..1d30e9d0 100644
--- a/Dozentenmodul/src/GUI/EditImageAllgemein_GUI.java
+++ b/Dozentenmodul/src/GUI/EditImageAllgemein_GUI.java
@@ -67,6 +67,7 @@ public class EditImageAllgemein_GUI extends JFrame {
 			@Override
 			public void windowClosing(WindowEvent arg0) {
 				//Beendet die Anwendung bei einem Klick auf das X
+				con.closeThriftConnection();
 				System.exit(0);
 			}
 		});
@@ -216,6 +217,7 @@ public class EditImageAllgemein_GUI extends JFrame {
 			@Override
 			public void mouseClicked(MouseEvent arg0) {
 				//Durch den Klick auf Button Hauptmenpü wird dieses Fenster unsichtbar und das Hauptmenü sichtbar
+				con.closeThriftConnection();
 				EditImageAllgemein_GUI.this.setVisible(false);
 				MainMenue_GUI main=new MainMenue_GUI();
 				main.setVisible(true);
@@ -254,7 +256,7 @@ public class EditImageAllgemein_GUI extends JFrame {
 						
 						//Setzen der Eingabe im Model, dadurch bleiben die Daten bei einem erneuten Aufruf verfügbar
 						//Image.image.setImagename(imagename.getText());
-
+						con.closeThriftConnection();
 						MainMenue_GUI sr=new MainMenue_GUI();
 						sr.setVisible(true);
 						dispose();
diff --git a/Dozentenmodul/src/GUI/EditImageTechnisch_GUI.java b/Dozentenmodul/src/GUI/EditImageTechnisch_GUI.java
index e6d78898..3c6109ae 100644
--- a/Dozentenmodul/src/GUI/EditImageTechnisch_GUI.java
+++ b/Dozentenmodul/src/GUI/EditImageTechnisch_GUI.java
@@ -65,6 +65,7 @@ public class EditImageTechnisch_GUI extends JFrame {
 			@Override
 			public void windowClosing(WindowEvent arg0) {
 				//Beendet die Anwendung bei Klick auf das X 
+				
 				System.exit(0);
 			}
 			
diff --git a/Dozentenmodul/src/GUI/FTPDownloader_GUI.java b/Dozentenmodul/src/GUI/FTPDownloader_GUI.java
index b36f0818..cb53fc3d 100644
--- a/Dozentenmodul/src/GUI/FTPDownloader_GUI.java
+++ b/Dozentenmodul/src/GUI/FTPDownloader_GUI.java
@@ -31,6 +31,8 @@ import java.awt.Font;
 import javax.swing.JTextPane;
 import javax.swing.JSeparator;
 
+import models.Image;
+
 import org.apache.thrift.TException;
 
 import server.Server.Client;
@@ -51,7 +53,7 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener
 	int port = 21;
 	String username = "openslx";
 	String password = "openslx-ng";
-	String downloadPath = "";
+	String downloadFile = "";
 	static String arg = "";
 	DownloadTask task;
 	JLabel bytesreadlbl;
@@ -64,7 +66,7 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener
 	boolean taskrun = false;
 	ThriftConnection thrift = new ThriftConnection();
 	Client client = thrift.getThriftConnection();
-	JButton continueButton = new JButton("Fertigstellen");
+	JButton buttonback = new JButton("Zur\u00FCck");
 
 	/**
 	 * Launch the application.
@@ -86,6 +88,7 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener
 				if (taskrun == true) {
 					try {
 						client.DeleteFtpUser(user.userName);
+						thrift.closeThriftConnection();
 					} catch (TException e1) {
 						// TODO Auto-generated catch block
 						e1.printStackTrace();
@@ -108,7 +111,7 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener
 			e.printStackTrace();
 		}
 
-		// filename=name;
+		
 		setBackground(Color.WHITE);
 		setTitle("Dozentenmodul *Prototyp*");
 		Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
@@ -263,8 +266,8 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener
 			buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT));
 			getContentPane().add(buttonPane, BorderLayout.SOUTH);
 			{
-				continueButton.setEnabled(false);
-				continueButton.addActionListener(new ActionListener() {
+				buttonback.setEnabled(false);
+				buttonback.addActionListener(new ActionListener() {
 					public void actionPerformed(ActionEvent e) {
 						if (taskrun == true) {
 							task.cancel(true);
@@ -275,24 +278,14 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener
 								e1.printStackTrace();
 							}
 						}
+						thrift.closeThriftConnection();
+						SearchEditImage_GUI se=new SearchEditImage_GUI();
+						se.setVisible(true);
 						dispose();
 					}
 				});
-
-				JButton cancelButton = new JButton("Zur\u00FCck");
-				cancelButton.addActionListener(new ActionListener() {
-					public void actionPerformed(ActionEvent arg0) {
-
-						dispose();
-						MainMenue_GUI m = new MainMenue_GUI();
-						m.setVisible(true);
-
-					}
-				});
-				cancelButton.setActionCommand("Cancel");
-				buttonPane.add(cancelButton);
-				continueButton.setActionCommand("Cancel");
-				buttonPane.add(continueButton);
+				buttonback.setActionCommand("Cancel");
+				buttonPane.add(buttonback);
 			}
 		}
 		setVisible(true);
@@ -305,14 +298,16 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener
 
 		try {
 			user = client.getFtpUser();
-			// downloadPath=client.getPathOfImage(filename);
+			
+			downloadFile=client.getPathOfImage(Image.image.getImageId(),Image.image.getVersion());
+			
 		} catch (TException e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
 		}
-
+		
 		task = new DownloadTask(host, port, user.userName, user.password,
-				user.path, lblNewLabel.getText(), this);
+				downloadFile, lblNewLabel.getText(), this);
 		task.addPropertyChangeListener(this);
 		task.execute();
 		taskrun = true;
@@ -326,9 +321,10 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener
 			progress = (Integer) arg0.getNewValue();
 			progressBar.setValue(progress);
 			if (progress == 100) {
-				continueButton.setEnabled(true);
+				buttonback.setEnabled(true);
 			}
 		}
+
 		if ("speed" == arg0.getPropertyName()) {
 			speed = (double) arg0.getNewValue();
 			// if(speed<=1){
diff --git a/Dozentenmodul/src/GUI/Login_GUI.java b/Dozentenmodul/src/GUI/Login_GUI.java
index 8ad73e20..172895d6 100644
--- a/Dozentenmodul/src/GUI/Login_GUI.java
+++ b/Dozentenmodul/src/GUI/Login_GUI.java
@@ -23,6 +23,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.apache.thrift.protocol.TBinaryProtocol;
@@ -185,7 +187,7 @@ public class Login_GUI extends JFrame {
 			String passText = new String(pass.getPassword());
 			System.out.println(username.getText() + " " + passText);
 			result = client.authenticate(username.getText(), passText);
-
+			
 		} catch (thrift.AuthenticationException e) {
 			System.out.println("Authentifizierung fehlgeschlagen: " + e.message);
 			JOptionPane.showMessageDialog(null,
@@ -227,11 +229,12 @@ public class Login_GUI extends JFrame {
 						setVisible(false);
 					} else {
 						UserInfo user = client.getUserFromToken(token);
-
+						
 						String hochschule = user.eMail.substring(user.eMail
 								.indexOf("@") + 1, user.eMail.indexOf(".",
 								user.eMail.indexOf("@")));
 						// System.out.println("hochschule="+hochschule);
+						
 						person.verantwortlicher.setUsername(username.getText());
 						person.verantwortlicher.setName(user.lastName);
 						person.verantwortlicher.setVorname(user.firstName);
diff --git a/Dozentenmodul/src/GUI/MainMenue_GUI.java b/Dozentenmodul/src/GUI/MainMenue_GUI.java
index 621f6561..e68e4bbd 100644
--- a/Dozentenmodul/src/GUI/MainMenue_GUI.java
+++ b/Dozentenmodul/src/GUI/MainMenue_GUI.java
@@ -355,7 +355,7 @@ public class MainMenue_GUI extends JFrame {
 						+ "Intelligenz\" lauten und referenzieren dabei auf das allgemeine Image <br>"

 						+ "\"Programmieren\".</html>");

 		lblGrafik.setIcon(new ImageIcon(MainMenue_GUI.class

-				.getResource("/gui/Image_zu_Veranstaltung_gr\u00FCn.png")));

+				.getResource("/Image_zu_Veranstaltung_gr\u00FCn.png")));

 		// ToolTipp lange anzeigen - 60sec

 		ToolTipManager.sharedInstance().setDismissDelay(60000);

 		ToolTipManager.sharedInstance().registerComponent(lblGrafik);

diff --git a/Dozentenmodul/src/Models/vm.java b/Dozentenmodul/src/Models/vm.java
deleted file mode 100644
index 34f9ffaa..00000000
--- a/Dozentenmodul/src/Models/vm.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package models;
-
-import java.awt.List;
-import java.util.Date;
-
-
-public class vm {
-
-	private String Laborname;
-	private String shortDesc;
-	private String longDesc;
-	private String comment;
-	private String OS;
-	private Date begin;
-	private Date end;
-	private List software;
-	
-	public static vm vl=new vm();
-	public String getLaborname() {
-		return Laborname;
-	}
-	public void setLaborname(String laborname) {
-		Laborname = laborname;
-	}
-	public String getShortDesc() {
-		return shortDesc;
-	}
-	public void setShortDesc(String shortDesc) {
-		this.shortDesc = shortDesc;
-	}
-	public String getLongDesc() {
-		return longDesc;
-	}
-	public void setLongDesc(String longDesc) {
-		this.longDesc = longDesc;
-	}
-	public String getComment() {
-		return comment;
-	}
-	public void setComment(String comment) {
-		this.comment = comment;
-	}
-	public String getOS() {
-		return OS;
-	}
-	public void setOS(String oS) {
-		OS = oS;
-	}
-	public Date getBegin() {
-		return begin;
-	}
-	public void setBegin(Date begin) {
-		this.begin = begin;
-	}
-	public Date getEnd() {
-		return end;
-	}
-	public void setEnd(Date end) {
-		this.end = end;
-	}
-	public List getSoftware() {
-		return software;
-	}
-	public void setSoftware(List software) {
-		this.software = software;
-	}
-	
-	
-}
diff --git a/Dozentenmodul/src/gui/EditImageAllgemein_GUI.java b/Dozentenmodul/src/gui/EditImageAllgemein_GUI.java
index 34009fc7..1d30e9d0 100644
--- a/Dozentenmodul/src/gui/EditImageAllgemein_GUI.java
+++ b/Dozentenmodul/src/gui/EditImageAllgemein_GUI.java
@@ -67,6 +67,7 @@ public class EditImageAllgemein_GUI extends JFrame {
 			@Override
 			public void windowClosing(WindowEvent arg0) {
 				//Beendet die Anwendung bei einem Klick auf das X
+				con.closeThriftConnection();
 				System.exit(0);
 			}
 		});
@@ -216,6 +217,7 @@ public class EditImageAllgemein_GUI extends JFrame {
 			@Override
 			public void mouseClicked(MouseEvent arg0) {
 				//Durch den Klick auf Button Hauptmenpü wird dieses Fenster unsichtbar und das Hauptmenü sichtbar
+				con.closeThriftConnection();
 				EditImageAllgemein_GUI.this.setVisible(false);
 				MainMenue_GUI main=new MainMenue_GUI();
 				main.setVisible(true);
@@ -254,7 +256,7 @@ public class EditImageAllgemein_GUI extends JFrame {
 						
 						//Setzen der Eingabe im Model, dadurch bleiben die Daten bei einem erneuten Aufruf verfügbar
 						//Image.image.setImagename(imagename.getText());
-
+						con.closeThriftConnection();
 						MainMenue_GUI sr=new MainMenue_GUI();
 						sr.setVisible(true);
 						dispose();
diff --git a/Dozentenmodul/src/gui/EditImageTechnisch_GUI.java b/Dozentenmodul/src/gui/EditImageTechnisch_GUI.java
index e6d78898..3c6109ae 100644
--- a/Dozentenmodul/src/gui/EditImageTechnisch_GUI.java
+++ b/Dozentenmodul/src/gui/EditImageTechnisch_GUI.java
@@ -65,6 +65,7 @@ public class EditImageTechnisch_GUI extends JFrame {
 			@Override
 			public void windowClosing(WindowEvent arg0) {
 				//Beendet die Anwendung bei Klick auf das X 
+				
 				System.exit(0);
 			}
 			
diff --git a/Dozentenmodul/src/gui/FTPDownloader_GUI.java b/Dozentenmodul/src/gui/FTPDownloader_GUI.java
index b36f0818..cb53fc3d 100644
--- a/Dozentenmodul/src/gui/FTPDownloader_GUI.java
+++ b/Dozentenmodul/src/gui/FTPDownloader_GUI.java
@@ -31,6 +31,8 @@ import java.awt.Font;
 import javax.swing.JTextPane;
 import javax.swing.JSeparator;
 
+import models.Image;
+
 import org.apache.thrift.TException;
 
 import server.Server.Client;
@@ -51,7 +53,7 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener
 	int port = 21;
 	String username = "openslx";
 	String password = "openslx-ng";
-	String downloadPath = "";
+	String downloadFile = "";
 	static String arg = "";
 	DownloadTask task;
 	JLabel bytesreadlbl;
@@ -64,7 +66,7 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener
 	boolean taskrun = false;
 	ThriftConnection thrift = new ThriftConnection();
 	Client client = thrift.getThriftConnection();
-	JButton continueButton = new JButton("Fertigstellen");
+	JButton buttonback = new JButton("Zur\u00FCck");
 
 	/**
 	 * Launch the application.
@@ -86,6 +88,7 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener
 				if (taskrun == true) {
 					try {
 						client.DeleteFtpUser(user.userName);
+						thrift.closeThriftConnection();
 					} catch (TException e1) {
 						// TODO Auto-generated catch block
 						e1.printStackTrace();
@@ -108,7 +111,7 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener
 			e.printStackTrace();
 		}
 
-		// filename=name;
+		
 		setBackground(Color.WHITE);
 		setTitle("Dozentenmodul *Prototyp*");
 		Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
@@ -263,8 +266,8 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener
 			buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT));
 			getContentPane().add(buttonPane, BorderLayout.SOUTH);
 			{
-				continueButton.setEnabled(false);
-				continueButton.addActionListener(new ActionListener() {
+				buttonback.setEnabled(false);
+				buttonback.addActionListener(new ActionListener() {
 					public void actionPerformed(ActionEvent e) {
 						if (taskrun == true) {
 							task.cancel(true);
@@ -275,24 +278,14 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener
 								e1.printStackTrace();
 							}
 						}
+						thrift.closeThriftConnection();
+						SearchEditImage_GUI se=new SearchEditImage_GUI();
+						se.setVisible(true);
 						dispose();
 					}
 				});
-
-				JButton cancelButton = new JButton("Zur\u00FCck");
-				cancelButton.addActionListener(new ActionListener() {
-					public void actionPerformed(ActionEvent arg0) {
-
-						dispose();
-						MainMenue_GUI m = new MainMenue_GUI();
-						m.setVisible(true);
-
-					}
-				});
-				cancelButton.setActionCommand("Cancel");
-				buttonPane.add(cancelButton);
-				continueButton.setActionCommand("Cancel");
-				buttonPane.add(continueButton);
+				buttonback.setActionCommand("Cancel");
+				buttonPane.add(buttonback);
 			}
 		}
 		setVisible(true);
@@ -305,14 +298,16 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener
 
 		try {
 			user = client.getFtpUser();
-			// downloadPath=client.getPathOfImage(filename);
+			
+			downloadFile=client.getPathOfImage(Image.image.getImageId(),Image.image.getVersion());
+			
 		} catch (TException e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
 		}
-
+		
 		task = new DownloadTask(host, port, user.userName, user.password,
-				user.path, lblNewLabel.getText(), this);
+				downloadFile, lblNewLabel.getText(), this);
 		task.addPropertyChangeListener(this);
 		task.execute();
 		taskrun = true;
@@ -326,9 +321,10 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener
 			progress = (Integer) arg0.getNewValue();
 			progressBar.setValue(progress);
 			if (progress == 100) {
-				continueButton.setEnabled(true);
+				buttonback.setEnabled(true);
 			}
 		}
+
 		if ("speed" == arg0.getPropertyName()) {
 			speed = (double) arg0.getNewValue();
 			// if(speed<=1){
diff --git a/Dozentenmodul/src/gui/FTPEditUploader_GUI.java b/Dozentenmodul/src/gui/FTPEditUploader_GUI.java
index 9f073993..e7252898 100644
--- a/Dozentenmodul/src/gui/FTPEditUploader_GUI.java
+++ b/Dozentenmodul/src/gui/FTPEditUploader_GUI.java
@@ -15,6 +15,10 @@ import java.awt.event.WindowEvent;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 import java.io.File;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
 import javax.swing.JButton;
 import javax.swing.JFileChooser;
 import javax.swing.JFrame;
@@ -30,6 +34,7 @@ import javax.swing.UIManager;
 import javax.swing.UnsupportedLookAndFeelException;
 import javax.swing.border.EmptyBorder;
 import models.Image;
+import models.person;
 //import models.person;
 
 import org.apache.thrift.TException;
@@ -348,7 +353,11 @@ public class FTPEditUploader_GUI extends JFrame implements PropertyChangeListene
 			// TODO Auto-generated catch block
 			e.printStackTrace();
 		}
-
+        DateFormat formatter = new SimpleDateFormat("yyyMMddhhmmss");
+		Image.image.setNewName(formatter.format(new Date()) + "_"
+				+ person.verantwortlicher.getHochschule() + "_"
+				+ person.verantwortlicher.getUsername() + "_"
+				+ Image.image.getImagename() + ".vmdk");
         task=new UploadTask(host,port,user.userName,user.password,user.path, uploadFile);
       
         task.addPropertyChangeListener(this);
diff --git a/Dozentenmodul/src/gui/Login_GUI.java b/Dozentenmodul/src/gui/Login_GUI.java
index 8ad73e20..172895d6 100644
--- a/Dozentenmodul/src/gui/Login_GUI.java
+++ b/Dozentenmodul/src/gui/Login_GUI.java
@@ -23,6 +23,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.apache.thrift.protocol.TBinaryProtocol;
@@ -185,7 +187,7 @@ public class Login_GUI extends JFrame {
 			String passText = new String(pass.getPassword());
 			System.out.println(username.getText() + " " + passText);
 			result = client.authenticate(username.getText(), passText);
-
+			
 		} catch (thrift.AuthenticationException e) {
 			System.out.println("Authentifizierung fehlgeschlagen: " + e.message);
 			JOptionPane.showMessageDialog(null,
@@ -227,11 +229,12 @@ public class Login_GUI extends JFrame {
 						setVisible(false);
 					} else {
 						UserInfo user = client.getUserFromToken(token);
-
+						
 						String hochschule = user.eMail.substring(user.eMail
 								.indexOf("@") + 1, user.eMail.indexOf(".",
 								user.eMail.indexOf("@")));
 						// System.out.println("hochschule="+hochschule);
+						
 						person.verantwortlicher.setUsername(username.getText());
 						person.verantwortlicher.setName(user.lastName);
 						person.verantwortlicher.setVorname(user.firstName);
diff --git a/Dozentenmodul/src/gui/MainMenue_GUI.java b/Dozentenmodul/src/gui/MainMenue_GUI.java
index 9b10cb3c..11783d60 100644
--- a/Dozentenmodul/src/gui/MainMenue_GUI.java
+++ b/Dozentenmodul/src/gui/MainMenue_GUI.java
@@ -355,7 +355,7 @@ public class MainMenue_GUI extends JFrame {
 						+ "Intelligenz\" lauten und referenzieren dabei auf das allgemeine Image <br>"
 						+ "\"Programmieren\".</html>");
 		lblGrafik.setIcon(new ImageIcon(MainMenue_GUI.class
-				.getResource("/gui/Image_zu_Veranstaltung_gr\u00FCn.png")));
+				.getResource("/Image_zu_Veranstaltung_gr\u00FCn.png")));
 		// ToolTipp lange anzeigen - 60sec
 		ToolTipManager.sharedInstance().setDismissDelay(60000);
 		ToolTipManager.sharedInstance().registerComponent(lblGrafik);
diff --git a/Dozentenmodul/src/gui/SearchEditImage_GUI.java b/Dozentenmodul/src/gui/SearchEditImage_GUI.java
index dbe23115..dbc2562c 100644
--- a/Dozentenmodul/src/gui/SearchEditImage_GUI.java
+++ b/Dozentenmodul/src/gui/SearchEditImage_GUI.java
@@ -25,6 +25,7 @@ import javax.swing.JLabel;
 import javax.swing.JMenu;
 import javax.swing.JMenuBar;
 import javax.swing.JMenuItem;
+import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 import javax.swing.JRadioButton;
 import javax.swing.JScrollPane;
@@ -44,6 +45,7 @@ import javax.swing.table.DefaultTableModel;
 import javax.swing.table.TableModel;
 import javax.swing.table.TableRowSorter;
 import models.Image;
+import models.person;
 //import models.person;
 
 import org.apache.thrift.TException;
@@ -51,6 +53,7 @@ import org.apache.thrift.TException;
 import server.Server.Client;
 import thrift.ThriftConnection;
 
+
 @SuppressWarnings("serial")
 public class SearchEditImage_GUI extends JFrame {
 
@@ -269,14 +272,14 @@ public class SearchEditImage_GUI extends JFrame {
 				System.out.println(tabbedPane.getSelectedIndex());
 				if(tabbedPane.getSelectedIndex()==0){
 					
-					
-					
+					String username= person.verantwortlicher.getName()+" "+person.verantwortlicher.getVorname();
+					//String username="Spitzer Tobias";
+					rowSorterMyImages.setRowFilter(RowFilter.regexFilter(username, 4));
 				}
 				else if(tabbedPane.getSelectedIndex()==1){
-					String username="Spitzer Tobias";
-					rowSorterMyImages.setRowFilter(RowFilter.regexFilter(username, 4));
+
+					
 					
-					//rowSorterMyImages.toggleSortOrder(0);	
 				}
 				
 			}
@@ -284,17 +287,7 @@ public class SearchEditImage_GUI extends JFrame {
 
 		tabbedPane.setBounds(10, 197, 557, 300);
 		contentPanel.add(tabbedPane);
-		
-		JScrollPane scrollPaneMyImage = new JScrollPane();
-		tablemyImages=new JTable();
-		tablemyImages.setModel(modelMyImages);
-		tablemyImages.getColumnModel().getColumn(1).sizeWidthToFit();
-		tablemyImages.getColumnModel().getColumn(2).sizeWidthToFit();
-		tablemyImages.getColumnModel().getColumn(3).sizeWidthToFit();
-		tablemyImages.getColumnModel().getColumn(4).sizeWidthToFit();
-		tablemyImages.getColumnModel().getColumn(5).sizeWidthToFit();
 		initTableModel(modelMyImages);
-		tablemyImages.setRowSorter(rowSorterMyImages);
 		
 		JScrollPane scrollPaneAllImages = new JScrollPane();
 		tableAllImages=new JTable();
@@ -305,13 +298,23 @@ public class SearchEditImage_GUI extends JFrame {
 		tableAllImages.getColumnModel().getColumn(4).sizeWidthToFit();
 		tableAllImages.getColumnModel().getColumn(5).sizeWidthToFit();
 		initTableModel(modelAll);
+		
+		JScrollPane scrollPaneMyImage = new JScrollPane();
+		tablemyImages=new JTable();
+		tablemyImages.setModel(modelMyImages);
+		tablemyImages.getColumnModel().getColumn(1).sizeWidthToFit();
+		tablemyImages.getColumnModel().getColumn(2).sizeWidthToFit();
+		tablemyImages.getColumnModel().getColumn(3).sizeWidthToFit();
+		tablemyImages.getColumnModel().getColumn(4).sizeWidthToFit();
+		tablemyImages.getColumnModel().getColumn(5).sizeWidthToFit();
+		tablemyImages.setRowSorter(rowSorterMyImages);
+		
+				scrollPaneMyImage.setViewportView(tablemyImages);
+				tabbedPane.addTab("Meine Images", null, scrollPaneMyImage, null);
 		tableAllImages.setRowSorter(rowSorterAll);
 		
 				scrollPaneAllImages.setViewportView(tableAllImages);
 				tabbedPane.addTab("Alle", null, scrollPaneAllImages, null);
-
-		scrollPaneMyImage.setViewportView(tablemyImages);
-		tabbedPane.addTab("Meine Images", null, scrollPaneMyImage, null);
 		
 		JScrollPane scrollPaneCoopImages = new JScrollPane();
 		JTable tableCoopImages=new JTable();
@@ -359,10 +362,27 @@ public class SearchEditImage_GUI extends JFrame {
 		btnDownload.addActionListener(new ActionListener() {
 			public void actionPerformed(ActionEvent arg0) {
 				//Öffnet den Downloader
-				con.closeThriftConnection();
-				FTPDownloader_GUI down=new FTPDownloader_GUI();
-				down.setVisible(true);
-				SearchEditImage_GUI.this.setVisible(false);
+				
+				if(tablemyImages.getSelectedRow()!=-1)
+				{
+					String imageid=modelMyImages.getValueAt(tablemyImages.convertRowIndexToModel(tablemyImages.getSelectedRow()), 7).toString();
+					
+					Image.image.setImageId(imageid);
+					String imageversion=modelMyImages.getValueAt(tablemyImages.convertRowIndexToModel(tablemyImages.getSelectedRow()), 8).toString();
+					
+					Image.image.setVersion(imageversion);
+					SearchEditImage_GUI.this.setVisible(false);
+					FTPDownloader_GUI down=new FTPDownloader_GUI();
+					down.setVisible(true);
+					con.closeThriftConnection();
+					
+					
+					
+				}
+				else{
+					JOptionPane.showMessageDialog(null, "Bitte wählen Sie ein Image für den Download aus", "Message",
+							JOptionPane.INFORMATION_MESSAGE);
+				}
 			}
 		});
 		btnDownload.setBounds(449, 508, 118, 23);
@@ -395,7 +415,7 @@ public class SearchEditImage_GUI extends JFrame {
 						con.closeThriftConnection();
 						
 						//Image.image.setImageId(imageid);
-						
+						if(tabbedPane.getSelectedIndex()==0){
 						String imageid=modelMyImages.getValueAt(tablemyImages.convertRowIndexToModel(tablemyImages.getSelectedRow()), 7).toString();
 						
 						Image.image.setImageId(imageid);
@@ -405,7 +425,12 @@ public class SearchEditImage_GUI extends JFrame {
 						con.closeThriftConnection();
 						EditImageAllgemein_GUI ea=new EditImageAllgemein_GUI();
 						ea.setVisible(true);
-						dispose();						
+						dispose();		
+						}
+						else{
+							JOptionPane.showMessageDialog(null, "Bitte wählen Sie ein eigenes Image aus", "Message",
+									JOptionPane.INFORMATION_MESSAGE);
+						}
 					}
 				});
 				cancelButton.setActionCommand("Cancel");
diff --git a/Dozentenmodul/src/models/SessionData.java b/Dozentenmodul/src/models/SessionData.java
new file mode 100644
index 00000000..3b91e1a2
--- /dev/null
+++ b/Dozentenmodul/src/models/SessionData.java
@@ -0,0 +1,28 @@
+package models;
+
+public class SessionData {
+	private String sessionID;
+	private String authToken;
+	private String serverAdress;
+	public static SessionData session =new SessionData();
+	public String getSessionID() {
+		return sessionID;
+	}
+	public void setSessionID(String sessionID) {
+		this.sessionID = sessionID;
+	}
+	public String getAuthToken() {
+		return authToken;
+	}
+	public void setAuthToken(String authToken) {
+		this.authToken = authToken;
+	}
+	public String getServerAdress() {
+		return serverAdress;
+	}
+	public void setServerAdress(String serverAdress) {
+		this.serverAdress = serverAdress;
+	}
+	
+	
+}
diff --git a/Dozentenmodul/src/models/vm.java b/Dozentenmodul/src/models/vm.java
deleted file mode 100644
index 34f9ffaa..00000000
--- a/Dozentenmodul/src/models/vm.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package models;
-
-import java.awt.List;
-import java.util.Date;
-
-
-public class vm {
-
-	private String Laborname;
-	private String shortDesc;
-	private String longDesc;
-	private String comment;
-	private String OS;
-	private Date begin;
-	private Date end;
-	private List software;
-	
-	public static vm vl=new vm();
-	public String getLaborname() {
-		return Laborname;
-	}
-	public void setLaborname(String laborname) {
-		Laborname = laborname;
-	}
-	public String getShortDesc() {
-		return shortDesc;
-	}
-	public void setShortDesc(String shortDesc) {
-		this.shortDesc = shortDesc;
-	}
-	public String getLongDesc() {
-		return longDesc;
-	}
-	public void setLongDesc(String longDesc) {
-		this.longDesc = longDesc;
-	}
-	public String getComment() {
-		return comment;
-	}
-	public void setComment(String comment) {
-		this.comment = comment;
-	}
-	public String getOS() {
-		return OS;
-	}
-	public void setOS(String oS) {
-		OS = oS;
-	}
-	public Date getBegin() {
-		return begin;
-	}
-	public void setBegin(Date begin) {
-		this.begin = begin;
-	}
-	public Date getEnd() {
-		return end;
-	}
-	public void setEnd(Date end) {
-		this.end = end;
-	}
-	public List getSoftware() {
-		return software;
-	}
-	public void setSoftware(List software) {
-		this.software = software;
-	}
-	
-	
-}