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

Conflicts:
	 Dozentenmodul/bin/GUI/MainMenue_GUI$1.class
	Dozentenmodul/bin/GUI/MainMenue_GUI$2.class
	Dozentenmodul/bin/GUI/MainMenue_GUI$3.class
	Dozentenmodul/bin/GUI/MainMenue_GUI.class
	Dozentenmodul/bin/gui/DeleteImage_GUI$1.class
	Dozentenmodul/bin/gui/DeleteImage_GUI$3.class
	Dozentenmodul/bin/gui/DeleteImage_GUI$5.class
	Dozentenmodul/bin/gui/DeleteImage_GUI$7.class
	Dozentenmodul/bin/gui/DeleteImage_GUI$8.class
	Dozentenmodul/bin/gui/image/DeleteImage_GUI$2.class
	Dozentenmodul/bin/gui/image/DeleteImage_GUI$4.class
	Dozentenmodul/bin/gui/image/DeleteImage_GUI$6.class
	Dozentenmodul/bin/gui/image/DeleteImage_GUI.class
	Dozentenmodul/bin/gui/intro/MainMenue_GUI.class
	Dozentenmodul/src/GUI/MainMenue_GUI.java
	Dozentenmodul/src/gui/image/DeleteImage_GUI.java
	Dozentenmodulserver/bin/server/BinaryListener.class
	Dozentenmodulserver/bin/server/Server$AsyncClient$DeleteFtpUser_call.class
	Dozentenmodulserver/bin/server/Server$AsyncClient$Factory.class
	Dozentenmodulserver/bin/server/Server$AsyncClient$getAllOS_call.class
	Dozentenmodulserver/bin/server/Server$AsyncClient$getFtpUser_call.class
	Dozentenmodulserver/bin/server/Server$AsyncClient$getImageData_call.class
	Dozentenmodulserver/bin/server/Server$AsyncClient$getImageList_call.class
	Dozentenmodulserver/bin/server/Server$AsyncClient$getLectureData_call.class
	Dozentenmodulserver/bin/server/Server$AsyncClient$getLectureList_call.class
	Dozentenmodulserver/bin/server/Server$AsyncClient$getPathOfImage_call.class
	Dozentenmodulserver/bin/server/Server$AsyncClient$getPersonData_call.class
	Dozentenmodulserver/bin/server/Server$AsyncClient$startFileCopy_call.class
	Dozentenmodulserver/bin/server/Server$AsyncClient$updateImageData_call.class
	Dozentenmodulserver/bin/server/Server$AsyncClient$writeLecturedata_call.class
	Dozentenmodulserver/bin/server/Server$AsyncClient$writeVLdata_call.class
	Dozentenmodulserver/bin/server/Server$AsyncClient.class
	Dozentenmodulserver/bin/server/Server$AsyncIface.class
	Dozentenmodulserver/bin/server/Server$AsyncProcessor$DeleteFtpUser$1.class
	Dozentenmodulserver/bin/server/Server$AsyncProcessor$DeleteFtpUser.class
	Dozentenmodulserver/bin/server/Server$AsyncProcessor$getAllOS$1.class
	Dozentenmodulserver/bin/server/Server$AsyncProcessor$getAllOS.class
	Dozentenmodulserver/bin/server/Server$AsyncProcessor$getFtpUser$1.class
	Dozentenmodulserver/bin/server/Server$AsyncProcessor$getFtpUser.class
	Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageData$1.class
	Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageData.class
	Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageList$1.class
	Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageList.class
	Dozentenmodulserver/bin/server/Server$AsyncProcessor$getLectureData$1.class
	Dozentenmodulserver/bin/server/Server$AsyncProcessor$getLectureData.class
	Dozentenmodulserver/bin/server/Server$AsyncProcessor$getLectureList$1.class
	Dozentenmodulserver/bin/server/Server$AsyncProcessor$getLectureList.class
	Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPathOfImage$1.class
	Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPathOfImage.class
	Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPersonData$1.class
	Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPersonData.class
	Dozentenmodulserver/bin/server/Server$AsyncProcessor$startFileCopy$1.class
	Dozentenmodulserver/bin/server/Server$AsyncProcessor$startFileCopy.class
	Dozentenmodulserver/bin/server/Server$AsyncProcessor$updateImageData$1.class
	Dozentenmodulserver/bin/server/Server$AsyncProcessor$updateImageData.class
	Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeLecturedata$1.class
	Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeLecturedata.class
	Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeVLdata$1.class
	Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeVLdata.class
	Dozentenmodulserver/bin/server/Server$AsyncProcessor.class
	Dozentenmodulserver/bin/server/Server$Client$Factory.class
	Dozentenmodulserver/bin/server/Server$Client.class
	Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsStandardScheme.class
	Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsStandardSchemeFactory.class
	Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsTupleScheme.class
	Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsTupleSchemeFactory.class
	Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$_Fields.class
	Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args.class
	Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultStandardScheme.class
	Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultStandardSchemeFactory.class
	Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultTupleScheme.class
	Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultTupleSchemeFactory.class
	Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$_Fields.class
	Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result.class
	Dozentenmodulserver/bin/server/Server$Iface.class
	Dozentenmodulserver/bin/server/Server$Processor$DeleteFtpUser.class
	Dozentenmodulserver/bin/server/Server$Processor$getAllOS.class
	Dozentenmodulserver/bin/server/Server$Processor$getFtpUser.class
	Dozentenmodulserver/bin/server/Server$Processor$getImageData.class
	Dozentenmodulserver/bin/server/Server$Processor$getImageList.class
	Dozentenmodulserver/bin/server/Server$Processor$getLectureData.class
	Dozentenmodulserver/bin/server/Server$Processor$getLectureList.class
	Dozentenmodulserver/bin/server/Server$Processor$getPathOfImage.class
	Dozentenmodulserver/bin/server/Server$Processor$getPersonData.class
	Dozentenmodulserver/bin/server/Server$Processor$startFileCopy.class
	Dozentenmodulserver/bin/server/Server$Processor$updateImageData.class
	Dozentenmodulserver/bin/server/Server$Processor$writeLecturedata.class
	Dozentenmodulserver/bin/server/Server$Processor$writeVLdata.class
	Dozentenmodulserver/bin/server/Server$Processor.class
	Dozentenmodulserver/bin/server/Server$getAllOS_args$_Fields.class
	Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsStandardScheme.class
	Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsStandardSchemeFactory.class
	Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsTupleScheme.class
	Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsTupleSchemeFactory.class
	Dozentenmodulserver/bin/server/Server$getAllOS_args.class
	Dozentenmodulserver/bin/server/Server$getAllOS_result$_Fields.class
	Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultStandardScheme.class
	Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultStandardSchemeFactory.class
	Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultTupleScheme.class
	Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultTupleSchemeFactory.class
	Dozentenmodulserver/bin/server/Server$getAllOS_result.class
	Dozentenmodulserver/bin/server/Server$getFtpUser_args$_Fields.class
	Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsStandardScheme.class
	Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsStandardSchemeFactory.class
	Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsTupleScheme.class
	Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsTupleSchemeFactory.class
	Dozentenmodulserver/bin/server/Server$getFtpUser_args.class
	Dozentenmodulserver/bin/server/Server$getFtpUser_result$_Fields.class
	Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultStandardScheme.class
	Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultStandardSchemeFactory.class
	Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultTupleScheme.class
	Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultTupleSchemeFactory.class
	Dozentenmodulserver/bin/server/Server$getFtpUser_result.class
	Dozentenmodulserver/bin/server/Server$getImageData_args$_Fields.class
	Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsStandardScheme.class
	Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsStandardSchemeFactory.class
	Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsTupleScheme.class
	Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsTupleSchemeFactory.class
	Dozentenmodulserver/bin/server/Server$getImageData_args.class
	Dozentenmodulserver/bin/server/Server$getImageData_result$_Fields.class
	Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultStandardScheme.class
	Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultStandardSchemeFactory.class
	Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultTupleScheme.class
	Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultTupleSchemeFactory.class
	Dozentenmodulserver/bin/server/Server$getImageData_result.class
	Dozentenmodulserver/bin/server/Server$getImageList_args$_Fields.class
	Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsStandardScheme.class
	Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsStandardSchemeFactory.class
	Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsTupleScheme.class
	Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsTupleSchemeFactory.class
	Dozentenmodulserver/bin/server/Server$getImageList_args.class
	Dozentenmodulserver/bin/server/Server$getImageList_result$_Fields.class
	Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultStandardScheme.class
	Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultStandardSchemeFactory.class
	Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultTupleScheme.class
	Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultTupleSchemeFactory.class
	Dozentenmodulserver/bin/server/Server$getImageList_result.class
	Dozentenmodulserver/bin/server/Server$getLectureData_args$_Fields.class
	Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsStandardScheme.class
	Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsStandardSchemeFactory.class
	Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsTupleScheme.class
	Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsTupleSchemeFactory.class
	Dozentenmodulserver/bin/server/Server$getLectureData_args.class
	Dozentenmodulserver/bin/server/Server$getLectureData_result$_Fields.class
	Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultStandardScheme.class
	Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultStandardSchemeFactory.class
	Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultTupleScheme.class
	Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultTupleSchemeFactory.class
	Dozentenmodulserver/bin/server/Server$getLectureData_result.class
	Dozentenmodulserver/bin/server/Server$getLectureList_args$_Fields.class
	Dozentenmodulserver/bin/server/Server$getLectureList_args$getLectureList_argsStandardScheme.class
	Dozentenmodulserver/bin/server/Server$getLectureList_args$getLectureList_argsStandardSchemeFactory.class
	Dozentenmodulserver/bin/server/Server$getLectureList_args$getLectureList_argsTupleScheme.class
	Dozentenmodulserver/bin/server/Server$getLectureList_args$getLectureList_argsTupleSchemeFactory.class
	Dozentenmodulserver/bin/server/Server$getLectureList_args.class
	Dozentenmodulserver/bin/server/Server$getLectureList_result$_Fields.class
	Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultStandardScheme.class
	Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultStandardSchemeFactory.class
	Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultTupleScheme.class
	Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultTupleSchemeFactory.class
	Dozentenmodulserver/bin/server/Server$getLectureList_result.class
	Dozentenmodulserver/bin/server/Server$getPathOfImage_args$_Fields.class
	Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsStandardScheme.class
	Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsStandardSchemeFactory.class
	Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsTupleScheme.class
	Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsTupleSchemeFactory.class
	Dozentenmodulserver/bin/server/Server$getPathOfImage_args.class
	Dozentenmodulserver/bin/server/Server$getPathOfImage_result$_Fields.class
	Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultStandardScheme.class
	Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultStandardSchemeFactory.class
	Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultTupleScheme.class
	Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultTupleSchemeFactory.class
	Dozentenmodulserver/bin/server/Server$getPathOfImage_result.class
	Dozentenmodulserver/bin/server/Server$getPersonData_args$_Fields.class
	Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsStandardScheme.class
	Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsStandardSchemeFactory.class
	Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsTupleScheme.class
	Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsTupleSchemeFactory.class
	Dozentenmodulserver/bin/server/Server$getPersonData_args.class
	Dozentenmodulserver/bin/server/Server$getPersonData_result$_Fields.class
	Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultStandardScheme.class
	Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultStandardSchemeFactory.class
	Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultTupleScheme.class
	Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultTupleSchemeFactory.class
	Dozentenmodulserver/bin/server/Server$getPersonData_result.class
	Dozentenmodulserver/bin/server/Server$startFileCopy_args$_Fields.class
	Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsStandardScheme.class
	Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsStandardSchemeFactory.class
	Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsTupleScheme.class
	Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsTupleSchemeFactory.class
	Dozentenmodulserver/bin/server/Server$startFileCopy_args.class
	Dozentenmodulserver/bin/server/Server$startFileCopy_result$_Fields.class
	Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultStandardScheme.class
	Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultStandardSchemeFactory.class
	Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultTupleScheme.class
	Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultTupleSchemeFactory.class
	Dozentenmodulserver/bin/server/Server$startFileCopy_result.class
	Dozentenmodulserver/bin/server/Server$updateImageData_args$_Fields.class
	Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsStandardScheme.class
	Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsStandardSchemeFactory.class
	Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsTupleScheme.class
	Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsTupleSchemeFactory.class
	Dozentenmodulserver/bin/server/Server$updateImageData_args.class
	Dozentenmodulserver/bin/server/Server$updateImageData_result$_Fields.class
	Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultStandardScheme.class
	Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultStandardSchemeFactory.class
	Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultTupleScheme.class
	Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultTupleSchemeFactory.class
	Dozentenmodulserver/bin/server/Server$updateImageData_result.class
	Dozentenmodulserver/bin/server/Server$writeLecturedata_args$_Fields.class
	Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsStandardScheme.class
	Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsStandardSchemeFactory.class
	Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsTupleScheme.class
	Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsTupleSchemeFactory.class
	Dozentenmodulserver/bin/server/Server$writeLecturedata_args.class
	Dozentenmodulserver/bin/server/Server$writeLecturedata_result$_Fields.class
	Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultStandardScheme.class
	Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultStandardSchemeFactory.class
	Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultTupleScheme.class
	Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultTupleSchemeFactory.class
	Dozentenmodulserver/bin/server/Server$writeLecturedata_result.class
	Dozentenmodulserver/bin/server/Server$writeVLdata_args$_Fields.class
	Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsStandardScheme.class
	Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsStandardSchemeFactory.class
	Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsTupleScheme.class
	Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsTupleSchemeFactory.class
	Dozentenmodulserver/bin/server/Server$writeVLdata_args.class
	Dozentenmodulserver/bin/server/Server$writeVLdata_result$_Fields.class
	Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultStandardScheme.class
	Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultStandardSchemeFactory.class
	Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultTupleScheme.class
	Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultTupleSchemeFactory.class
	Dozentenmodulserver/bin/server/Server$writeVLdata_result.class
	Dozentenmodulserver/bin/server/Server.class
	Dozentenmodulserver/bin/server/ServerHandler.class
	Dozentenmodulserver/bin/server/startServer.class
	Dozentenmodulserver/bin/sql/SQL.class
	Dozentenmodulserver/src/server/Server.java
	Dozentenmodulserver/src/server/ServerHandler.java
	Dozentenmodulserver/src/sql/SQL.java
	Dozentenmodulserver/thrift/server.thrift

39 files changed, 1509 insertions, 6476 deletions

diff --git a/Dozentenmodul/src/GUI/EingabeImageAllgemein_GUI.java b/Dozentenmodul/src/GUI/EingabeImageAllgemein_GUI.java
deleted file mode 100644
index da4f6997..00000000
--- a/Dozentenmodul/src/GUI/EingabeImageAllgemein_GUI.java
+++ /dev/null
@@ -1,302 +0,0 @@
-package gui;
-
-
-import java.awt.Dimension;
-import java.awt.FlowLayout;
-import java.awt.Toolkit;
-import javax.swing.JFrame;
-import javax.swing.JButton;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
-import javax.swing.UIManager;
-import javax.swing.UnsupportedLookAndFeelException;
-import javax.swing.border.EmptyBorder;
-import java.awt.Color;
-import javax.swing.JLabel;
-import java.awt.Font;
-import javax.swing.JTextPane;
-import java.awt.SystemColor;
-import javax.swing.JTextField;
-import java.awt.event.ActionListener;
-import java.awt.event.ActionEvent;
-import javax.swing.JSeparator;
-import javax.swing.JMenuBar;
-import javax.swing.JMenu;
-import javax.swing.JMenuItem;
-
-import java.awt.event.WindowAdapter;
-import java.awt.event.WindowEvent;
-import javax.swing.border.TitledBorder;
-import javax.swing.JTextArea;
-
-import models.Image;
-import models.person;
-
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-
-@SuppressWarnings("serial")
-public class EingabeImageAllgemein_GUI extends JFrame {
-
-	private final JPanel contentPanel = new JPanel();
-	String[] result;
-	private JTextField Vorname;
-	private JTextField Nachname;
-	private JTextField Hochschule;
-	private JTextField EMail;
-	private JTextField imagename;
-
-	/**
-	 * Create the dialog.
-	 */
-	public EingabeImageAllgemein_GUI() {
-		addWindowListener(new WindowAdapter() {
-			@Override
-			public void windowClosing(WindowEvent arg0) {
-				//Beendet das Fenster auf X
-				System.exit(0);
-			}
-			@Override
-			public void windowOpened(WindowEvent arg0) {
-				imagename.requestFocusInWindow();
-			}
-		});
-		//Verhindert das Vergrößern des Fensters
-		setResizable(false);
-		
-		try {
-			//setzt das Look & Feel
-			UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
-		} catch (ClassNotFoundException | InstantiationException
-				| IllegalAccessException | UnsupportedLookAndFeelException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		//Setzt den Titel
-		setTitle("bwLehrpool Suite *Prototyp*");
-		//Zentriert das Fenster
-		Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
-		int top=(screenSize.height - 722) / 2;
-		int left=(screenSize.width - 603) / 2;
-		setBounds(left, top, 603, 722);
-
-		getContentPane().setLayout(null);
-		{
-			JPanel panel = new JPanel();
-			panel.setBackground(SystemColor.menu);
-			panel.setBounds(10, 11, 577, 57);
-			getContentPane().add(panel);
-			panel.setLayout(null);
-			{
-				JLabel lblNewLabel = new JLabel("Eingabe Ihrer Daten");
-				lblNewLabel.setBounds(10, 11, 509, 22);
-				panel.add(lblNewLabel);
-				lblNewLabel.setFont(new Font("Tahoma", Font.BOLD, 18));
-			}
-			
-			JTextPane txtpnBitteWhlenSie = new JTextPane();
-			txtpnBitteWhlenSie.setEditable(false);
-			txtpnBitteWhlenSie.setBackground(SystemColor.menu);
-			txtpnBitteWhlenSie.setText("Geben Sie hier bitte einen sprechenden Imagename sowie Ihre Kontaktdaten an");
-			txtpnBitteWhlenSie.setBounds(10, 36, 509, 32);
-			panel.add(txtpnBitteWhlenSie);
-		}
-		contentPanel.setBounds(10, 85, 577, 493);
-		contentPanel.setBackground(SystemColor.menu);
-		contentPanel.setBorder(new EmptyBorder(5, 5, 5, 5));
-		getContentPane().add(contentPanel);
-		contentPanel.setLayout(null);
-		
-		JPanel panel_1 = new JPanel();
-		panel_1.setBackground(SystemColor.menu);
-		panel_1.setBorder(new TitledBorder(null, "Informationen zum Besitzer", TitledBorder.LEADING, TitledBorder.TOP, null, null));
-		panel_1.setBounds(10, 66, 557, 369);
-		contentPanel.add(panel_1);
-		panel_1.setLayout(null);
-		
-		JLabel label = new JLabel("Vorname: *");
-		label.setBackground(SystemColor.menu);
-		label.setBounds(10, 245, 125, 20);
-		panel_1.add(label);
-		
-		Vorname = new JTextField();
-		Vorname.setEnabled(false);
-		Vorname.setEditable(false);
-		Vorname.setBackground(Color.WHITE);
-		Vorname.setText(person.verantwortlicher.getVorname());
-		Vorname.setColumns(10);
-		Vorname.setBounds(145, 245, 350, 20);
-		panel_1.add(Vorname);
-		
-		JLabel label_7 = new JLabel("Nachname: *");
-		label_7.setBackground(SystemColor.menu);
-		label_7.setBounds(10, 276, 125, 20);
-		panel_1.add(label_7);
-		
-		Nachname = new JTextField();
-		Nachname.setEnabled(false);
-		Nachname.setEditable(false);
-		Nachname.setBackground(Color.WHITE);
-		Nachname.setText(person.verantwortlicher.getName());
-		Nachname.setColumns(10);
-		Nachname.setBounds(145, 276, 350, 20);
-		panel_1.add(Nachname);
-		
-		JLabel label_8 = new JLabel("Hochschule: *");
-		label_8.setBackground(SystemColor.menu);
-		label_8.setBounds(10, 307, 125, 20);
-		panel_1.add(label_8);
-		
-		Hochschule = new JTextField();
-		Hochschule.setEnabled(false);
-		Hochschule.setEditable(false);
-		Hochschule.setBackground(Color.WHITE);
-		Hochschule.setText(person.verantwortlicher.getHochschule());
-		Hochschule.setColumns(10);
-		Hochschule.setBounds(145, 307, 350, 20);
-		panel_1.add(Hochschule);
-		
-		JLabel label_9 = new JLabel("E-Mail: *");
-		label_9.setBackground(SystemColor.menu);
-		label_9.setBounds(10, 338, 125, 20);
-		panel_1.add(label_9);
-		
-		EMail = new JTextField();
-		EMail.setEnabled(false);
-		EMail.setEditable(false);
-		EMail.setBackground(Color.WHITE);
-		EMail.setText(person.verantwortlicher.getEMail());
-		EMail.setColumns(10);
-		EMail.setBounds(145, 338, 350, 20);
-		panel_1.add(EMail);
-		
-		JLabel lblImagename = new JLabel("Imagename: *");
-		lblImagename.setBackground(SystemColor.menu);
-		lblImagename.setBounds(10, 31, 125, 20);
-		panel_1.add(lblImagename);
-		
-		
-		imagename = new JTextField();
-		imagename.setBackground(Color.WHITE);
-		imagename.setText((String) null);
-		imagename.setColumns(10);
-		imagename.setBounds(145, 31, 350, 20);
-		imagename.setText(Image.image.getImagename()); //null am Anfang, aber speichert die Eingabe, wenn man zurück kommt zur Seite
-		panel_1.add(imagename);
-		
-		JTextArea txtrGebenSieBitte = new JTextArea();
-		txtrGebenSieBitte.setEditable(false);
-		txtrGebenSieBitte.setBackground(SystemColor.menu);
-		txtrGebenSieBitte.setLineWrap(true);
-		txtrGebenSieBitte.setFont(new Font("Tahoma", Font.PLAIN, 12));
-		txtrGebenSieBitte.setText("Geben Sie bitte einen sprechenden Namen f\u00FCr das Image an.\r\nDieser soll jedoch recht allgemein gehalten werden.\r\nBeispiel: \"Programmieren\", nicht \"Programmieren 1\"");
-		txtrGebenSieBitte.setBounds(145, 62, 350, 110);
-		panel_1.add(txtrGebenSieBitte);
-		
-		JPanel panel = new JPanel();
-		panel.setBounds(10, 402, 577, 33);
-		contentPanel.add(panel);
-		panel.setLayout(null);
-		panel.setBorder(new EmptyBorder(5, 5, 5, 5));
-		panel.setBackground(SystemColor.menu);
-		
-		JLabel lblPflichtfelder = new JLabel("* Pflichtfelder");
-		lblPflichtfelder.setBounds(10, 442, 136, 14);
-		contentPanel.add(lblPflichtfelder);
-		
-		JLabel lblHauptmen = new JLabel("Hauptmen\u00FC");
-		lblHauptmen.addMouseListener(new MouseAdapter() {
-			@Override
-			public void mouseClicked(MouseEvent arg0) {
-				//Öffnet das Hauptmenü
-				EingabeImageAllgemein_GUI.this.setVisible(false);
-				MainMenue_GUI main=new MainMenue_GUI();
-				main.setVisible(true);
-			}
-		});
-		lblHauptmen.setForeground(Color.BLUE);
-		lblHauptmen.setBounds(10, 11, 61, 14);
-		contentPanel.add(lblHauptmen);
-		
-		JLabel label_1 = new JLabel(">");
-		label_1.setBounds(69, 11, 13, 14);
-		contentPanel.add(label_1);
-		
-		JLabel lblVlimage = new JLabel("VL-Image");
-		lblVlimage.setForeground(Color.BLUE);
-		lblVlimage.setBounds(81, 11, 45, 14);
-		contentPanel.add(lblVlimage);
-		
-		JLabel label_2 = new JLabel(">");
-		label_2.setBounds(133, 11, 13, 14);
-		contentPanel.add(label_2);
-		
-		JLabel lblNewLabel_1 = new JLabel("Neu");
-		lblNewLabel_1.setBounds(146, 11, 46, 14);
-		contentPanel.add(lblNewLabel_1);
-		{
-			JPanel buttonPane = new JPanel();
-			buttonPane.setBounds(0, 640, 597, 33);
-			buttonPane.setBackground(SystemColor.menu);
-			buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT));
-			getContentPane().add(buttonPane);
-			{
-				JButton backButton = new JButton("Zur\u00FCck");
-				backButton.addActionListener(new ActionListener() {
-					public void actionPerformed(ActionEvent e) {
-						Image.image.setImagename(imagename.getText());
-						MainMenue_GUI sr=new MainMenue_GUI();
-						sr.setVisible(true);
-						dispose();
-					}
-				});
-				backButton.setActionCommand("Cancel");
-				buttonPane.add(backButton);
-			}
-			{
-				JButton continueButton = new JButton("Weiter");
-				continueButton.addActionListener(new ActionListener() {
-					public void actionPerformed(ActionEvent e) {
-						//Prüft die Eingabe
-						if(imagename.getText().isEmpty()==false && Vorname.getText().isEmpty()==false && Nachname.getText().isEmpty()==false && Hochschule.getText().isEmpty()==false&&EMail.getText().isEmpty()==false)
-						{
-						//Schreibt die Daten in das Model
-						Image.image.setImagename(imagename.getText());
-						EingabeImageTechnisch_GUI ea=new EingabeImageTechnisch_GUI();
-						ea.setVisible(true);
-						dispose();
-						}
-						else{
-							JOptionPane.showMessageDialog(null, "Bitte geben Sie alle notwendigen Daten an!",
-									"Error", JOptionPane.ERROR_MESSAGE);	
-						}
-					}
-				});
-				continueButton.setActionCommand("OK");
-				buttonPane.add(continueButton);
-				getRootPane().setDefaultButton(continueButton);
-			}
-		}
-		
-		JSeparator separator = new JSeparator();
-		separator.setBounds(0, 78, 597, 2);
-		getContentPane().add(separator);
-		
-		JSeparator separator_1 = new JSeparator();
-		separator_1.setBounds(0, 627, 597, 2);
-		getContentPane().add(separator_1);
-		
-		JMenuBar menuBar = new JMenuBar();
-		setJMenuBar(menuBar);
-		
-		JMenu mnNewMenu_1 = new JMenu("Hilfe");
-		menuBar.add(mnNewMenu_1);
-		
-		JMenuItem mntmFaq = new JMenuItem("FAQ");
-		mnNewMenu_1.add(mntmFaq);
-		
-		JMenuItem mntmOtrs = new JMenuItem("OTRS");
-		mnNewMenu_1.add(mntmOtrs);
-		
-	}//end main
-}
diff --git a/Dozentenmodul/src/GUI/EingabeImageTechnisch_GUI.java b/Dozentenmodul/src/GUI/EingabeImageTechnisch_GUI.java
deleted file mode 100644
index f31f811d..00000000
--- a/Dozentenmodul/src/GUI/EingabeImageTechnisch_GUI.java
+++ /dev/null
@@ -1,364 +0,0 @@
-package gui;

-

-

-import java.awt.Dimension;

-import java.awt.FlowLayout;

-import java.awt.Toolkit;

-import javax.swing.JFrame;

-import javax.swing.JButton;

-import javax.swing.JDialog;

-import javax.swing.JPanel;

-import javax.swing.UIManager;

-import javax.swing.UnsupportedLookAndFeelException;

-import javax.swing.border.EmptyBorder;

-import java.awt.Color;

-import javax.swing.JLabel;

-import java.awt.Font;

-import javax.swing.JTextPane;

-import java.awt.SystemColor;

-import java.awt.event.ActionListener;

-import java.awt.event.ActionEvent;

-import javax.swing.JSeparator;

-import javax.swing.JMenuBar;

-import javax.swing.JMenu;

-import javax.swing.JMenuItem;

-import java.awt.event.WindowAdapter;

-import java.awt.event.WindowEvent;

-import javax.swing.border.TitledBorder;

-import javax.swing.JTextArea;

-import java.awt.event.MouseAdapter;

-import java.awt.event.MouseEvent;

-import javax.swing.JRadioButton;

-import javax.swing.ButtonGroup;

-import javax.swing.JSpinner;

-import javax.swing.SpinnerNumberModel;

-

-import models.Image;

-

-@SuppressWarnings("serial")

-public class EingabeImageTechnisch_GUI extends JFrame {

-

-	private final JPanel contentPanel = new JPanel();

-	String[] result;

-	JSpinner spinnerCPU;

-	JSpinner spinnerRam;

-	JRadioButton rdbtnlicenseJa;

-	JRadioButton rdbtnlicenseNein;

-	JRadioButton rdbtnInternetJa;

-	JRadioButton rdbtnInternetNein;

-	private final ButtonGroup buttonGrouplicense = new ButtonGroup();

-	private final ButtonGroup buttonGroupInternet = new ButtonGroup();

-	/**

-	 * Launch the application.

-	 */

-	public static void main(String[] args) {

-		try {

-			EingabeImageTechnisch_GUI dialog = new EingabeImageTechnisch_GUI();

-			dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);

-			dialog.setVisible(true);

-		} catch (Exception e) {

-			e.printStackTrace();

-		}

-	}

-

-	/**

-	 * Create the dialog.

-	 */

-	public EingabeImageTechnisch_GUI() {

-		addWindowListener(new WindowAdapter() {

-			@Override

-			public void windowClosing(WindowEvent arg0) {

-				System.exit(0);

-			}

-		});

-		setResizable(false);

-		

-		try {

-			UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());

-		} catch (ClassNotFoundException | InstantiationException

-				| IllegalAccessException | UnsupportedLookAndFeelException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		}

-		setTitle("bwLehrpool Suite *Prototyp*");

-		Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();

-		int top=(screenSize.height - 722) / 2;

-		int left=(screenSize.width - 603) / 2;

-		setBounds(left, top, 603, 722);

-		//setBounds(100, 100, 603, 722);

-		getContentPane().setLayout(null);

-		{

-			JPanel panel = new JPanel();

-			panel.setBackground(SystemColor.menu);

-			panel.setBounds(10, 11, 577, 57);

-			getContentPane().add(panel);

-			panel.setLayout(null);

-			{

-				JLabel lblNewLabel = new JLabel("Eingabe Ihrer Daten");

-				lblNewLabel.setBounds(10, 11, 509, 22);

-				panel.add(lblNewLabel);

-				lblNewLabel.setFont(new Font("Tahoma", Font.BOLD, 18));

-			}

-			

-			JTextPane txtpnBitteWhlenSie = new JTextPane();

-			txtpnBitteWhlenSie.setEditable(false);

-			txtpnBitteWhlenSie.setBackground(SystemColor.menu);

-			txtpnBitteWhlenSie.setText("Geben Sie hier bitte einen sprechenden Imagename sowie Ihre Kontaktdaten an");

-			txtpnBitteWhlenSie.setBounds(10, 36, 509, 32);

-			panel.add(txtpnBitteWhlenSie);

-		}

-		contentPanel.setBounds(10, 85, 577, 493);

-		contentPanel.setBackground(SystemColor.menu);

-		contentPanel.setBorder(new EmptyBorder(5, 5, 5, 5));

-		getContentPane().add(contentPanel);

-		contentPanel.setLayout(null);

-		

-		JPanel panel_1 = new JPanel();

-		panel_1.setBackground(SystemColor.menu);

-		panel_1.setBorder(new TitledBorder(null, "Informationen zum Image", TitledBorder.LEADING, TitledBorder.TOP, null, null));

-		panel_1.setBounds(10, 66, 557, 124);

-		contentPanel.add(panel_1);

-		panel_1.setLayout(null);

-		

-		rdbtnlicenseNein = new JRadioButton("Nein");

-		buttonGrouplicense.add(rdbtnlicenseNein);

-		rdbtnlicenseNein.setBounds(377, 29, 46, 23);

-		panel_1.add(rdbtnlicenseNein);

-		

-		rdbtnInternetNein = new JRadioButton("Nein");

-		rdbtnInternetNein.setSelected(true);

-		buttonGroupInternet.add(rdbtnInternetNein);

-		rdbtnInternetNein.setBounds(377, 57, 46, 23);

-		panel_1.add(rdbtnInternetNein);

-		

-		JLabel lblInternetIstInnerhalb = new JLabel("Internet ist f\u00FCr dieses Image gesperrt:");

-		lblInternetIstInnerhalb.setBounds(10, 58, 250, 20);

-		panel_1.add(lblInternetIstInnerhalb);

-		

-		JButton btnInternetSettings = new JButton("Einstellungen...");

-		btnInternetSettings.setEnabled(false);

-		btnInternetSettings.setBounds(439, 57, 108, 23);

-		panel_1.add(btnInternetSettings);

-		

-		rdbtnInternetJa = new JRadioButton("Ja");

-		

-		buttonGroupInternet.add(rdbtnInternetJa);

-		rdbtnInternetJa.setBounds(266, 57, 41, 23);

-		panel_1.add(rdbtnInternetJa);

-		

-		rdbtnlicenseJa = new JRadioButton("Ja");

-		rdbtnlicenseJa.setSelected(true);

-		buttonGrouplicense.add(rdbtnlicenseJa);

-		rdbtnlicenseJa.setBounds(266, 29, 41, 23);

-		panel_1.add(rdbtnlicenseJa);

-		

-		JLabel lblNewLabel_2 = new JLabel("Image enth\u00E4lt lizenzpflichtige Software:");

-		lblNewLabel_2.setBounds(10, 30, 250, 20);

-		panel_1.add(lblNewLabel_2);

-		

-		JLabel lblLizenzserverEintragen = new JLabel("Lizenzserver eintragen:");

-		lblLizenzserverEintragen.setBounds(10, 85, 250, 20);

-		panel_1.add(lblLizenzserverEintragen);

-		

-		JButton btnLicenseServer = new JButton("Server-Adresse...");

-		btnLicenseServer.setEnabled(false);

-		btnLicenseServer.setBounds(266, 84, 157, 23);

-		panel_1.add(btnLicenseServer);

-		

-		JPanel panel_2 = new JPanel();

-		panel_2.setLayout(null);

-		panel_2.setBorder(new TitledBorder(null, "Empfehlung bezüglich Ressourcen", TitledBorder.LEADING, TitledBorder.TOP, null, null));

-		panel_2.setBackground(SystemColor.menu);

-		panel_2.setBounds(11, 196, 557, 338);

-		contentPanel.add(panel_2);

-		

-		JLabel lblGbyte = new JLabel("GByte");

-		lblGbyte.setBounds(424, 91, 46, 20);

-		panel_2.add(lblGbyte);

-		

-		spinnerCPU = new JSpinner();

-		spinnerCPU.setModel(new SpinnerNumberModel(1, 1, 4, 1));

-		spinnerCPU.setBounds(385, 188, 29, 20);

-		panel_2.add(spinnerCPU);

-		

-		JTextArea txtrBeispielWindows = new JTextArea();

-		txtrBeispielWindows.setText("Beispiel:\r\nWindows 7 32/64 Bit: 2 GByte\r\nLinux/Unix 32/64 Bit:  1 GByte");

-		txtrBeispielWindows.setFont(new Font("Tahoma", Font.PLAIN, 11));

-		txtrBeispielWindows.setBackground(SystemColor.menu);

-		txtrBeispielWindows.setBounds(10, 122, 280, 55);

-		panel_2.add(txtrBeispielWindows);

-		

-		

-		

-		JLabel lblKerne = new JLabel("Kerne");

-		lblKerne.setBounds(424, 191, 46, 20);

-		panel_2.add(lblKerne);

-		

-		JLabel lblWieVieleCpus = new JLabel("Wie viele CPUs empfehlen Sie f\u00FCr das Image:");

-		lblWieVieleCpus.setBounds(10, 191, 280, 20);

-		panel_2.add(lblWieVieleCpus);

-		

-		spinnerRam = new JSpinner();

-		spinnerRam.setModel(new SpinnerNumberModel(1, 1, 8, 1));

-		spinnerRam.setBounds(385, 88, 29, 20);

-		panel_2.add(spinnerRam);

-		

-		JLabel label_3 = new JLabel("mindestens");

-		label_3.setBounds(315, 191, 60, 20);

-		panel_2.add(label_3);

-		

-		JLabel lblMindestens = new JLabel("mindestens");

-		lblMindestens.setBounds(315, 91, 60, 20);

-		panel_2.add(lblMindestens);

-		

-		JTextArea txtrBeispielWindows_1 = new JTextArea();

-		txtrBeispielWindows_1.setText("Beispiel:\r\nWindows 7 32/64 Bit: 1 Kern\r\nLinux/Unix 32/64 Bit:  1 Kern");

-		txtrBeispielWindows_1.setFont(new Font("Tahoma", Font.PLAIN, 11));

-		txtrBeispielWindows_1.setBackground(SystemColor.menu);

-		txtrBeispielWindows_1.setBounds(10, 222, 280, 55);

-		panel_2.add(txtrBeispielWindows_1);

-		

-		JLabel lblNewLabel_3 = new JLabel("Wie viel Arbeitsspeicher empfehlen Sie f\u00FCr das Image:");

-		lblNewLabel_3.setBounds(10, 91, 280, 20);

-		panel_2.add(lblNewLabel_3);

-		

-		JTextArea txtrHinweisSolltenSie = new JTextArea();

-		txtrHinweisSolltenSie.setBackground(SystemColor.menu);

-		txtrHinweisSolltenSie.setFont(new Font("Tahoma", Font.PLAIN, 13));

-		txtrHinweisSolltenSie.setText("Hinweis: Sollten Sie keine Software einsetzen, die viele Ressourcen ben\u00F6tigt,\r\nk\u00F6nnen Sie sich an den Beispielwerten orientieren.");

-		txtrHinweisSolltenSie.setBounds(10, 25, 537, 55);

-		panel_2.add(txtrHinweisSolltenSie);

-		

-		JLabel lblHauptmen = new JLabel("Hauptmen\u00FC");

-		lblHauptmen.addMouseListener(new MouseAdapter() {

-			@Override

-			public void mouseClicked(MouseEvent arg0) {

-				

-				EingabeImageTechnisch_GUI.this.setVisible(false);

-				MainMenue_GUI main=new MainMenue_GUI();

-				main.setVisible(true);

-			}

-		});

-		lblHauptmen.setForeground(Color.BLUE);

-		lblHauptmen.setBounds(10, 11, 61, 14);

-		contentPanel.add(lblHauptmen);

-		

-		JLabel label_1 = new JLabel(">");

-		label_1.setBounds(69, 11, 13, 14);

-		contentPanel.add(label_1);

-		

-		JLabel lblVlimage = new JLabel("VL-Image");

-		lblVlimage.setForeground(Color.BLUE);

-		lblVlimage.setBounds(81, 11, 45, 14);

-		contentPanel.add(lblVlimage);

-		

-		JLabel label_2 = new JLabel(">");

-		label_2.setBounds(133, 11, 13, 14);

-		contentPanel.add(label_2);

-		

-		JLabel lblNewLabel_1 = new JLabel("Neu");

-		lblNewLabel_1.setBounds(146, 11, 46, 14);

-		contentPanel.add(lblNewLabel_1);

-		{

-			JPanel buttonPane = new JPanel();

-			buttonPane.setBounds(0, 640, 597, 33);

-			buttonPane.setBackground(SystemColor.menu);

-			buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT));

-			getContentPane().add(buttonPane);

-			{

-				JButton cancelButton = new JButton("Zur\u00FCck");

-				cancelButton.addActionListener(new ActionListener() {

-					public void actionPerformed(ActionEvent e) {

-						

-						if(rdbtnInternetJa.isSelected()==true)

-						{

-							Image.image.setInternet(true);

-						}

-						else

-						{

-							Image.image.setInternet(false);

-						}

-						

-						if(rdbtnlicenseJa.isSelected()==true)

-						{

-							Image.image.setLicensed(true);

-						}

-						else

-						{

-							Image.image.setLicensed(false);

-						}

-						Image.image.setCpu(Integer.valueOf(spinnerCPU.getValue().toString()).intValue());

-						Image.image.setRam(Integer.valueOf(spinnerRam.getValue().toString()).intValue());

-						

-						EingabeImageAllgemein_GUI sr=new EingabeImageAllgemein_GUI();

-						sr.setVisible(true);

-						dispose();

-					}

-				});

-				cancelButton.setActionCommand("OK");

-				buttonPane.add(cancelButton);

-				//getRootPane().setDefaultButton(cancelButton);

-			}

-			{

-				JButton continueButton = new JButton("Weiter");

-				continueButton.addActionListener(new ActionListener() {

-					public void actionPerformed(ActionEvent e) {

-						if(rdbtnInternetJa.isSelected()==true)

-						{

-							Image.image.setInternet(true);

-						}

-						else

-						{

-							Image.image.setInternet(false);

-						}

-						

-						if(rdbtnlicenseJa.isSelected()==true)

-						{

-							Image.image.setLicensed(true);

-						}

-						else

-						{

-							Image.image.setLicensed(false);

-						}

-						Image.image.setCpu(Integer.valueOf(spinnerCPU.getValue().toString()).intValue());

-						Image.image.setRam(Integer.valueOf(spinnerRam.getValue().toString()).intValue());

-						FTPUploader_GUI ea=new FTPUploader_GUI();

-						ea.setVisible(true);

-						dispose();

-						

-					}

-				});

-				continueButton.setActionCommand("Cancel");

-				buttonPane.add(continueButton);

-				getRootPane().setDefaultButton(continueButton);

-			}

-		}

-		

-		JSeparator separator = new JSeparator();

-		separator.setBounds(0, 78, 597, 2);

-		getContentPane().add(separator);

-		

-		JSeparator separator_1 = new JSeparator();

-		separator_1.setBounds(0, 627, 597, 2);

-		getContentPane().add(separator_1);

-		

-		JMenuBar menuBar = new JMenuBar();

-		setJMenuBar(menuBar);

-		

-		JMenu mnNewMenu = new JMenu("Suchen");

-		menuBar.add(mnNewMenu);

-		

-		JMenuItem mntmVlSuche = new JMenuItem("VL Suche");

-		mnNewMenu.add(mntmVlSuche);

-		

-		JMenu mnNewMenu_1 = new JMenu("Hilfe");

-		menuBar.add(mnNewMenu_1);

-		

-		JMenuItem mntmFaq = new JMenuItem("FAQ");

-		mnNewMenu_1.add(mntmFaq);

-		

-		JMenuItem mntmOtrs = new JMenuItem("OTRS");

-		mnNewMenu_1.add(mntmOtrs);

-		

-	}

-}

diff --git a/Dozentenmodul/src/GUI/EingabeVeranstaltungAllgemein_GUI.java b/Dozentenmodul/src/GUI/EingabeVeranstaltungAllgemein_GUI.java
deleted file mode 100644
index 5b2d4751..00000000
--- a/Dozentenmodul/src/GUI/EingabeVeranstaltungAllgemein_GUI.java
+++ /dev/null
@@ -1,504 +0,0 @@
-package gui;
-
-import java.awt.Color;
-import java.awt.Dimension;
-import java.awt.FlowLayout;
-import java.awt.Font;
-import java.awt.SystemColor;
-import java.awt.Toolkit;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-import java.awt.event.WindowAdapter;
-import java.awt.event.WindowEvent;
-import javax.swing.JButton;
-import javax.swing.JDialog;
-import javax.swing.JFrame;
-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.JSeparator;
-import javax.swing.JTextField;
-import javax.swing.JTextPane;
-import javax.swing.UIManager;
-import javax.swing.UnsupportedLookAndFeelException;
-import javax.swing.border.EmptyBorder;
-import javax.swing.border.TitledBorder;
-import models.Image;
-import models.Lecture;
-import models.person;
-import javax.swing.JTextArea;
-import java.awt.ScrollPane;
-import java.util.Calendar;
-import java.util.Date;
-
-import com.toedter.calendar.JDateChooser;
-import javax.swing.JRadioButton;
-
-@SuppressWarnings("serial")
-public class EingabeVeranstaltungAllgemein_GUI extends JFrame {
-
-	private final JPanel contentPanel = new JPanel();
-	String[] result;
-	private JTextField Vorname;
-	private JTextField Nachname;
-	private JTextField Hochschule;
-	private JTextField EMail;
-	private JTextField txtFldVeranstaltungsname;
-	JTextArea description;
-	JRadioButton radioButtonyes;
-	JRadioButton radioButtonno;
-	JDateChooser dateChooserend;
-	JDateChooser dateChooserstart;
-	Date startDate = new Date();
-	Date endDate;
-	int maxLifeTime = 180; // Anzahl Tage, die eine Veranstaltung in der Zukunft
-							// aktiv sein darf
-	boolean isDateOrderCorrect, isDateMaxLifeTimeCorrect,
-			isAllInformationReady = false;
-
-	/**
-	 * Launch the application.
-	 */
-	public static void main(String[] args) {
-		try {
-			EingabeVeranstaltungAllgemein_GUI dialog = new EingabeVeranstaltungAllgemein_GUI();
-			dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
-			dialog.setVisible(true);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * Create the dialog.
-	 */
-	public EingabeVeranstaltungAllgemein_GUI() {
-		addWindowListener(new WindowAdapter() {
-			@Override
-			public void windowClosing(WindowEvent arg0) {
-				System.exit(0);
-			}
-
-			@Override
-			public void windowOpened(WindowEvent arg0) {
-				txtFldVeranstaltungsname.requestFocusInWindow();
-			}
-		});
-		setResizable(false);
-
-		try {
-			UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
-		} catch (ClassNotFoundException | InstantiationException
-				| IllegalAccessException | UnsupportedLookAndFeelException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		setTitle("bwLehrpool Suite *Prototyp*");
-		Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
-		int top = (screenSize.height - 722) / 2;
-		int left = (screenSize.width - 603) / 2;
-		setBounds(left, top, 603, 722);
-		// setBounds(100, 100, 603, 722);
-		getContentPane().setLayout(null);
-		{
-			JPanel panel = new JPanel();
-			panel.setBackground(SystemColor.menu);
-			panel.setBounds(10, 11, 577, 57);
-			getContentPane().add(panel);
-			panel.setLayout(null);
-			{
-				JLabel lblNewLabel = new JLabel("Eingabe Ihrer Daten");
-				lblNewLabel.setBounds(10, 11, 509, 22);
-				panel.add(lblNewLabel);
-				lblNewLabel.setFont(new Font("Tahoma", Font.BOLD, 18));
-			}
-
-			JTextPane txtpnBitteWhlenSie = new JTextPane();
-			txtpnBitteWhlenSie.setEditable(false);
-			txtpnBitteWhlenSie.setBackground(SystemColor.menu);
-			txtpnBitteWhlenSie
-					.setText("Geben Sie hier bitte einen sprechenden Imagename sowie Ihre Kontaktdaten an");
-			txtpnBitteWhlenSie.setBounds(10, 36, 509, 21);
-			panel.add(txtpnBitteWhlenSie);
-		}
-		contentPanel.setBounds(10, 85, 577, 493);
-		contentPanel.setBackground(SystemColor.menu);
-		contentPanel.setBorder(new EmptyBorder(5, 5, 5, 5));
-		getContentPane().add(contentPanel);
-		contentPanel.setLayout(null);
-
-		JPanel panel_1 = new JPanel();
-		panel_1.setBackground(SystemColor.menu);
-		panel_1.setBorder(new TitledBorder(null, "Informationen zum Besitzer",
-				TitledBorder.LEADING, TitledBorder.TOP, null, null));
-		panel_1.setBounds(10, 331, 557, 162);
-		contentPanel.add(panel_1);
-		panel_1.setLayout(null);
-
-		JLabel label = new JLabel("Vorname: *");
-		label.setBackground(SystemColor.menu);
-		label.setBounds(10, 33, 125, 20);
-		panel_1.add(label);
-
-		Vorname = new JTextField();
-		Vorname.setEditable(false);
-		Vorname.setEnabled(false);
-		Vorname.setText(person.verantwortlicher.getVorname());
-		Vorname.setBackground(Color.WHITE);
-		Vorname.setColumns(10);
-		Vorname.setBounds(145, 33, 350, 20);
-		panel_1.add(Vorname);
-
-		JLabel label_7 = new JLabel("Nachname: *");
-		label_7.setBackground(SystemColor.menu);
-		label_7.setBounds(10, 64, 125, 20);
-		panel_1.add(label_7);
-
-		Nachname = new JTextField();
-		Nachname.setEnabled(false);
-		Nachname.setEditable(false);
-		Nachname.setText(person.verantwortlicher.getName());
-		Nachname.setBackground(Color.WHITE);
-		Nachname.setColumns(10);
-		Nachname.setBounds(145, 64, 350, 20);
-		panel_1.add(Nachname);
-
-		JLabel label_8 = new JLabel("Hochschule: *");
-		label_8.setBackground(SystemColor.menu);
-		label_8.setBounds(10, 95, 125, 20);
-		panel_1.add(label_8);
-
-		Hochschule = new JTextField();
-		Hochschule.setEnabled(false);
-		Hochschule.setEditable(false);
-		Hochschule.setText(person.verantwortlicher.getHochschule());
-		Hochschule.setBackground(Color.WHITE);
-		Hochschule.setColumns(10);
-		Hochschule.setBounds(145, 95, 350, 20);
-		panel_1.add(Hochschule);
-
-		JLabel label_9 = new JLabel("E-Mail: *");
-		label_9.setBackground(SystemColor.menu);
-		label_9.setBounds(10, 126, 125, 20);
-		panel_1.add(label_9);
-
-		EMail = new JTextField();
-		EMail.setEnabled(false);
-		EMail.setEditable(false);
-		EMail.setText(person.verantwortlicher.getEMail());
-		EMail.setBackground(Color.WHITE);
-		EMail.setColumns(10);
-		EMail.setBounds(145, 126, 350, 20);
-		panel_1.add(EMail);
-
-		JPanel panel = new JPanel();
-		panel.setBounds(10, 402, 577, 33);
-		contentPanel.add(panel);
-		panel.setLayout(null);
-		panel.setBorder(new EmptyBorder(5, 5, 5, 5));
-		panel.setBackground(SystemColor.menu);
-
-		JLabel lblHauptmen = new JLabel("Hauptmen\u00FC");
-		lblHauptmen.addMouseListener(new MouseAdapter() {
-			@Override
-			public void mouseClicked(MouseEvent arg0) {
-
-				EingabeVeranstaltungAllgemein_GUI.this.setVisible(false);
-				MainMenue_GUI main = new MainMenue_GUI();
-				main.setVisible(true);
-			}
-		});
-		lblHauptmen.setForeground(Color.BLUE);
-		lblHauptmen.setBounds(10, 11, 61, 14);
-		contentPanel.add(lblHauptmen);
-
-		JLabel label_1 = new JLabel(">");
-		label_1.setBounds(69, 11, 13, 14);
-		contentPanel.add(label_1);
-
-		JLabel lblVlimage = new JLabel("VL-Image");
-		lblVlimage.setForeground(Color.BLUE);
-		lblVlimage.setBounds(81, 11, 45, 14);
-		contentPanel.add(lblVlimage);
-
-		JLabel label_2 = new JLabel(">");
-		label_2.setBounds(133, 11, 13, 14);
-		contentPanel.add(label_2);
-
-		JLabel lblNewLabel_1 = new JLabel("Neu");
-		lblNewLabel_1.setBounds(146, 11, 46, 14);
-		contentPanel.add(lblNewLabel_1);
-
-		JPanel panel_2 = new JPanel();
-		panel_2.setLayout(null);
-		panel_2.setBorder(new TitledBorder(null, "Veranstaltungsdaten",
-				TitledBorder.LEADING, TitledBorder.TOP, null, null));
-		panel_2.setBackground(SystemColor.menu);
-		panel_2.setBounds(10, 36, 557, 284);
-		contentPanel.add(panel_2);
-
-		JLabel label_3 = new JLabel("Laborname (Anzeigename): *");
-		label_3.setBounds(10, 25, 180, 14);
-		panel_2.add(label_3);
-
-		txtFldVeranstaltungsname = new JTextField();
-		txtFldVeranstaltungsname.setColumns(10);
-		txtFldVeranstaltungsname.setBounds(200, 22, 347, 20);
-		txtFldVeranstaltungsname.setText(Lecture.lecture.getName());
-		panel_2.add(txtFldVeranstaltungsname);
-
-		JTextArea textArea = new JTextArea();
-		textArea.setEditable(false);
-		textArea.setWrapStyleWord(true);
-		textArea.setText("Geben Sie bitte einen sprechenden Namen f\u00FCr das Image an. Dieser soll jedoch recht allgemein gehalten werden.\r\nBeispiel: \"Programmieren\", nicht \"Programmieren 1\"");
-		textArea.setLineWrap(true);
-		textArea.setFont(new Font("Tahoma", Font.PLAIN, 12));
-		textArea.setBackground(SystemColor.menu);
-		textArea.setBounds(10, 49, 537, 49);
-		panel_2.add(textArea);
-
-		JLabel lblDesc = new JLabel("Beschreibung: *");
-		lblDesc.setBounds(10, 111, 180, 14);
-		panel_2.add(lblDesc);
-
-		ScrollPane scrollPane = new ScrollPane();
-		scrollPane.setBounds(200, 104, 347, 78);
-		panel_2.add(scrollPane);
-		description = new JTextArea();
-		description.setFont(new Font("Tahoma", Font.PLAIN, 11));
-		description.setLineWrap(true);
-		description.setText(Lecture.lecture.getDesc());
-		scrollPane.add(description);
-		description.setBounds(0, 0, 4, 22);
-		scrollPane.add(description);
-
-		dateChooserend = new JDateChooser();
-		endDate = addDays(new Date(), maxLifeTime); // Datum darf weiter als 6
-													// Monate in der Zukunft
-													// liegen
-		dateChooserend.setDate(endDate);
-		if (Lecture.lecture.getEnddate() == null) {
-			// is not defined yet
-			dateChooserend.setDate(endDate);
-		} else {
-			// already defined from last visit on this page
-			dateChooserend.setDate(Lecture.lecture.getEnddate());
-		}
-		dateChooserend.setDateFormatString("yyyy-MM-dd hh:mm:ss");
-		dateChooserend.setBounds(404, 188, 143, 20);
-		panel_2.add(dateChooserend);
-
-		JLabel lblBis = new JLabel("bis:");
-		lblBis.setBounds(378, 188, 21, 20);
-		panel_2.add(lblBis);
-
-		dateChooserstart = new JDateChooser();
-		if (Lecture.lecture.getStartdate() == null) {
-			// is not defined yet
-			dateChooserstart.setDate(startDate);
-		} else {
-			// already defined from last visit on this page
-			dateChooserstart.setDate(Lecture.lecture.getStartdate());
-		}
-		dateChooserstart.setDateFormatString("yyyy-MM-dd hh:mm:ss");
-		dateChooserstart.setBounds(226, 188, 143, 20);
-		panel_2.add(dateChooserstart);
-
-		JLabel label_6 = new JLabel("von:");
-		label_6.setBounds(200, 188, 30, 20);
-		panel_2.add(label_6);
-
-		JLabel label_10 = new JLabel("G\u00FCltigkeitsdatum: *");
-		label_10.setBounds(10, 194, 127, 14);
-		panel_2.add(label_10);
-
-		JLabel label_11 = new JLabel("Aktiv:");
-		label_11.setBounds(10, 229, 127, 14);
-		panel_2.add(label_11);
-
-		radioButtonyes = new JRadioButton("Ja");
-		radioButtonyes.setSelected(true);
-		radioButtonyes.setBounds(200, 225, 73, 23);
-		panel_2.add(radioButtonyes);
-
-		radioButtonno = new JRadioButton("Nein");
-		radioButtonyes.addActionListener(new ActionListener() {
-			public void actionPerformed(ActionEvent arg0) {
-				radioButtonyes.setSelected(true);
-				radioButtonno.setSelected(false);
-			}
-		});
-		radioButtonno.addActionListener(new ActionListener() {
-			public void actionPerformed(ActionEvent e) {
-				radioButtonno.setSelected(true);
-				radioButtonyes.setSelected(false);
-			}
-		});
-		radioButtonno.setBounds(296, 225, 73, 23);
-		panel_2.add(radioButtonno);
-
-		JLabel lblimVmchooserSichtbar = new JLabel("(im VMChooser sichtbar)");
-		lblimVmchooserSichtbar.setBounds(10, 245, 127, 14);
-		panel_2.add(lblimVmchooserSichtbar);
-		
-		JLabel lblmaxMonate = new JLabel("(max. 6 Monate)");
-		lblmaxMonate.setBounds(10, 208, 127, 14);
-		panel_2.add(lblmaxMonate);
-		{
-			JPanel buttonPane = new JPanel();
-			buttonPane.setBounds(0, 640, 597, 33);
-			buttonPane.setBackground(SystemColor.menu);
-			buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT));
-			getContentPane().add(buttonPane);
-			{
-				JButton backButton = new JButton("Zur\u00FCck");
-				backButton.addActionListener(new ActionListener() {
-					public void actionPerformed(ActionEvent e) {
-						if (radioButtonyes.isSelected() == true) {
-							Lecture.lecture.setActive(true);
-						} else {
-							Lecture.lecture.setActive(false);
-						}
-
-						Lecture.lecture.setName(txtFldVeranstaltungsname
-								.getText());
-						Lecture.lecture.setDesc(description.getText());
-						Lecture.lecture.setEnddate(dateChooserend.getDate());
-						Lecture.lecture.setStartdate(dateChooserstart.getDate());
-						Image.image.setImagename(txtFldVeranstaltungsname
-								.getText());
-
-						MainMenue_GUI sr = new MainMenue_GUI();
-						sr.setVisible(true);
-						dispose();
-					}
-				});
-				backButton.setActionCommand("Cancel");
-				buttonPane.add(backButton);
-				getRootPane().setDefaultButton(backButton);
-			}
-			{
-				JButton continueButton = new JButton("Weiter");
-				continueButton.addActionListener(new ActionListener() {
-					public void actionPerformed(ActionEvent e) {
-						// liegt das End-Datum vor dem Start-Datum?
-						if (dateChooserend.getDate().before(
-								dateChooserstart.getDate())) {
-							// datum ist falsch rum
-							isDateOrderCorrect = false;
-							JOptionPane
-									.showMessageDialog(
-											null,
-											"Das End-Datum liegt vor dem Start-Datum. Bitte ändern.",
-											"Datum fehlerhaft",
-											JOptionPane.ERROR_MESSAGE);
-						} else {
-							// bereit
-							isDateOrderCorrect = true;
-						}
-						// liegt das eingegebene Datum nach dem erlaubten
-						// End-Datum?
-						if (dateChooserend.getDate().after(endDate)) {
-							// Datum zu weit weg
-							isDateMaxLifeTimeCorrect = false;
-							JOptionPane.showMessageDialog(null,
-									"Das End-Datum liegt zu weit in der Zukunft. Erlaubt ist maximal:\n"
-											+ endDate, "Datum fehlerhaft",
-									JOptionPane.ERROR_MESSAGE);
-						} else {
-							// bereit
-							isDateMaxLifeTimeCorrect = true;
-						}
-						// Prüfen ob alles eingegeben wurde
-						if (txtFldVeranstaltungsname.getText().isEmpty() == true
-								|| description.getText().isEmpty() == true) {
-							// mind 1 Textfeld ist leer
-							isAllInformationReady = false;
-							JOptionPane
-									.showMessageDialog(
-											null,
-											"Bitte geben Sie einen Veranstaltungsnamen und eine Beschreibung ein.",
-											"Datum fehlerhaft",
-											JOptionPane.ERROR_MESSAGE);
-						} else {
-							// Textfelder bereit
-							isAllInformationReady = true;
-						}
-
-						// welcher Radiobutton ist geklickt?
-						if (radioButtonyes.isSelected() == true) {
-							Lecture.lecture.setActive(true);
-						} else {
-							Lecture.lecture.setActive(false);
-						}
-						// Prüfe ob alle Eingaben korrekt sind, dann mache
-						// weiter
-						if (isAllInformationReady == true
-								&& isDateMaxLifeTimeCorrect == true
-								&& isDateOrderCorrect == true) {
-							// everything is ok, proceed
-							Lecture.lecture.setName(txtFldVeranstaltungsname
-									.getText());
-							Lecture.lecture.setDesc(description.getText());
-							Lecture.lecture.setEnddate(dateChooserend.getDate());
-							Lecture.lecture.setStartdate(dateChooserstart
-									.getDate());
-							Image.image.setImagename(txtFldVeranstaltungsname
-									.getText());
-
-							LinkImage_GUI ev = new LinkImage_GUI();
-							ev.setVisible(true);
-							dispose();
-						}
-
-					}
-				});
-				continueButton.setActionCommand("OK");
-				buttonPane.add(continueButton);
-			}
-		}
-
-		JSeparator separator = new JSeparator();
-		separator.setBounds(0, 78, 597, 2);
-		getContentPane().add(separator);
-
-		JSeparator separator_1 = new JSeparator();
-		separator_1.setBounds(0, 627, 597, 2);
-		getContentPane().add(separator_1);
-
-		JLabel lblPflichtfelder = new JLabel("* Pflichtfelder");
-		lblPflichtfelder.setBounds(32, 602, 136, 14);
-		getContentPane().add(lblPflichtfelder);
-
-		JMenuBar menuBar = new JMenuBar();
-		setJMenuBar(menuBar);
-
-		JMenu mnNewMenu = new JMenu("Suchen");
-		menuBar.add(mnNewMenu);
-
-		JMenuItem mntmVlSuche = new JMenuItem("VL Suche");
-		mnNewMenu.add(mntmVlSuche);
-
-		JMenu mnNewMenu_1 = new JMenu("Hilfe");
-		menuBar.add(mnNewMenu_1);
-
-		JMenuItem mntmFaq = new JMenuItem("FAQ");
-		mnNewMenu_1.add(mntmFaq);
-
-		JMenuItem mntmOtrs = new JMenuItem("OTRS");
-		mnNewMenu_1.add(mntmOtrs);
-
-	}
-
-	public Date addDays(Date date, int days) {
-		Calendar cal = Calendar.getInstance();
-		cal.setTime(date);
-		cal.add(Calendar.DATE, days); // minus number would decrement the days
-		return cal.getTime();
-	}
-}
diff --git a/Dozentenmodul/src/GUI/MainMenue_GUI.java b/Dozentenmodul/src/GUI/MainMenue_GUI.java
deleted file mode 100644
index f1e79b82..00000000
--- a/Dozentenmodul/src/GUI/MainMenue_GUI.java
+++ /dev/null
@@ -1,443 +0,0 @@
-package gui;

-

-import java.awt.Dimension;

-import java.awt.FlowLayout;

-import java.awt.Toolkit;

-import javax.swing.JFrame;

-import javax.swing.JButton;

-import javax.swing.JDialog;

-import javax.swing.JPanel;

-import javax.swing.UIManager;

-import javax.swing.UnsupportedLookAndFeelException;

-import javax.swing.border.EmptyBorder;

-import java.awt.Color;

-import javax.swing.JLabel;

-import java.awt.Font;

-import javax.swing.JTextPane;

-import java.awt.SystemColor;

-import java.awt.event.ActionListener;

-import java.awt.event.ActionEvent;

-import javax.swing.JSeparator;

-import javax.swing.JRadioButton;

-import javax.swing.SwingConstants;

-import javax.swing.ButtonGroup;

-import javax.swing.JMenuBar;

-import javax.swing.JMenu;

-import javax.swing.JMenuItem;

-import javax.swing.ToolTipManager;

-import java.awt.event.WindowAdapter;

-import java.awt.event.WindowEvent;

-import javax.swing.border.TitledBorder;

-import java.awt.event.MouseAdapter;

-import java.awt.event.MouseEvent;

-import java.awt.ScrollPane;

-import javax.swing.JTextArea;

-import javax.swing.ImageIcon;

-

-@SuppressWarnings("serial")

-public class MainMenue_GUI extends JFrame {

-

-	private final JPanel contentPanel = new JPanel();

-	String[] result;

-	String descNewImage, descEditImage, descDeleteImage, descSearchImage,

-			descNewLecture, descEditLecture, descDeleteLecture,

-			descSearchLecture = "";

-	JRadioButton rdbtnImageNew;

-	JRadioButton rdbtnImageEdit;

-	JRadioButton rdbtnImageSearchDownload;

-	JRadioButton rdbtnVeranstaltungNew;

-	JRadioButton rdbtnImageDelete;

-	JRadioButton rdbtnVeranstaltungEdit;

-	private final ButtonGroup buttonGroup = new ButtonGroup();

-

-	/**

-	 * Launch the application.

-	 */

-	public static void main(String[] args) {

-		try {

-			MainMenue_GUI dialog = new MainMenue_GUI();

-			dialog.setDefaultCloseOperation(JDialog.HIDE_ON_CLOSE);

-			dialog.setVisible(true);

-		} catch (Exception e) {

-			e.printStackTrace();

-		}

-	}// end main

-

-	/**

-	 * Create the dialog.

-	 */

-	public MainMenue_GUI() {

-		addWindowListener(new WindowAdapter() {

-			@Override

-			public void windowClosing(WindowEvent arg0) {

-				System.exit(0);

-			}

-		});

-		try {

-			UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());

-		} catch (ClassNotFoundException | InstantiationException

-				| IllegalAccessException | UnsupportedLookAndFeelException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		}

-		setTitle("bwLehrpool Suite *Prototyp*");

-		Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();

-		int top = (screenSize.height - 722) / 2;

-		int left = (screenSize.width - 603) / 2;

-		setBounds(left, top, 603, 722);

-		// setBounds(100, 100, 545, 366);

-		getContentPane().setLayout(null);

-		{

-			JPanel panel = new JPanel();

-			panel.setBackground(SystemColor.menu);

-			panel.setBounds(10, 11, 567, 69);

-			getContentPane().add(panel);

-			panel.setLayout(null);

-			{

-				JLabel lblNewLabel = new JLabel("Hauptmen\u00FC");

-				lblNewLabel.setBounds(10, 11, 509, 22);

-				panel.add(lblNewLabel);

-				lblNewLabel.setFont(new Font("Tahoma", Font.BOLD, 18));

-			}

-

-			JTextPane txtpnBitteWhlenSie = new JTextPane();

-			txtpnBitteWhlenSie.setEditable(false);

-			txtpnBitteWhlenSie.setBackground(SystemColor.menu);

-			txtpnBitteWhlenSie

-					.setText("Bitte w\u00E4hlen Sie ihre gew\u00FCnschte Aktion.");

-			txtpnBitteWhlenSie.setBounds(10, 36, 509, 22);

-			panel.add(txtpnBitteWhlenSie);

-		}

-		contentPanel.setBounds(10, 104, 567, 502);

-		contentPanel.setBackground(SystemColor.menu);

-

-		contentPanel.setBorder(new EmptyBorder(5, 5, 5, 5));

-		getContentPane().add(contentPanel);

-		contentPanel.setLayout(null);

-

-		JPanel panelImage = new JPanel();

-		panelImage.setBackground(SystemColor.menu);

-		panelImage.setBorder(new TitledBorder(null, "VL-Image",

-				TitledBorder.LEADING, TitledBorder.TOP, null, null));

-		panelImage.setBounds(10, 146, 270, 170);

-		contentPanel.add(panelImage);

-		panelImage.setLayout(null);

-

-		rdbtnImageNew = new JRadioButton("Neu");

-		rdbtnImageNew

-				.setToolTipText("Hier k\u00F6nnen Sie eine standard Laborvorlage downloaden");

-		rdbtnImageNew.setBounds(6, 22, 159, 23);

-		panelImage.add(rdbtnImageNew);

-		rdbtnImageNew.setSelected(true);

-		buttonGroup.add(rdbtnImageNew);

-		rdbtnImageNew.setBackground(SystemColor.menu);

-

-		rdbtnImageEdit = new JRadioButton("Bearbeiten");

-		rdbtnImageEdit

-				.setToolTipText("Hier k\u00F6nnen Sie ein bestehendes Labor zum ver\u00E4ndern downloaden");

-		rdbtnImageEdit.setBounds(6, 48, 185, 23);

-		panelImage.add(rdbtnImageEdit);

-		buttonGroup.add(rdbtnImageEdit);

-		rdbtnImageEdit.setHorizontalAlignment(SwingConstants.LEFT);

-		rdbtnImageEdit.setBackground(SystemColor.menu);

-

-		rdbtnImageDelete = new JRadioButton("L\u00F6schen");

-		rdbtnImageDelete.setEnabled(true);

-		buttonGroup.add(rdbtnImageDelete);

-		rdbtnImageDelete

-				.setToolTipText("Hier k\u00F6nnen Sie ein bestehendes Labor zum ver\u00E4ndern downloaden");

-		rdbtnImageDelete.setHorizontalAlignment(SwingConstants.LEFT);

-		rdbtnImageDelete.setBackground(SystemColor.menu);

-		rdbtnImageDelete.setBounds(6, 74, 185, 23);

-		panelImage.add(rdbtnImageDelete);

-

-		rdbtnImageSearchDownload = new JRadioButton("Suche und Download");

-		rdbtnImageSearchDownload.setEnabled(false);

-		buttonGroup.add(rdbtnImageSearchDownload);

-		rdbtnImageSearchDownload

-				.setToolTipText("Hier k\u00F6nnen Sie ein bestehendes Labor zum ver\u00E4ndern downloaden");

-		rdbtnImageSearchDownload.setHorizontalAlignment(SwingConstants.LEFT);

-		rdbtnImageSearchDownload.setBackground(SystemColor.menu);

-		rdbtnImageSearchDownload.setBounds(6, 100, 185, 23);

-		panelImage.add(rdbtnImageSearchDownload);

-

-		JPanel panelDesc = new JPanel();

-		panelDesc.setLayout(null);

-		panelDesc.setBorder(new TitledBorder(UIManager

-				.getBorder("TitledBorder.border"), "Erklärung",

-				TitledBorder.LEADING, TitledBorder.TOP, null, null));

-		panelDesc.setBackground(SystemColor.menu);

-		panelDesc.setBounds(290, 146, 270, 170);

-		contentPanel.add(panelDesc);

-

-		ScrollPane scrollPaneDesc = new ScrollPane();

-		scrollPaneDesc.setBounds(10, 15, 250, 145);

-		final JTextArea txtDesc = new JTextArea();

-		txtDesc.setLineWrap(true);

-		txtDesc.setWrapStyleWord(true);

-		txtDesc.setFont(new Font("Tahoma", Font.PLAIN, 11));

-		txtDesc.setBackground(SystemColor.menu);

-		scrollPaneDesc.add(txtDesc);

-		// Pro AUswahl

-		txtDesc.setText("Legen Sie ein neues Image an und laden Sie anschließend die passende .vmdk-Datei hoch. Ein Image (wenn auch von einem anderen Dozenten) ist die Voraussetzung für eine Veranstaltung.");

-		panelDesc.add(scrollPaneDesc);

-

-		JPanel panelVeranstaltung = new JPanel();

-		panelVeranstaltung.setLayout(null);

-		panelVeranstaltung.setBorder(new TitledBorder(UIManager

-				.getBorder("TitledBorder.border"), "Veranstaltung (VMChooser)",

-				TitledBorder.LEADING, TitledBorder.TOP, null, null));

-		panelVeranstaltung.setBackground(SystemColor.menu);

-		panelVeranstaltung.setBounds(10, 327, 270, 170);

-		contentPanel.add(panelVeranstaltung);

-

-		rdbtnVeranstaltungNew = new JRadioButton("Neu");

-		buttonGroup.add(rdbtnVeranstaltungNew);

-		rdbtnVeranstaltungNew

-				.setToolTipText("Hier k\u00F6nnen Sie Ihre Labordaten eingeben");

-		rdbtnVeranstaltungNew.setBounds(6, 24, 185, 23);

-		panelVeranstaltung.add(rdbtnVeranstaltungNew);

-		rdbtnVeranstaltungNew.setBackground(SystemColor.menu);

-

-		rdbtnVeranstaltungEdit = new JRadioButton("Bearbeiten");

-		rdbtnVeranstaltungEdit

-				.setToolTipText("Hier k\u00F6nnen Sie einen Link auf ein bestehendes Labor erzeugen");

-		rdbtnVeranstaltungEdit.setBounds(6, 50, 230, 23);

-		panelVeranstaltung.add(rdbtnVeranstaltungEdit);

-		buttonGroup.add(rdbtnVeranstaltungEdit);

-		rdbtnVeranstaltungEdit.setBackground(SystemColor.menu);

-

-		JRadioButton rdbtnVeranstaltungDelete = new JRadioButton("L\u00F6schen");

-		rdbtnVeranstaltungDelete.setEnabled(false);

-		rdbtnVeranstaltungDelete

-				.setToolTipText("Hier k\u00F6nnen Sie ein Labor l\u00F6schen");

-		rdbtnVeranstaltungDelete.setBounds(6, 76, 175, 23);

-		panelVeranstaltung.add(rdbtnVeranstaltungDelete);

-		buttonGroup.add(rdbtnVeranstaltungDelete);

-		rdbtnVeranstaltungDelete.setBackground(SystemColor.menu);

-

-		JRadioButton rdbtnVeranstaltungSearch = new JRadioButton("Suche");

-		rdbtnVeranstaltungSearch.setEnabled(false);

-		buttonGroup.add(rdbtnVeranstaltungSearch);

-		rdbtnVeranstaltungSearch

-				.setToolTipText("Hier k\u00F6nnen Sie ein Labor l\u00F6schen");

-		rdbtnVeranstaltungSearch.setBackground(SystemColor.menu);

-		rdbtnVeranstaltungSearch.setBounds(6, 102, 175, 23);

-		panelVeranstaltung.add(rdbtnVeranstaltungSearch);

-

-		JLabel lblCrumbStart = new JLabel("Startseite");

-		lblCrumbStart.addMouseListener(new MouseAdapter() {

-			@Override

-			public void mouseClicked(MouseEvent arg0) {

-				Login_GUI lw = new Login_GUI();

-				lw.setVisible(true);

-				MainMenue_GUI.this.setVisible(false);

-			}

-		});

-		lblCrumbStart.setForeground(Color.BLUE);

-		lblCrumbStart.setBounds(10, 0, 52, 14);

-		contentPanel.add(lblCrumbStart);

-

-		JLabel label = new JLabel(">");

-		label.setBounds(60, 0, 13, 14);

-		contentPanel.add(label);

-

-		JLabel lblRechtshinweis = new JLabel("Rechtshinweis");

-		lblRechtshinweis.addMouseListener(new MouseAdapter() {

-			@Override

-			public void mouseClicked(MouseEvent e) {

-				BillOfRights_GUI rb = new BillOfRights_GUI();

-				rb.setVisible(true);

-				MainMenue_GUI.this.setVisible(false);

-			}

-		});

-		lblRechtshinweis.setForeground(Color.BLUE);

-		lblRechtshinweis.setBounds(72, 0, 68, 14);

-		contentPanel.add(lblRechtshinweis);

-

-		JLabel label_1 = new JLabel(">");

-		label_1.setBounds(142, 0, 13, 14);

-		contentPanel.add(label_1);

-

-		JLabel lblNewLabel_1 = new JLabel("Hauptmen\u00FC");

-		lblNewLabel_1.setBounds(150, 0, 74, 14);

-		contentPanel.add(lblNewLabel_1);

-

-		JPanel panelNews = new JPanel();

-		panelNews.setLayout(null);

-		panelNews.setBorder(new TitledBorder(UIManager

-				.getBorder("TitledBorder.border"), "News",

-				TitledBorder.LEADING, TitledBorder.TOP, null, null));

-		panelNews.setBackground(SystemColor.menu);

-		panelNews.setBounds(290, 327, 270, 170);

-		contentPanel.add(panelNews);

-

-		ScrollPane scrollPaneNews = new ScrollPane();

-		// scrollPaneDesc.setBounds(10, 15, 250, 145);

-		scrollPaneNews.setBounds(10, 15, 250, 145);

-		JTextArea txtNews = new JTextArea();

-		txtNews.setFont(new Font("Tahoma", Font.PLAIN, 11));

-		txtNews.setBackground(SystemColor.menu);

-		txtNews.setWrapStyleWord(true);

-		txtNews.setLineWrap(true);

-		txtNews.setText("Hier werden mal die Neuigkeiten stehen. Diese kommen direkt vom Satelliten, sind als HS-spezifisch :)");

-		scrollPaneNews.add(txtNews);

-		panelNews.add(scrollPaneNews);

-

-		/*

-		 * Funktion Texte für das Klicken der RadioButtons

-		 */

-		rdbtnImageNew.addActionListener(new ActionListener() {

-			public void actionPerformed(ActionEvent arg0) {

-				descNewImage = "Legen Sie ein neues Image an und laden Sie anschließend die passende .vmdk-Datei hoch. Ein Image (wenn auch von einem anderen Dozenten) ist die Voraussetzung für eine Veranstaltung.";

-				txtDesc.setText(descNewImage);

-			}

-		});

-		rdbtnImageEdit.addActionListener(new ActionListener() {

-			public void actionPerformed(ActionEvent e) {

-				descEditImage = "Bearbeiten Sie die hinterlegten Informationen zu einem Image oder laden Sie eine neue .vmdk-Datei hoch.";

-				txtDesc.setText(descEditImage);

-			}

-		});

-		rdbtnImageDelete.addActionListener(new ActionListener() {

-			public void actionPerformed(ActionEvent e) {

-				descDeleteImage = "Suchen Sie alte und nicht mehr benötigte Images und löschen Sie diese.";

-				txtDesc.setText(descDeleteImage);

-			}

-		});

-		rdbtnImageSearchDownload.addActionListener(new ActionListener() {

-			public void actionPerformed(ActionEvent e) {

-				descSearchImage = "Suchen Sie nach bestimmten Images oder verschaffen Sie sich einen Überblick über alle verfügbaren Images. Sie können gewünschte Images umgehend herunterladen.";

-				txtDesc.setText(descSearchImage);

-			}

-		});

-		rdbtnVeranstaltungNew.addActionListener(new ActionListener() {

-			public void actionPerformed(ActionEvent e) {

-				descNewLecture = "Legen Sie eine neue Veranstaltung an und verknüpfen Sie diese mit einem bereits vorhandenem Image. Ihre neue Veranstaltung kann auch auf dem Image eines anderen Dozenten beruhen.";

-				txtDesc.setText(descNewLecture);

-			}

-		});

-		rdbtnVeranstaltungEdit.addActionListener(new ActionListener() {

-			public void actionPerformed(ActionEvent e) {

-				descEditLecture = "Bearbeiten Sie die hinterlegten Informationen zu einer Veranstaltung.";

-				txtDesc.setText(descEditLecture);

-			}

-		});

-		rdbtnVeranstaltungDelete.addActionListener(new ActionListener() {

-			public void actionPerformed(ActionEvent e) {

-				descDeleteLecture = "Suchen und löschen Sie eine Veranstaltung. Das hiermit verbundene Image bleibt erhalten.";

-			}

-		});

-		rdbtnVeranstaltungSearch.addActionListener(new ActionListener() {

-			public void actionPerformed(ActionEvent e) {

-				descSearchLecture = "Suchen Sie nach bestimmten Veranstaltungen oder verschaffen Sie sich einen Überblick über alle verfügbaren Veranstaltungen. Eventuell gibt es bereits etwas passendes für Ihre Vorlesung.";

-				txtDesc.setText(descSearchLecture);

-			}

-		});

-		/*

-		 * Ende der Radiobuttons

-		 */

-

-		JLabel lblGrafik = new JLabel("");

-		// ToolTipp für Grafik

-		lblGrafik

-				.setToolTipText("<html>"

-						+ "Ein virtuelles Labor besteht immer aus den beiden Komponenten <br>"

-						+ "Image und Veranstaltung. Ein Image ist dabei  die Grundlage f\u00FCr <br>"

-						+ "mehrere Veranstaltungen. Somit kann eine neue Veranstaltung  <br>"

-						+ "erstellt werden, ohne ein neues Image hochladen zu m\u00FCssen. <br> <br> <br>"

-						+ "<b>Image:</b> Das Image enth\u00E4lt die ben\u00F6tigte Software, die im  <br>"

-						+ "virtuellen Labor ben\u00F6tigt wird. Es wird von genau einem Dozenten  <br>"

-						+ "angelegt und besitzt einen allgemeinen Namen, z.B. \"Programmieren\".  <br>"

-						+ "Bei einem Image handelt es sich um eine Datei vom Typ VMDK. <br> <br> <br>"

-						+ "<b>Veranstaltung:</b> Es k\u00F6nnen nun, basierend auf einem Image,<br>"

-						+ " beliebig viele Veranstaltungen von unterschiedlichen Dozenten erstellt  <br>"

-						+ "werden. Diese k\u00F6nnten z.B. konkret \"Web-Entwicklung\" oder \"K\u00FCnstliche <br>"

-						+ "Intelligenz\" lauten und referenzieren dabei auf das allgemeine Image <br>"

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

-		lblGrafik.setIcon(new ImageIcon(MainMenue_GUI.class

-				.getResource("/Image_zu_Veranstaltung_HDD.png")));

-		// ToolTipp lange anzeigen - 60sec

-		ToolTipManager.sharedInstance().setDismissDelay(60000);

-		ToolTipManager.sharedInstance().registerComponent(lblGrafik);

-		lblGrafik.setBounds(82, 11, 391, 110);

-		contentPanel.add(lblGrafik);

-

-		JTextPane txtpnUmDetaillierteInformationen = new JTextPane();

-		txtpnUmDetaillierteInformationen

-				.setText("Um detaillierte Informationen zu erhalten, fahren Sie bitte mit der Maus \u00FCber die Grafik.");

-		txtpnUmDetaillierteInformationen.setEditable(false);

-		txtpnUmDetaillierteInformationen.setBackground(SystemColor.menu);

-		txtpnUmDetaillierteInformationen.setBounds(10, 113, 509, 22);

-		contentPanel.add(txtpnUmDetaillierteInformationen);

-		{

-			JPanel buttonPane = new JPanel();

-			buttonPane.setBounds(0, 630, 587, 33);

-			buttonPane.setBackground(SystemColor.menu);

-			buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT));

-			getContentPane().add(buttonPane);

-			{

-				JButton continueButton = new JButton("Weiter");

-

-				continueButton.addActionListener(new ActionListener() {

-					public void actionPerformed(ActionEvent e) {

-

-						if (rdbtnImageNew.isSelected() == true) {

-							EingabeImageAllgemein_GUI sr = new EingabeImageAllgemein_GUI();

-							sr.setVisible(true);

-							dispose();

-						} else if (rdbtnImageEdit.isSelected() == true) {

-

-							SearchEditImage_GUI si = new SearchEditImage_GUI();

-							si.setVisible(true);

-							dispose();

-						} else if (rdbtnImageSearchDownload.isSelected() == true) {

-							SearchMethod_GUI sm = new SearchMethod_GUI();

-							sm.setVisible(true);

-							dispose();

-						} else if (rdbtnImageDelete.isSelected() == true) {

-							DeleteImage_GUI di = new DeleteImage_GUI();

-							di.setVisible(true);

-							dispose();

-						} else if (rdbtnVeranstaltungNew.isSelected() == true) {

-							EingabeVeranstaltungAllgemein_GUI av = new EingabeVeranstaltungAllgemein_GUI();

-							av.setVisible(true);

-							dispose();

-						} else if (rdbtnVeranstaltungEdit.isSelected() == true) {

-							SearchEditLecture_GUI sl = new SearchEditLecture_GUI();

-							sl.setVisible(true);

-							dispose();

-						}

-					}

-				});

-				continueButton.setActionCommand("OK");

-				buttonPane.add(continueButton);

-				getRootPane().setDefaultButton(continueButton);

-			}

-		}

-		{

-			JSeparator separator = new JSeparator();

-			separator.setBounds(0, 617, 587, 2);

-			getContentPane().add(separator);

-		}

-		{

-			JSeparator separator = new JSeparator();

-			separator.setBounds(0, 91, 587, 2);

-			getContentPane().add(separator);

-		}

-

-		JMenuBar menuBar = new JMenuBar();

-		setJMenuBar(menuBar);

-

-		JMenu mnNewMenu_1 = new JMenu("Hilfe");

-		menuBar.add(mnNewMenu_1);

-

-		JMenuItem mntmFaq = new JMenuItem("FAQ");

-		mnNewMenu_1.add(mntmFaq);

-

-		JMenuItem mntmOtrs = new JMenuItem("OTRS");

-		mnNewMenu_1.add(mntmOtrs);

-

-	}// end main

-

-}// end class

diff --git a/Dozentenmodul/src/ftp/DownloadTask.java b/Dozentenmodul/src/ftp/DownloadTask.java
index 8a643325..83ad2c15 100644
--- a/Dozentenmodul/src/ftp/DownloadTask.java
+++ b/Dozentenmodul/src/ftp/DownloadTask.java
@@ -1,6 +1,6 @@
 package ftp;
 
-import gui.FTPDownloader_GUI;
+import gui.image.FTPDownloader_GUI;
 
 import java.io.File;
 import java.io.FileOutputStream;
diff --git a/Dozentenmodul/src/gui/BillOfRights_GUI.java b/Dozentenmodul/src/gui/BillOfRights_GUI.java
deleted file mode 100644
index a18ce291..00000000
--- a/Dozentenmodul/src/gui/BillOfRights_GUI.java
+++ /dev/null
@@ -1,192 +0,0 @@
-package gui;
-
-import java.awt.Dimension;
-import java.awt.FlowLayout;
-import java.awt.Font;
-import java.awt.SystemColor;
-import java.awt.Toolkit;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.WindowAdapter;
-import java.awt.event.WindowEvent;
-import java.io.File;
-import java.io.IOException;
-
-import javax.swing.JButton;
-import javax.swing.JCheckBox;
-import javax.swing.JFrame;
-import javax.swing.JLabel;
-import javax.swing.JMenu;
-import javax.swing.JMenuBar;
-import javax.swing.JMenuItem;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.JSeparator;
-import javax.swing.JTextArea;
-import javax.swing.JTextPane;
-import javax.swing.SwingConstants;
-import javax.swing.UIManager;
-import javax.swing.UnsupportedLookAndFeelException;
-import javax.swing.border.EmptyBorder;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
-
-import org.ini4j.InvalidFileFormatException;
-import org.ini4j.Wini;
-
-
-
-@SuppressWarnings("serial")
-public class BillOfRights_GUI extends JFrame {
-
-	private final JPanel contentPanel = new JPanel();
-	String[] result;
-	JButton fwdButton;
-	JCheckBox chckbxAkzeptieren;
-
-	/**
-	 * Create the dialog.
-	 */
-	public BillOfRights_GUI() {
-		setResizable(false);
-
-		addWindowListener(new WindowAdapter() {
-			@Override
-			public void windowClosing(WindowEvent arg0) {
-				//Beendet das Programm beim Klick auf das X
-				System.exit(0);
-			}
-		});
-		try {
-			//Setzt das Look & Feel auf das System 
-			UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
-		} catch (ClassNotFoundException | InstantiationException
-				| IllegalAccessException | UnsupportedLookAndFeelException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		//Setzt den Fenstertitel
-		setTitle("bwLehrpool Suite *Prototyp*");
-		
-		//Zentiert das Fenster in der Bildschirmmitte
-		Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
-		int top=(screenSize.height - 722) / 2;
-		int left=(screenSize.width - 603) / 2;
-		setBounds(left, top, 603, 722);
-		
-		getContentPane().setLayout(null);
-		{
-			JPanel panel = new JPanel();
-			panel.setBackground(SystemColor.menu);
-			panel.setBounds(10, 11, 567, 60);
-			getContentPane().add(panel);
-			panel.setLayout(null);
-			{
-				JLabel lblNewLabel = new JLabel("Hinweis");
-				lblNewLabel.setBounds(10, 11, 509, 22);
-				panel.add(lblNewLabel);
-				lblNewLabel.setFont(new Font("Tahoma", Font.PLAIN, 18));
-			}
-			
-			JTextPane txtpnBitteWhlenSie = new JTextPane();
-			txtpnBitteWhlenSie.setEditable(false);
-			txtpnBitteWhlenSie.setBackground(SystemColor.menu);
-			txtpnBitteWhlenSie.setText("Bitte lesen und best\u00E4tigen Sie folgende rechtliche Hinweise");
-			txtpnBitteWhlenSie.setBounds(10, 36, 509, 22);
-			panel.add(txtpnBitteWhlenSie);
-		}
-		contentPanel.setBounds(10, 95, 567, 485);
-		contentPanel.setBackground(SystemColor.menu);
-		contentPanel.setBorder(new EmptyBorder(5, 5, 5, 5));
-		getContentPane().add(contentPanel);
-		contentPanel.setLayout(null);
-		
-		JTextArea txtrLoremIpsumDolor = new JTextArea();
-		txtrLoremIpsumDolor.setWrapStyleWord(true);
-		txtrLoremIpsumDolor.setLineWrap(true);
-		txtrLoremIpsumDolor.setEditable(false);
-		JScrollPane scr=new JScrollPane(txtrLoremIpsumDolor);
-		scr.setBounds(0, 0, 567, 477);
-		txtrLoremIpsumDolor.setBounds(0, 0, 567, 477);
-		txtrLoremIpsumDolor.setText("Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.   \r\n\r\nDuis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat.   \r\n\r\nUt wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi.   \r\n\r\nNam liber tempor cum soluta nobis eleifend option congue nihil imperdiet doming id quod mazim placerat facer possim assum. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat.   \r\n\r\nDuis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis.   \r\n\r\nAt vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, At accusam aliquyam diam diam dolore dolores duo eirmod eos erat, et nonumy sed tempor et et invidunt justo labore Stet clita ea et gubergren, kasd magna no rebum. sanctus sea sed takimata ut vero voluptua. est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat.   \r\n\r\nConsetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus.   \r\n\r\nLorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.   \r\n\r\nDuis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat.   \r\n\r\nUt wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi.   \r\n\r\nNam liber tempor cum soluta nobis eleifend option congue nihil imperdiet doming id quod mazim placerat facer possim assum. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo");
-		
-		contentPanel.add(scr);
-		{
-			JPanel buttonPane = new JPanel();
-			buttonPane.setBounds(0, 630, 587, 33);
-			buttonPane.setBackground(SystemColor.menu);
-			buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT));
-			getContentPane().add(buttonPane);
-			{
-				fwdButton = new JButton("Weiter");
-				fwdButton.addActionListener(new ActionListener() {
-					public void actionPerformed(ActionEvent e) {
-						try {
-							Wini ini=new Wini(new File("C:\\Users\\"+System.getProperty("user.name")+"\\AppData\\Roaming\\bwLehrpoolSuite\\config.ini"));
-							ini.put("main", "BillOfRights",true);
-							ini.store();
-						} catch (InvalidFileFormatException e1) {
-							// TODO Auto-generated catch block
-							e1.printStackTrace();
-						} catch (IOException e1) {
-							// TODO Auto-generated catch block
-							e1.printStackTrace();
-						}
-						VmWareLink_GUI ac=new VmWareLink_GUI();
-						ac.setVisible(true);
-						dispose();
-					}
-				});
-				fwdButton.setEnabled(false);
-		
-				buttonPane.add(fwdButton);
-			}
-		}
-		{
-			JSeparator separator = new JSeparator();
-			separator.setBounds(0, 617, 587, 2);
-			getContentPane().add(separator);
-		}
-		{
-			JSeparator separator = new JSeparator();
-			separator.setBounds(0, 82, 587, 2);
-			getContentPane().add(separator);
-		}
-		
-		chckbxAkzeptieren = new JCheckBox("Ja, ich akzeptiere die Vereinbarung. Benachrichtigung nicht mehr anzeigen.");
-		chckbxAkzeptieren.addChangeListener(new ChangeListener() {
-			public void stateChanged(ChangeEvent arg0) {
-				//Beim Akzeptieren der Bestätigung wird der Weiter-Button verfügbar gemacht
-				if(chckbxAkzeptieren.isSelected()==true)
-				{
-
-					fwdButton.setEnabled(true);
-
-				}
-				else
-				{
-					
-				}
-			}
-		});
-		chckbxAkzeptieren.setBackground(SystemColor.menu);
-		chckbxAkzeptieren.setBounds(10, 587, 567, 23);
-		getContentPane().add(chckbxAkzeptieren);
-		
-		JMenuBar menuBar = new JMenuBar();
-		setJMenuBar(menuBar);
-		
-		JMenu mnNewMenu_1 = new JMenu("Hilfe");
-		mnNewMenu_1.setHorizontalAlignment(SwingConstants.CENTER);
-		menuBar.add(mnNewMenu_1);
-		
-		JMenuItem mntmFaq = new JMenuItem("FAQ");
-		mnNewMenu_1.add(mntmFaq);
-		
-		JMenuItem mntmOtrs = new JMenuItem("OTRS");
-		mnNewMenu_1.add(mntmOtrs);
-		
-		
-
-	}
-}
diff --git a/Dozentenmodul/src/gui/EditImageAllgemein_GUI.java b/Dozentenmodul/src/gui/EditImageAllgemein_GUI.java
deleted file mode 100644
index 1d30e9d0..00000000
--- a/Dozentenmodul/src/gui/EditImageAllgemein_GUI.java
+++ /dev/null
@@ -1,350 +0,0 @@
-package gui;
-
-import java.awt.Color;
-import java.awt.Dimension;
-import java.awt.FlowLayout;
-import java.awt.Font;
-import java.awt.SystemColor;
-import java.awt.Toolkit;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-import java.awt.event.WindowAdapter;
-import java.awt.event.WindowEvent;
-import java.util.Map;
-
-import javax.swing.JButton;
-import javax.swing.JFrame;
-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.JSeparator;
-import javax.swing.JTextArea;
-import javax.swing.JTextField;
-import javax.swing.JTextPane;
-import javax.swing.UIManager;
-import javax.swing.UnsupportedLookAndFeelException;
-import javax.swing.border.EmptyBorder;
-import javax.swing.border.TitledBorder;
-
-import org.apache.thrift.TException;
-
-import models.Image;
-import models.person;
-import server.Server.Client;
-import thrift.ThriftConnection;
-//import org.eclipse.wb.swing.FocusTraversalOnArray;
-import java.awt.Component;
-
-@SuppressWarnings("serial")
-public class EditImageAllgemein_GUI extends JFrame {
-
-	private final JPanel contentPanel = new JPanel();
-	String[] result;
-	private JTextField Vorname;
-	private JTextField Nachname;
-	private JTextField Hochschule;
-	private JTextField EMail;
-	private JTextField imagename;
-    ThriftConnection con=new ThriftConnection();
-    Client client=con.getThriftConnection();
-    private JPanel panel_2;
-    private JLabel lblNewLabel;
-    private JTextPane txtpnBitteWhlenSie;
-    private JPanel buttonPane;
-    private JButton backButton;
-    private JButton okButton;
-
-	/**
-	 * Create the dialog.
-	 */
-	public EditImageAllgemein_GUI() {
-		addWindowListener(new WindowAdapter() {
-			@Override
-			public void windowClosing(WindowEvent arg0) {
-				//Beendet die Anwendung bei einem Klick auf das X
-				con.closeThriftConnection();
-				System.exit(0);
-			}
-		});
-		//Verhindert das vergrößern des Fensters
-		setResizable(false);
-		
-		try {
-			UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
-		} catch (ClassNotFoundException | InstantiationException
-				| IllegalAccessException | UnsupportedLookAndFeelException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		//Setzt den Fenstertitel
-		setTitle("bwLehrpool Suite *Prototyp*");
-
-		//Zentriert das Fenster in der Bildmitte
-		Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
-		int top=(screenSize.height - 722) / 2;
-		int left=(screenSize.width - 603) / 2;
-		setBounds(left, top, 603, 722);
-		initData();
-		getContentPane().setLayout(null);
-		{
-			panel_2 = new JPanel();
-			panel_2.setBackground(SystemColor.menu);
-			panel_2.setBounds(10, 11, 577, 57);
-			getContentPane().add(panel_2);
-			panel_2.setLayout(null);
-			{
-				lblNewLabel = new JLabel("Bearbeiten Ihrer Daten");
-				lblNewLabel.setBounds(10, 11, 509, 22);
-				panel_2.add(lblNewLabel);
-				lblNewLabel.setFont(new Font("Tahoma", Font.BOLD, 18));
-			}
-			
-			txtpnBitteWhlenSie = new JTextPane();
-			txtpnBitteWhlenSie.setEditable(false);
-			txtpnBitteWhlenSie.setBackground(SystemColor.menu);
-			txtpnBitteWhlenSie.setText("Geben Sie hier bitte einen sprechenden Imagename sowie Ihre Kontaktdaten an");
-			txtpnBitteWhlenSie.setBounds(10, 36, 509, 32);
-			panel_2.add(txtpnBitteWhlenSie);
-		}
-		contentPanel.setBounds(10, 85, 577, 493);
-		contentPanel.setBackground(SystemColor.menu);
-		contentPanel.setBorder(new EmptyBorder(5, 5, 5, 5));
-		getContentPane().add(contentPanel);
-		contentPanel.setLayout(null);
-		
-		JPanel panel_1 = new JPanel();
-		panel_1.setBackground(SystemColor.menu);
-		panel_1.setBorder(new TitledBorder(null, "Informationen zum Besitzer", TitledBorder.LEADING, TitledBorder.TOP, null, null));
-		panel_1.setBounds(10, 66, 557, 369);
-		contentPanel.add(panel_1);
-		panel_1.setLayout(null);
-		
-		JLabel label = new JLabel("Vorname: *");
-		label.setBackground(SystemColor.menu);
-		label.setBounds(10, 245, 125, 20);
-		panel_1.add(label);
-		
-		Vorname = new JTextField();
-		Vorname.setEditable(false);
-		Vorname.setEnabled(false);
-		Vorname.setBackground(Color.WHITE);
-		Vorname.setText(person.verantwortlicher.getVorname());
-		Vorname.setColumns(10);
-		Vorname.setBounds(145, 245, 350, 20);
-		panel_1.add(Vorname);
-		
-		JLabel label_7 = new JLabel("Nachname: *");
-		label_7.setBackground(SystemColor.menu);
-		label_7.setBounds(10, 276, 125, 20);
-		panel_1.add(label_7);
-		
-		Nachname = new JTextField();
-		Nachname.setEnabled(false);
-		Nachname.setEditable(false);
-		Nachname.setBackground(Color.WHITE);
-		Nachname.setText(person.verantwortlicher.getName());
-		Nachname.setColumns(10);
-		Nachname.setBounds(145, 276, 350, 20);
-		panel_1.add(Nachname);
-		
-		JLabel label_8 = new JLabel("Hochschule: *");
-		label_8.setBackground(SystemColor.menu);
-		label_8.setBounds(10, 307, 125, 20);
-		panel_1.add(label_8);
-		
-		Hochschule = new JTextField();
-		Hochschule.setEnabled(false);
-		Hochschule.setEditable(false);
-		Hochschule.setBackground(Color.WHITE);
-		Hochschule.setText(person.verantwortlicher.getHochschule());
-		Hochschule.setColumns(10);
-		Hochschule.setBounds(145, 307, 350, 20);
-		panel_1.add(Hochschule);
-		
-		JLabel label_9 = new JLabel("E-Mail: *");
-		label_9.setBackground(SystemColor.menu);
-		label_9.setBounds(10, 338, 125, 20);
-		panel_1.add(label_9);
-		
-		EMail = new JTextField();
-		EMail.setEnabled(false);
-		EMail.setEditable(false);
-		EMail.setBackground(Color.WHITE);
-		EMail.setText(person.verantwortlicher.getEMail());
-		EMail.setColumns(10);
-		EMail.setBounds(145, 338, 350, 20);
-		panel_1.add(EMail);
-		
-		JLabel lblImagename = new JLabel("Imagename: *");
-		lblImagename.setBackground(SystemColor.menu);
-		lblImagename.setBounds(10, 31, 125, 20);
-		panel_1.add(lblImagename);
-		
-		imagename = new JTextField();
-		imagename.setToolTipText("Bitte geben Sie hier den Namen des Image ein, z.B. \"Programmieren\".");
-		imagename.setBackground(Color.WHITE);
-		imagename.setText(Image.image.getImagename());
-		imagename.setColumns(10);
-		imagename.setBounds(145, 31, 350, 20);
-		panel_1.add(imagename);
-		
-		JTextArea txtrGebenSieBitte = new JTextArea();
-		txtrGebenSieBitte.setBackground(SystemColor.menu);
-		txtrGebenSieBitte.setLineWrap(true);
-		txtrGebenSieBitte.setFont(new Font("Tahoma", Font.PLAIN, 12));
-		txtrGebenSieBitte.setText("Geben Sie bitte einen sprechenden Namen f\u00FCr das Image an.\r\nDieser soll jedoch recht allgemein gehalten werden.\r\nBeispiel: \"Programmieren\", nicht \"Programmieren 1\"");
-		txtrGebenSieBitte.setBounds(145, 62, 350, 110);
-		panel_1.add(txtrGebenSieBitte);
-		
-		JPanel panel = new JPanel();
-		panel.setBounds(10, 402, 577, 33);
-		contentPanel.add(panel);
-		panel.setLayout(null);
-		panel.setBorder(new EmptyBorder(5, 5, 5, 5));
-		panel.setBackground(SystemColor.menu);
-		
-		JLabel lblPflichtfelder = new JLabel("* Pflichtfelder");
-		lblPflichtfelder.setBounds(10, 442, 136, 14);
-		contentPanel.add(lblPflichtfelder);
-		
-		JLabel lblHauptmen = new JLabel("Hauptmen\u00FC");
-		lblHauptmen.addMouseListener(new MouseAdapter() {
-			@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);
-			}
-		});
-		lblHauptmen.setForeground(Color.BLUE);
-		lblHauptmen.setBounds(10, 11, 61, 14);
-		contentPanel.add(lblHauptmen);
-		
-		JLabel label_1 = new JLabel(">");
-		label_1.setBounds(69, 11, 13, 14);
-		contentPanel.add(label_1);
-		
-		JLabel lblVlimage = new JLabel("VL-Image");
-		lblVlimage.setForeground(Color.BLUE);
-		lblVlimage.setBounds(81, 11, 45, 14);
-		contentPanel.add(lblVlimage);
-		
-		JLabel label_2 = new JLabel(">");
-		label_2.setBounds(133, 11, 13, 14);
-		contentPanel.add(label_2);
-		
-		JLabel lblNewLabel_1 = new JLabel("Bearbeiten");
-		lblNewLabel_1.setBounds(146, 11, 71, 14);
-		contentPanel.add(lblNewLabel_1);
-		{
-			buttonPane = new JPanel();
-			buttonPane.setBounds(0, 640, 597, 33);
-			buttonPane.setBackground(SystemColor.menu);
-			buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT));
-			getContentPane().add(buttonPane);
-			{
-				backButton = new JButton("Zur\u00FCck");
-				backButton.addActionListener(new ActionListener() {
-					public void actionPerformed(ActionEvent e) {
-						
-						//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();
-					}
-				});
-				backButton.setActionCommand("CANCEL");
-				buttonPane.add(backButton);
-				
-			}
-			{
-				okButton = new JButton("Weiter");
-				okButton.addActionListener(new ActionListener() {
-					public void actionPerformed(ActionEvent arg0) {
-						System.out.println("text length="+imagename.getText().length());
-						//Setzen der Eingabe im Model, dadurch bleiben die Daten bei einem erneuten Aufruf verfügbar
-
-						//TODO
-						//Prüfung ob alle notwendigen Felder ausgefüllt sind --> funktioniert aktuell nicht
-						//der Button wechselt beim Klick auf die nächste Seite, selbst wenn kein handler implementiert ist... WTF???
-						if(imagename.getText().length() <= 0){
-							JOptionPane.showMessageDialog(null,
-								    "Bitte geben Sie einen Labornamen ein.",
-								    "Daten nicht vollständig",
-								    JOptionPane.WARNING_MESSAGE);
-						} else {
-							Image.image.setNewName(imagename.getText());
-							con.closeThriftConnection();
-							EditImageTechnisch_GUI ea=new EditImageTechnisch_GUI();
-							ea.setVisible(true);
-							dispose();
-						}//end else
-					}
-				});
-				
-				okButton.setActionCommand("OK");
-				buttonPane.add(okButton);
-				getRootPane().setDefaultButton(okButton);
-			}
-		}
-		
-		JSeparator separator = new JSeparator();
-		separator.setBounds(0, 78, 597, 2);
-		getContentPane().add(separator);
-		
-		JSeparator separator_1 = new JSeparator();
-		separator_1.setBounds(0, 627, 597, 2);
-		getContentPane().add(separator_1);
-		
-		JMenuBar menuBar = new JMenuBar();
-		setJMenuBar(menuBar);
-		
-		JMenu mnNewMenu_1 = new JMenu("Hilfe");
-		menuBar.add(mnNewMenu_1);
-		
-		JMenuItem mntmFaq = new JMenuItem("FAQ");
-		mnNewMenu_1.add(mntmFaq);
-		
-		JMenuItem mntmOtrs = new JMenuItem("OTRS");
-		mnNewMenu_1.add(mntmOtrs);
-		//setFocusTraversalPolicy(new FocusTraversalOnArray(new Component[]{getContentPane(), panel_2, lblNewLabel, txtpnBitteWhlenSie, contentPanel, panel_1, label, Vorname, label_7, Nachname, label_8, Hochschule, label_9, EMail, lblImagename, imagename, txtrGebenSieBitte, panel, lblPflichtfelder, lblHauptmen, label_1, lblVlimage, label_2, lblNewLabel_1, buttonPane, backButton, okButton, separator, separator_1, menuBar, mnNewMenu_1, mntmFaq, mntmOtrs}));
-		
-	}
-	
-	public void initData(){
-		try {
-			
-			Map<String,String> map=client.getImageData(Image.image.getImageId(),Image.image.getVersion());
-			if(map.get("internet").equals("0")){
-				Image.image.setInternet(false);
-			}
-			else
-			{
-				Image.image.setInternet(true);
-			}
-			if(map.get("license").equals("0")){
-				Image.image.setLicensed(false);
-			}
-			else{
-				Image.image.setLicensed(true);
-			}
-			Image.image.setImagename(map.get("name"));
-			Image.image.setRam(Integer.parseInt(map.get("ram")));
-			Image.image.setCpu(Integer.parseInt(map.get("cpu")));
-		} catch (TException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-	}
-	
-
-}
diff --git a/Dozentenmodul/src/gui/EditImageTechnisch_GUI.java b/Dozentenmodul/src/gui/EditImageTechnisch_GUI.java
deleted file mode 100644
index 3c6109ae..00000000
--- a/Dozentenmodul/src/gui/EditImageTechnisch_GUI.java
+++ /dev/null
@@ -1,366 +0,0 @@
-package gui;
-
-
-import java.awt.Color;
-import java.awt.Dimension;
-import java.awt.FlowLayout;
-import java.awt.Font;
-import java.awt.SystemColor;
-import java.awt.Toolkit;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-import java.awt.event.WindowAdapter;
-import java.awt.event.WindowEvent;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.swing.ButtonGroup;
-import javax.swing.JButton;
-import javax.swing.JFrame;
-import javax.swing.JLabel;
-import javax.swing.JMenu;
-import javax.swing.JMenuBar;
-import javax.swing.JMenuItem;
-import javax.swing.JPanel;
-import javax.swing.JRadioButton;
-import javax.swing.JSeparator;
-import javax.swing.JSpinner;
-import javax.swing.JTextArea;
-import javax.swing.JTextPane;
-import javax.swing.SpinnerNumberModel;
-import javax.swing.UIManager;
-import javax.swing.UnsupportedLookAndFeelException;
-import javax.swing.border.EmptyBorder;
-import javax.swing.border.TitledBorder;
-
-import org.apache.thrift.TException;
-
-import server.Server.Client;
-import thrift.ThriftConnection;
-
-import models.Image;
-
-@SuppressWarnings("serial")
-public class EditImageTechnisch_GUI extends JFrame {
-
-	private final JPanel contentPanel = new JPanel();
-	String[] result;
-	JSpinner spinnerCPU;
-	JSpinner spinnerRam;
-	JRadioButton rdbtnlicenseJa;
-	JRadioButton rdbtnlicenseNein;
-	JRadioButton rdbtnInternetJa;
-	JRadioButton rdbtnInternetNein;
-	private final ButtonGroup buttonGrouplicense = new ButtonGroup();
-	private final ButtonGroup buttonGroupInternet = new ButtonGroup();
-
-
-	/**
-	 * Create the dialog.
-	 */
-	public EditImageTechnisch_GUI() {
-		addWindowListener(new WindowAdapter() {
-			@Override
-			public void windowClosing(WindowEvent arg0) {
-				//Beendet die Anwendung bei Klick auf das X 
-				
-				System.exit(0);
-			}
-			
-		});
-		//Verhindert das Vergrößern des Fensters
-		setResizable(false);
-		
-		try {
-			//setzt das Look & Feel
-			UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
-		} catch (ClassNotFoundException | InstantiationException
-				| IllegalAccessException | UnsupportedLookAndFeelException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		//Setzt den Titel des Fensters
-		setTitle("bwLehrpool Suite *Prototyp*");
-		//Zentriert das Fenster
-		Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
-		int top=(screenSize.height - 722) / 2;
-		int left=(screenSize.width - 603) / 2;
-		setBounds(left, top, 603, 722);
-	
-		
-		getContentPane().setLayout(null);
-		{
-			JPanel panel = new JPanel();
-			panel.setBackground(SystemColor.menu);
-			panel.setBounds(10, 11, 577, 57);
-			getContentPane().add(panel);
-			panel.setLayout(null);
-			{
-				JLabel lblNewLabel = new JLabel("Eingabe Ihrer Daten");
-				lblNewLabel.setBounds(10, 11, 509, 22);
-				panel.add(lblNewLabel);
-				lblNewLabel.setFont(new Font("Tahoma", Font.BOLD, 18));
-			}
-			
-			JTextPane txtpnBitteWhlenSie = new JTextPane();
-			txtpnBitteWhlenSie.setEditable(false);
-			txtpnBitteWhlenSie.setBackground(SystemColor.menu);
-			txtpnBitteWhlenSie.setText("Geben Sie hier bitte einen sprechenden Imagename sowie Ihre Kontaktdaten an");
-			txtpnBitteWhlenSie.setBounds(10, 36, 509, 32);
-			panel.add(txtpnBitteWhlenSie);
-		}
-		contentPanel.setBounds(10, 85, 577, 493);
-		contentPanel.setBackground(SystemColor.menu);
-		contentPanel.setBorder(new EmptyBorder(5, 5, 5, 5));
-		getContentPane().add(contentPanel);
-		contentPanel.setLayout(null);
-
-		JPanel panel_1 = new JPanel();
-		panel_1.setBackground(SystemColor.menu);
-		panel_1.setBorder(new TitledBorder(null, "Informationen zum Image", TitledBorder.LEADING, TitledBorder.TOP, null, null));
-		panel_1.setBounds(10, 66, 557, 95);
-		contentPanel.add(panel_1);
-		panel_1.setLayout(null);
-		
-		JLabel lblNewLabel_2 = new JLabel("Image enth\u00E4lt lizenzpflichtige Software:");
-		lblNewLabel_2.setBounds(10, 30, 250, 20);
-		panel_1.add(lblNewLabel_2);
-		
-		rdbtnlicenseJa = new JRadioButton("Ja");
-		rdbtnlicenseJa.setSelected(true);
-		buttonGrouplicense.add(rdbtnlicenseJa);
-		rdbtnlicenseJa.setBounds(266, 29, 109, 23);
-		panel_1.add(rdbtnlicenseJa);
-		
-		rdbtnlicenseNein = new JRadioButton("Nein");
-		buttonGrouplicense.add(rdbtnlicenseNein);
-		rdbtnlicenseNein.setBounds(377, 29, 109, 23);
-		panel_1.add(rdbtnlicenseNein);
-		if(Image.image.isLicensed()==true){
-			rdbtnlicenseJa.setSelected(true);
-		}
-		else
-		{
-			rdbtnlicenseNein.setSelected(true);
-		}
-		
-
-		
-		JLabel lblInternetIstInnerhalb = new JLabel("Internet ist innerhalb des Image gesperrt:");
-		lblInternetIstInnerhalb.setBounds(10, 58, 250, 20);
-		panel_1.add(lblInternetIstInnerhalb);
-		
-		rdbtnInternetJa = new JRadioButton("Ja");
-		buttonGroupInternet.add(rdbtnInternetJa);
-		rdbtnInternetJa.setBounds(266, 57, 109, 23);
-		panel_1.add(rdbtnInternetJa);
-		
-		rdbtnInternetNein = new JRadioButton("Nein");
-		rdbtnInternetNein.setSelected(true);
-		buttonGroupInternet.add(rdbtnInternetNein);
-		rdbtnInternetNein.setBounds(377, 57, 109, 23);
-		panel_1.add(rdbtnInternetNein);
-		if(Image.image.isInternet()==true){
-			rdbtnInternetJa.setSelected(true);
-		}
-		else
-		{
-			rdbtnInternetNein.setSelected(true);
-		}
-		JLabel lblHauptmen = new JLabel("Hauptmen\u00FC");
-		lblHauptmen.addMouseListener(new MouseAdapter() {
-			@Override
-			public void mouseClicked(MouseEvent arg0) {
-				//Macht dieses Fenster unsichtbar und das vorhergehende Fenster sichtbar
-				EditImageTechnisch_GUI.this.setVisible(false);
-				MainMenue_GUI main=new MainMenue_GUI();
-				main.setVisible(true);
-			}
-		});
-		lblHauptmen.setForeground(Color.BLUE);
-		lblHauptmen.setBounds(10, 11, 61, 14);
-		contentPanel.add(lblHauptmen);
-		
-		JLabel label_1 = new JLabel(">");
-		label_1.setBounds(69, 11, 13, 14);
-		contentPanel.add(label_1);
-		
-		JLabel lblVlimage = new JLabel("VL-Image");
-		lblVlimage.setForeground(Color.BLUE);
-		lblVlimage.setBounds(81, 11, 45, 14);
-		contentPanel.add(lblVlimage);
-		
-		JLabel label_2 = new JLabel(">");
-		label_2.setBounds(133, 11, 13, 14);
-		contentPanel.add(label_2);
-		
-		JLabel lblNewLabel_1 = new JLabel("Neu");
-		lblNewLabel_1.setBounds(146, 11, 46, 14);
-		contentPanel.add(lblNewLabel_1);
-		
-		JPanel panel_2 = new JPanel();
-		panel_2.setLayout(null);
-		panel_2.setBorder(new TitledBorder(null, "Empfehlung bezüglich Ressourcen", TitledBorder.LEADING, TitledBorder.TOP, null, null));
-		panel_2.setBackground(SystemColor.menu);
-		panel_2.setBounds(10, 172, 557, 338);
-		contentPanel.add(panel_2);
-		
-		JTextArea txtrHinweisSolltenSie = new JTextArea();
-		txtrHinweisSolltenSie.setBackground(SystemColor.menu);
-		txtrHinweisSolltenSie.setFont(new Font("Tahoma", Font.PLAIN, 13));
-		txtrHinweisSolltenSie.setText("Hinweis: Sollten Sie keine Software einsetzen, die viele Ressourcen ben\u00F6tigt,\r\nk\u00F6nnen Sie sich an den Beispielwerten orientieren.");
-		txtrHinweisSolltenSie.setBounds(10, 25, 537, 55);
-		panel_2.add(txtrHinweisSolltenSie);
-		
-		JLabel lblNewLabel_3 = new JLabel("Wie viel Arbeitsspeicher empfehlen Sie f\u00FCr das Image:");
-		lblNewLabel_3.setBounds(10, 91, 280, 20);
-		panel_2.add(lblNewLabel_3);
-		
-		JLabel lblMindestens = new JLabel("mindestens");
-		lblMindestens.setBounds(315, 91, 60, 20);
-		panel_2.add(lblMindestens);
-		
-		spinnerRam = new JSpinner();
-		spinnerRam.setModel(new SpinnerNumberModel(1, 1, 8, 1));
-		spinnerRam.setBounds(385, 88, 29, 20);
-		spinnerRam.setValue(Image.image.getRam());
-		panel_2.add(spinnerRam);
-		
-		JLabel lblGbyte = new JLabel("GByte");
-		lblGbyte.setBounds(424, 91, 46, 20);
-		panel_2.add(lblGbyte);
-		
-		JTextArea txtrBeispielWindows = new JTextArea();
-		txtrBeispielWindows.setText("Beispiel:\r\nWindows 7 32/64 Bit: 2 GByte\r\nLinux/Unix 32/64 Bit:  1 GByte");
-		txtrBeispielWindows.setFont(new Font("Tahoma", Font.PLAIN, 11));
-		txtrBeispielWindows.setBackground(SystemColor.menu);
-		txtrBeispielWindows.setBounds(20, 111, 280, 55);
-		panel_2.add(txtrBeispielWindows);
-		
-		JTextArea txtrBeispielWindows_1 = new JTextArea();
-		txtrBeispielWindows_1.setText("Beispiel:\r\nWindows 7 32/64 Bit: 1 Kern\r\nLinux/Unix 32/64 Bit:  1 Kern");
-		txtrBeispielWindows_1.setFont(new Font("Tahoma", Font.PLAIN, 11));
-		txtrBeispielWindows_1.setBackground(SystemColor.menu);
-		txtrBeispielWindows_1.setBounds(20, 226, 280, 55);
-		panel_2.add(txtrBeispielWindows_1);
-		
-		JLabel lblWieVieleCpus = new JLabel("Wie viele CPUs empfehlen Sie f\u00FCr das Image:");
-		lblWieVieleCpus.setBounds(10, 201, 280, 20);
-		panel_2.add(lblWieVieleCpus);
-		
-		JLabel label_3 = new JLabel("mindestens");
-		label_3.setBounds(315, 201, 60, 20);
-		panel_2.add(label_3);
-		
-		spinnerCPU = new JSpinner();
-		spinnerCPU.setModel(new SpinnerNumberModel(1, 1, 4, 1));
-		spinnerCPU.setBounds(385, 198, 29, 20);
-		spinnerCPU.setValue(Image.image.getCpu());
-		panel_2.add(spinnerCPU);
-		
-		JLabel lblKerne = new JLabel("Kerne");
-		lblKerne.setBounds(424, 201, 46, 20);
-		panel_2.add(lblKerne);
-		{
-			JPanel buttonPane = new JPanel();
-			buttonPane.setBounds(0, 640, 597, 33);
-			buttonPane.setBackground(SystemColor.menu);
-			buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT));
-			getContentPane().add(buttonPane);
-			{
-				JButton okButton = new JButton("Zur\u00FCck");
-				okButton.addActionListener(new ActionListener() {
-					public void actionPerformed(ActionEvent e) {
-						//Setzt die Imagewerte in das Model
-						Image.image.setCpu(Integer.valueOf(spinnerCPU.getValue().toString()).intValue());
-						Image.image.setRam(Integer.valueOf(spinnerRam.getValue().toString()).intValue());
-						if(rdbtnInternetJa.isSelected()==true)
-						{
-							Image.image.setInternet(true);
-						}
-						else
-						{
-							Image.image.setInternet(false);
-						}
-						
-						if(rdbtnlicenseJa.isSelected()==true)
-						{
-							Image.image.setLicensed(true);
-						}
-						else
-						{
-							Image.image.setLicensed(false);
-						}
-						//Öffnet das vorherige Fenster
-						EingabeImageAllgemein_GUI sr=new EingabeImageAllgemein_GUI();
-						sr.setVisible(true);
-						dispose();
-					}
-				});
-				okButton.setActionCommand("OK");
-				buttonPane.add(okButton);
-				getRootPane().setDefaultButton(okButton);
-			}
-			{
-				JButton cancelButton = new JButton("Weiter");
-				cancelButton.addActionListener(new ActionListener() {
-					public void actionPerformed(ActionEvent e) {
-						Image.image.setCpu(Integer.valueOf(spinnerCPU.getValue().toString()).intValue());
-						Image.image.setRam(Integer.valueOf(spinnerRam.getValue().toString()).intValue());
-						if(rdbtnInternetJa.isSelected()==true)
-						{
-							Image.image.setInternet(true);
-						}
-						else
-						{
-							Image.image.setInternet(false);
-						}
-						
-						if(rdbtnlicenseJa.isSelected()==true)
-						{
-							Image.image.setLicensed(true);
-						}
-						else
-						{
-							Image.image.setLicensed(false);
-						}
-						//Öffnet das nächste Fenster
-						FTPEditUploader_GUI ea=new FTPEditUploader_GUI();
-						ea.setVisible(true);
-						dispose();
-						
-					}
-				});
-				cancelButton.setActionCommand("Cancel");
-				buttonPane.add(cancelButton);
-			}
-		}
-		
-		JSeparator separator = new JSeparator();
-		separator.setBounds(0, 78, 597, 2);
-		getContentPane().add(separator);
-		
-		JSeparator separator_1 = new JSeparator();
-		separator_1.setBounds(0, 627, 597, 2);
-		getContentPane().add(separator_1);
-		
-		JMenuBar menuBar = new JMenuBar();
-		setJMenuBar(menuBar);
-
-		JMenu mnNewMenu_1 = new JMenu("Hilfe");
-		menuBar.add(mnNewMenu_1);
-		
-		JMenuItem mntmFaq = new JMenuItem("FAQ");
-		mnNewMenu_1.add(mntmFaq);
-		
-		JMenuItem mntmOtrs = new JMenuItem("OTRS");
-		mnNewMenu_1.add(mntmOtrs);
-		
-	}
-	
-	
-
-	}
-
diff --git a/Dozentenmodul/src/gui/EditLinkImage_GUI.java b/Dozentenmodul/src/gui/EditLinkImage_GUI.java
deleted file mode 100644
index 8de896c3..00000000
--- a/Dozentenmodul/src/gui/EditLinkImage_GUI.java
+++ /dev/null
@@ -1,436 +0,0 @@
-package gui;
-
-
-import java.awt.Color;
-import java.awt.Dimension;
-import java.awt.FlowLayout;
-import java.awt.Font;
-import java.awt.SystemColor;
-import java.awt.Toolkit;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.KeyAdapter;
-import java.awt.event.KeyEvent;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-import java.awt.event.WindowAdapter;
-import java.awt.event.WindowEvent;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.swing.JButton;
-import javax.swing.JComboBox;
-import javax.swing.JDialog;
-import javax.swing.JFrame;
-import javax.swing.JLabel;
-import javax.swing.JMenu;
-import javax.swing.JMenuBar;
-import javax.swing.JMenuItem;
-import javax.swing.JPanel;
-import javax.swing.JRadioButton;
-import javax.swing.JScrollPane;
-import javax.swing.JSeparator;
-import javax.swing.JTabbedPane;
-import javax.swing.JTable;
-import javax.swing.JTextField;
-import javax.swing.JTextPane;
-import javax.swing.UIManager;
-import javax.swing.UnsupportedLookAndFeelException;
-import javax.swing.border.EmptyBorder;
-import javax.swing.border.TitledBorder;
-import javax.swing.table.DefaultTableModel;
-
-import models.Lecture;
-import models.person;
-
-import org.apache.thrift.TException;
-
-import server.Server.Client;
-import thrift.ThriftConnection;
-
-@SuppressWarnings("serial")
-public class EditLinkImage_GUI extends JFrame {
-
-	private final JPanel contentPanel = new JPanel();
-	String[] result;
-	JRadioButton rdbtnInternetJa;
-	JRadioButton rdbtnInternetNein;
-	JComboBox<String> comboBox;
-	JTable tableAllImages;
-	private JTextField textFieldName;
-	String[] titles= {"Image-Name", "Lizenzpflichtig", "OS", "Veranstaltung", "Verantwortlicher", "Letztes Update", "Schlagwort"};
-	ThriftConnection thrift=new ThriftConnection();
-	Client client=thrift.getThriftConnection();
-
-    
-	/**
-	 * Launch the application.
-	 */
-	public static void main(String[] args) {
-		try {
-			EditLinkImage_GUI dialog = new EditLinkImage_GUI();
-			dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
-			dialog.setVisible(true);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * Create the dialog.
-	 */
-	public EditLinkImage_GUI() {
-		addWindowListener(new WindowAdapter() {
-			@Override
-			public void windowClosing(WindowEvent arg0) {
-				System.exit(0);
-			}
-		});
-		setResizable(false);
-		
-		try {
-			UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
-		} catch (ClassNotFoundException | InstantiationException
-				| IllegalAccessException | UnsupportedLookAndFeelException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		setTitle("bwLehrpool Suite *Prototyp*");
-		Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
-		int top=(screenSize.height - 603) / 2;
-		int left=(screenSize.width - 722) / 2;
-		setBounds(left, top, 603, 722);
-		
-
-		final DefaultTableModel modelAll = new DefaultTableModel( titles, 0 );
-		final DefaultTableModel model = new DefaultTableModel( titles, 0 );
-		
-		
-		getContentPane().setLayout(null);
-		{
-			JPanel panel = new JPanel();
-			panel.setBackground(SystemColor.menu);
-			panel.setBounds(10, 11, 577, 57);
-			getContentPane().add(panel);
-			panel.setLayout(null);
-			{
-				JLabel lblNewLabel = new JLabel("Veanstaltung verlinken");
-				lblNewLabel.setBounds(10, 11, 509, 22);
-				panel.add(lblNewLabel);
-				lblNewLabel.setFont(new Font("Tahoma", Font.BOLD, 18));
-			}
-			
-			JTextPane txtpnBitteWhlenSie = new JTextPane();
-			txtpnBitteWhlenSie.setEditable(false);
-			txtpnBitteWhlenSie.setBackground(SystemColor.menu);
-			txtpnBitteWhlenSie.setText("Hier k\u00F6nnen Sie nach Ihrem gew\u00FCnschten VL-Image suchen und dieses f\u00FCr weitere Schritte ausw\u00E4hlen");
-			txtpnBitteWhlenSie.setBounds(10, 36, 509, 32);
-			panel.add(txtpnBitteWhlenSie);
-		}
-		contentPanel.setBounds(10, 85, 577, 531);
-		contentPanel.setBackground(SystemColor.menu);
-		contentPanel.setBorder(new EmptyBorder(5, 5, 5, 5));
-		getContentPane().add(contentPanel);
-		contentPanel.setLayout(null);
-		
-		JPanel panel_1 = new JPanel();
-		panel_1.setBackground(SystemColor.menu);
-		panel_1.setBorder(new TitledBorder(null, "Filterfunktionen", TitledBorder.LEADING, TitledBorder.TOP, null, null));
-		panel_1.setBounds(10, 49, 557, 131);
-		contentPanel.add(panel_1);
-		panel_1.setLayout(null);
-		
-		JLabel lblNewLabel_2 = new JLabel("Anzeigename:");
-		lblNewLabel_2.setBounds(10, 30, 250, 20);
-		panel_1.add(lblNewLabel_2);
-		
-		JLabel lblInternetIstInnerhalb = new JLabel("Betriebssystem:");
-		lblInternetIstInnerhalb.setBounds(10, 58, 250, 20);
-		panel_1.add(lblInternetIstInnerhalb);
-		
-		textFieldName = new JTextField();
-		textFieldName.addKeyListener(new KeyAdapter() {
-			@Override
-			public void keyReleased(KeyEvent e) {
-				String stext=textFieldName.getText();
-				modelAll.setRowCount(0);
-				initTableModel(modelAll);
-				
-				if(stext!="")
-				for(int i=0;i<modelAll.getRowCount();i++){
-					
-					if(modelAll.getValueAt(i, 0).toString().startsWith(stext)){
-						
-					}
-					else
-					{
-						modelAll.removeRow(i);
-					}
-				}
-				
-				
-			}
-			
-			
-		});
-
-		textFieldName.setBounds(270, 30, 250, 20);
-		panel_1.add(textFieldName);
-		textFieldName.setColumns(10);
-		
-		JLabel lblErweiterteSuche = new JLabel("<html><u>Erweiterte Suche</u></html>");
-		lblErweiterteSuche.addMouseListener(new MouseAdapter() {
-			@Override
-			public void mouseClicked(MouseEvent arg0) {
-				ExtendedSearch_GUI es=new ExtendedSearch_GUI();
-				es.setVisible(true);
-			}
-		});
-		lblErweiterteSuche.setForeground(Color.BLUE);
-		
-		lblErweiterteSuche.setBounds(431, 106, 89, 14);
-		panel_1.add(lblErweiterteSuche);
-		
-		comboBox = new JComboBox<String>();
-		try {
-			List<String> list=client.getAllOS();
-			comboBox.addItem("");
-			for(int i=0;i<list.size();i++)
-			{
-			comboBox.addItem(list.get(i));
-			}
-		} catch (TException e2) {
-			// TODO Auto-generated catch block
-			e2.printStackTrace();
-		}
-		comboBox.addActionListener(new ActionListener() {
-			public void actionPerformed(ActionEvent arg0) {
-				modelAll.setRowCount(0);
-				initTableModel(modelAll);
-				String selItem=comboBox.getSelectedItem().toString();
-				if(selItem!="")
-				{
-				for(int i=0;i<modelAll.getRowCount();i++){
-					
-					if(modelAll.getValueAt(i, 2).equals(selItem)){
-						
-					}
-					else
-					{
-						modelAll.removeRow(i);
-					}
-				}
-				
-				
-			}
-			}
-		});
-		comboBox.setBounds(270, 58, 250, 20);
-		panel_1.add(comboBox);
-		
-		JLabel lblHauptmen = new JLabel("Hauptmen\u00FC");
-		lblHauptmen.addMouseListener(new MouseAdapter() {
-			@Override
-			public void mouseClicked(MouseEvent arg0) {
-				
-				EditLinkImage_GUI.this.setVisible(false);
-				MainMenue_GUI main=new MainMenue_GUI();
-				main.setVisible(true);
-			}
-		});
-		lblHauptmen.setForeground(Color.BLUE);
-		lblHauptmen.setBounds(10, 11, 61, 14);
-		contentPanel.add(lblHauptmen);
-		
-		JLabel label_1 = new JLabel(">");
-		label_1.setBounds(69, 11, 13, 14);
-		contentPanel.add(label_1);
-		
-		JLabel lblVlimage = new JLabel("Veranstaltung");
-		lblVlimage.setForeground(Color.BLUE);
-		lblVlimage.setBounds(81, 11, 76, 14);
-		contentPanel.add(lblVlimage);
-		
-		JLabel label_2 = new JLabel(">");
-		label_2.setBounds(151, 11, 13, 14);
-		contentPanel.add(label_2);
-		
-		JLabel lblNewLabel_1 = new JLabel("Veranstaltung verlinken");
-		lblNewLabel_1.setBounds(164, 11, 113, 14);
-		contentPanel.add(lblNewLabel_1);
-		
-		JTabbedPane tabbedPane = new JTabbedPane(JTabbedPane.TOP);
-
-		tabbedPane.setBounds(10, 197, 557, 300);
-		contentPanel.add(tabbedPane);
-		
-		JScrollPane scrollPaneMyImage = new JScrollPane();
-		JTable tablemyImages=new JTable();
-		tablemyImages.setModel(model);
-		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();
-		
-		JScrollPane scrollPaneAllImages = new JScrollPane();
-		tableAllImages=new JTable();
-		tableAllImages.setModel(modelAll);
-		tableAllImages.getColumnModel().getColumn(1).sizeWidthToFit();
-		tableAllImages.getColumnModel().getColumn(2).sizeWidthToFit();
-		tableAllImages.getColumnModel().getColumn(3).sizeWidthToFit();
-		tableAllImages.getColumnModel().getColumn(4).sizeWidthToFit();
-		tableAllImages.getColumnModel().getColumn(5).sizeWidthToFit();
-		
-				
-		
-				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();
-		tableCoopImages.setModel(model);
-		tableCoopImages.getColumnModel().getColumn(1).sizeWidthToFit();
-		tableCoopImages.getColumnModel().getColumn(2).sizeWidthToFit();
-		tableCoopImages.getColumnModel().getColumn(3).sizeWidthToFit();
-		tableCoopImages.getColumnModel().getColumn(4).sizeWidthToFit();
-		tableCoopImages.getColumnModel().getColumn(5).sizeWidthToFit();
-
-		scrollPaneCoopImages.setViewportView(tableCoopImages);
-		tabbedPane.addTab("Kooperative Images", null, scrollPaneCoopImages, null);
-		
-		JScrollPane scrollPanePublicImages = new JScrollPane();
-		JTable tablePublicImages=new JTable();
-		tablePublicImages.setModel(model);
-		tablePublicImages.getColumnModel().getColumn(1).sizeWidthToFit();
-		tablePublicImages.getColumnModel().getColumn(2).sizeWidthToFit();
-		tablePublicImages.getColumnModel().getColumn(3).sizeWidthToFit();
-		tablePublicImages.getColumnModel().getColumn(4).sizeWidthToFit();
-		tablePublicImages.getColumnModel().getColumn(5).sizeWidthToFit();
-
-		scrollPanePublicImages.setViewportView(tablePublicImages);
-		tabbedPane.addTab("\u00D6ffentliche Images", null, scrollPanePublicImages, null);
-		
-		JScrollPane scrollPanePublicVorlagen = new JScrollPane();
-		JTable tablePublicVorlagen=new JTable();
-		tablePublicVorlagen.setModel(model);
-		tablePublicVorlagen.getColumnModel().getColumn(1).sizeWidthToFit();
-		tablePublicVorlagen.getColumnModel().getColumn(2).sizeWidthToFit();
-		tablePublicVorlagen.getColumnModel().getColumn(3).sizeWidthToFit();
-		tablePublicVorlagen.getColumnModel().getColumn(4).sizeWidthToFit();
-		tablePublicVorlagen.getColumnModel().getColumn(5).sizeWidthToFit();
-
-		scrollPanePublicVorlagen.setViewportView(tablePublicVorlagen);
-		tabbedPane.addTab("\u00D6ffentliche Vorlagen", null, scrollPanePublicVorlagen, null);
-		
-		JButton btnLinkLschen = new JButton("Link l\u00F6schen");
-		btnLinkLschen.setBounds(478, 508, 89, 23);
-		contentPanel.add(btnLinkLschen);
-		
-		initTableModel(modelAll);		
-		{
-			JPanel buttonPane = new JPanel();
-			buttonPane.setBounds(0, 640, 597, 33);
-			buttonPane.setBackground(SystemColor.menu);
-			buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT));
-			getContentPane().add(buttonPane);
-			{
-				JButton okButton = new JButton("Zur\u00FCck");
-				okButton.addActionListener(new ActionListener() {
-					public void actionPerformed(ActionEvent e) {
-		
-						MainMenue_GUI main=new MainMenue_GUI();
-						main.setVisible(true);
-						dispose();
-					}
-				});
-				okButton.setActionCommand("OK");
-				buttonPane.add(okButton);
-				getRootPane().setDefaultButton(okButton);
-			}
-			{
-				JButton cancelButton = new JButton("Veranstaltung erzeugen und abschlie\u00DFen");
-				cancelButton.addActionListener(new ActionListener() {
-					public void actionPerformed(ActionEvent e) {
-						
-						String imagename=tableAllImages.getValueAt(tableAllImages.getSelectedRow(), 0).toString();
-						try {
-							DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
-							System.out.println(formatter.format(Lecture.lecture.getStartdate()).toString());
-							client.writeLecturedata(Lecture.lecture.getName(), Lecture.lecture.getShortDesc(), Lecture.lecture.getDesc(), formatter.format(Lecture.lecture.getStartdate()).toString(), formatter.format(Lecture.lecture.getEnddate()).toString(), Lecture.lecture.isActive(), imagename, person.verantwortlicher.getVorname(), person.verantwortlicher.getName(), person.verantwortlicher.getHochschule(), person.verantwortlicher.getEMail(), person.verantwortlicher.getTel(), person.verantwortlicher.getFakultät());
-						} catch (TException e1) {
-							// TODO Auto-generated catch block
-							e1.printStackTrace();
-						}
-						dispose();
-						
-					}
-				});
-				cancelButton.setActionCommand("Cancel");
-				buttonPane.add(cancelButton);
-			}
-		}
-		
-		JSeparator separator = new JSeparator();
-		separator.setBounds(0, 78, 597, 2);
-		getContentPane().add(separator);
-		
-		JSeparator separator_1 = new JSeparator();
-		separator_1.setBounds(0, 627, 597, 2);
-		getContentPane().add(separator_1);
-		
-		JMenuBar menuBar = new JMenuBar();
-		setJMenuBar(menuBar);
-		
-		JMenu mnNewMenu = new JMenu("Suchen");
-		menuBar.add(mnNewMenu);
-		
-		JMenuItem mntmVlSuche = new JMenuItem("VL Suche");
-		mnNewMenu.add(mntmVlSuche);
-		
-		JMenu mnNewMenu_1 = new JMenu("Hilfe");
-		menuBar.add(mnNewMenu_1);
-		
-		JMenuItem mntmFaq = new JMenuItem("FAQ");
-		mnNewMenu_1.add(mntmFaq);
-		
-		JMenuItem mntmOtrs = new JMenuItem("OTRS");
-		mnNewMenu_1.add(mntmOtrs);
-		
-	}
-	
-	public DefaultTableModel initTableModel(DefaultTableModel model){
-		List<server.Image> images;
-		try {
-			images = client.getImageList();
-			Iterator<server.Image> i=images.iterator();
-			List<Object[]> ListObj = new ArrayList<Object[]>();
-			int x=0;
-			
-			while(i.hasNext())
-			{
-				
-				i.next();
-				Object [] obj={images.get(x).getImageName(),images.get(x).getLicenseRestriction(),images.get(x).getOsName(),images.get(x).getLectureName(),images.get(x).getUpdateTime(),images.get(x).getUserData()};
-				ListObj.add(obj);
-				model.addRow(ListObj.get(x));
-				x++;
-				
-			}
-			
-			return model;
-		} catch (TException e1) {
-			// TODO Auto-generated catch block
-			e1.printStackTrace();
-		}
-		return model;
-	}
-	}
-
-
diff --git a/Dozentenmodul/src/gui/ExtendedSearch_GUI.java b/Dozentenmodul/src/gui/ExtendedSearch_GUI.java
deleted file mode 100644
index 7f042cae..00000000
--- a/Dozentenmodul/src/gui/ExtendedSearch_GUI.java
+++ /dev/null
@@ -1,234 +0,0 @@
-package gui;
-
-
-import java.awt.Dimension;
-import java.awt.FlowLayout;
-import java.awt.Font;
-import java.awt.SystemColor;
-import java.awt.Toolkit;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.WindowAdapter;
-import java.awt.event.WindowEvent;
-
-import javax.swing.JButton;
-import javax.swing.JCheckBox;
-import javax.swing.JComboBox;
-import javax.swing.JDialog;
-import javax.swing.JFrame;
-import javax.swing.JLabel;
-import javax.swing.JMenu;
-import javax.swing.JMenuBar;
-import javax.swing.JMenuItem;
-import javax.swing.JPanel;
-import javax.swing.JSeparator;
-import javax.swing.JTextField;
-import javax.swing.JTextPane;
-import javax.swing.UIManager;
-import javax.swing.UnsupportedLookAndFeelException;
-import javax.swing.border.EmptyBorder;
-import javax.swing.border.TitledBorder;
-
-@SuppressWarnings("serial")
-public class ExtendedSearch_GUI extends JFrame {
-
-	private final JPanel contentPanel = new JPanel();
-	String[] result;
-	private JTextField textField;
-	private JTextField textField_1;
-	/**
-	 * Launch the application.
-	 */
-	public static void main(String[] args) {
-		try {
-			ExtendedSearch_GUI dialog = new ExtendedSearch_GUI();
-			dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
-			dialog.setVisible(true);
-			
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * Create the dialog.
-	 */
-	public ExtendedSearch_GUI() {
-		addWindowListener(new WindowAdapter() {
-			@Override
-			public void windowClosing(WindowEvent arg0) {
-				System.exit(0);
-			}
-		});
-		setResizable(false);
-		
-		try {
-			UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
-		} catch (ClassNotFoundException | InstantiationException
-				| IllegalAccessException | UnsupportedLookAndFeelException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		setTitle("bwLehrpool Suite *Prototyp*");
-		Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
-		int top=(screenSize.height - 722) / 2;
-		int left=(screenSize.width -603) / 2;
-		setBounds(left, top, 603, 722);
-
-		getContentPane().setLayout(null);
-		{
-			JPanel panel = new JPanel();
-			panel.setBackground(SystemColor.menu);
-			panel.setBounds(10, 11, 577, 57);
-			getContentPane().add(panel);
-			panel.setLayout(null);
-			{
-				JLabel lblNewLabel = new JLabel("Weitere Suchoptionen");
-				lblNewLabel.setBounds(10, 11, 509, 22);
-				panel.add(lblNewLabel);
-				lblNewLabel.setFont(new Font("Tahoma", Font.BOLD, 18));
-			}
-			
-			JTextPane txtpnBitteWhlenSie = new JTextPane();
-			txtpnBitteWhlenSie.setEditable(false);
-			txtpnBitteWhlenSie.setBackground(SystemColor.menu);
-			txtpnBitteWhlenSie.setText("beschreibung");
-			txtpnBitteWhlenSie.setBounds(10, 36, 509, 32);
-			panel.add(txtpnBitteWhlenSie);
-		}
-		contentPanel.setBounds(10, 85, 577, 493);
-		contentPanel.setBackground(SystemColor.menu);
-		contentPanel.setBorder(new EmptyBorder(5, 5, 5, 5));
-		getContentPane().add(contentPanel);
-		contentPanel.setLayout(null);
-		
-		JPanel panel_1 = new JPanel();
-		panel_1.setBackground(SystemColor.menu);
-		panel_1.setBorder(new TitledBorder(null, "Image-Typ", TitledBorder.LEADING, TitledBorder.TOP, null, null));
-		panel_1.setBounds(10, 11, 557, 95);
-		contentPanel.add(panel_1);
-		panel_1.setLayout(null);
-		
-		JLabel lblNewLabel_2 = new JLabel("Image-Typ");
-		lblNewLabel_2.setBounds(10, 39, 176, 20);
-		panel_1.add(lblNewLabel_2);
-		
-		JCheckBox chckbxBestehendesImage = new JCheckBox("Bestehendes Image");
-		chckbxBestehendesImage.setSelected(true);
-		chckbxBestehendesImage.setBounds(192, 38, 138, 23);
-		panel_1.add(chckbxBestehendesImage);
-		
-		JCheckBox chckbxRohling = new JCheckBox("Rohling");
-		chckbxRohling.setSelected(true);
-		chckbxRohling.setBounds(332, 38, 97, 23);
-		panel_1.add(chckbxRohling);
-		
-		JPanel panel = new JPanel();
-		panel.setLayout(null);
-		panel.setBorder(new TitledBorder(null, "Image-Inhalt", TitledBorder.LEADING, TitledBorder.TOP, null, null));
-		panel.setBackground(SystemColor.menu);
-		panel.setBounds(10, 117, 557, 95);
-		contentPanel.add(panel);
-		
-		JLabel lblEnthalteneSoftware = new JLabel("Enthaltene Software");
-		lblEnthalteneSoftware.setBounds(10, 39, 176, 20);
-		panel.add(lblEnthalteneSoftware);
-		
-		textField = new JTextField();
-		textField.setBounds(196, 39, 351, 20);
-		panel.add(textField);
-		textField.setColumns(10);
-		
-		JLabel lblNewLabel_1 = new JLabel("Bitte mit ; getrennt angeben");
-		lblNewLabel_1.setBounds(196, 70, 351, 14);
-		panel.add(lblNewLabel_1);
-		
-		JPanel panel_2 = new JPanel();
-		panel_2.setLayout(null);
-		panel_2.setBorder(new TitledBorder(null, "Informationen zum Ersteller", TitledBorder.LEADING, TitledBorder.TOP, null, null));
-		panel_2.setBackground(SystemColor.menu);
-		panel_2.setBounds(10, 223, 557, 123);
-		contentPanel.add(panel_2);
-		
-		JLabel lblNachnameDesErstellers = new JLabel("Nachname des Erstellers");
-		lblNachnameDesErstellers.setBounds(10, 39, 176, 20);
-		panel_2.add(lblNachnameDesErstellers);
-		
-		textField_1 = new JTextField();
-		textField_1.setColumns(10);
-		textField_1.setBounds(196, 39, 351, 20);
-		panel_2.add(textField_1);
-		
-		JLabel lblHochschuleuniversitt = new JLabel("Hochschule/Universit\u00E4t");
-		lblHochschuleuniversitt.setBounds(10, 70, 176, 20);
-		panel_2.add(lblHochschuleuniversitt);
-		
-		JComboBox<String> comboBox = new JComboBox<String>();
-		comboBox.setBounds(196, 70, 351, 20);
-		panel_2.add(comboBox);
-		{
-			JPanel buttonPane = new JPanel();
-			buttonPane.setBounds(0, 640, 597, 33);
-			buttonPane.setBackground(SystemColor.menu);
-			buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT));
-			getContentPane().add(buttonPane);
-			{
-				JButton okButton = new JButton("Zur\u00FCck");
-				okButton.addActionListener(new ActionListener() {
-					public void actionPerformed(ActionEvent e) {
-
-						
-						EingabeImageAllgemein_GUI sr=new EingabeImageAllgemein_GUI();
-						sr.setVisible(true);
-						dispose();
-					}
-				});
-				okButton.setActionCommand("OK");
-				buttonPane.add(okButton);
-				getRootPane().setDefaultButton(okButton);
-			}
-			{
-				JButton cancelButton = new JButton("\u00DCbernehmen");
-				cancelButton.addActionListener(new ActionListener() {
-					public void actionPerformed(ActionEvent e) {
-						
-
-						FTPUploader_GUI ea=new FTPUploader_GUI();
-						ea.setVisible(true);
-						dispose();
-						
-					}
-				});
-				cancelButton.setActionCommand("Cancel");
-				buttonPane.add(cancelButton);
-			}
-		}
-		
-		JSeparator separator = new JSeparator();
-		separator.setBounds(0, 78, 597, 2);
-		getContentPane().add(separator);
-		
-		JSeparator separator_1 = new JSeparator();
-		separator_1.setBounds(0, 627, 597, 2);
-		getContentPane().add(separator_1);
-		
-		JMenuBar menuBar = new JMenuBar();
-		setJMenuBar(menuBar);
-		
-		JMenu mnNewMenu = new JMenu("Suchen");
-		menuBar.add(mnNewMenu);
-		
-		JMenuItem mntmVlSuche = new JMenuItem("VL Suche");
-		mnNewMenu.add(mntmVlSuche);
-		
-		JMenu mnNewMenu_1 = new JMenu("Hilfe");
-		menuBar.add(mnNewMenu_1);
-		
-		JMenuItem mntmFaq = new JMenuItem("FAQ");
-		mnNewMenu_1.add(mntmFaq);
-		
-		JMenuItem mntmOtrs = new JMenuItem("OTRS");
-		mnNewMenu_1.add(mntmOtrs);
-		
-	}
-}
diff --git a/Dozentenmodul/src/gui/FTPDownloader_GUI.java b/Dozentenmodul/src/gui/FTPDownloader_GUI.java
deleted file mode 100644
index cb53fc3d..00000000
--- a/Dozentenmodul/src/gui/FTPDownloader_GUI.java
+++ /dev/null
@@ -1,370 +0,0 @@
-package gui;
-
-import java.awt.BorderLayout;
-import java.awt.Color;
-import java.awt.Dimension;
-import java.awt.FlowLayout;
-import java.awt.Toolkit;
-import java.io.File;
-
-import javax.swing.JButton;
-import javax.swing.JFileChooser;
-import javax.swing.JFrame;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.JProgressBar;
-import javax.swing.SwingConstants;
-import javax.swing.UIManager;
-import javax.swing.UnsupportedLookAndFeelException;
-import javax.swing.border.EmptyBorder;
-
-import ftp.DownloadTask;
-
-import java.awt.event.ActionListener;
-import java.awt.event.ActionEvent;
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
-import java.awt.event.WindowAdapter;
-import java.awt.event.WindowEvent;
-import java.awt.SystemColor;
-import java.awt.Font;
-import javax.swing.JTextPane;
-import javax.swing.JSeparator;
-
-import models.Image;
-
-import org.apache.thrift.TException;
-
-import server.Server.Client;
-import server.User;
-import thrift.ThriftConnection;
-
-@SuppressWarnings("serial")
-public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener {
-
-	@SuppressWarnings("unused")
-	private JPanel contentPane;
-	private final JPanel contentPanel = new JPanel();
-	JLabel lblNewLabel;
-	JLabel downspeed;
-	User user;
-	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;
-	JLabel bytesreadlbl;
-	JLabel lblNewLabel_3;
-	JLabel labelVerbleibend;
-	long filesize;
-	double speed;
-	long bytesread;
-	JLabel labelZeit;
-	boolean taskrun = false;
-	ThriftConnection thrift = new ThriftConnection();
-	Client client = thrift.getThriftConnection();
-	JButton buttonback = new JButton("Zur\u00FCck");
-
-	/**
-	 * Launch the application.
-	 */
-	/*
-	 * public static void main(String[] args) { EventQueue.invokeLater(new
-	 * Runnable() { public void run() { try { FTPDownloader frame = new
-	 * FTPDownloader(); frame.setVisible(true); } catch (Exception e) {
-	 * e.printStackTrace(); } } }); }
-	 */
-
-	/**
-	 * Create the frame.
-	 */
-	public FTPDownloader_GUI() {
-		addWindowListener(new WindowAdapter() {
-			@Override
-			public void windowClosing(WindowEvent e) {
-				if (taskrun == true) {
-					try {
-						client.DeleteFtpUser(user.userName);
-						thrift.closeThriftConnection();
-					} catch (TException e1) {
-						// TODO Auto-generated catch block
-						e1.printStackTrace();
-					}
-					task.cancel(true);
-				}
-				dispose();
-			}
-		});
-		setResizable(false);
-		// setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
-
-		
-
-		try {
-			UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
-		} catch (ClassNotFoundException | InstantiationException
-				| IllegalAccessException | UnsupportedLookAndFeelException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-
-		
-		setBackground(Color.WHITE);
-		setTitle("Dozentenmodul *Prototyp*");
-		Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
-		int top = (screenSize.height - 722) / 2;
-		int left = (screenSize.width - 603) / 2;
-		setBounds(left, top, 603, 722);
-		getContentPane().setLayout(new BorderLayout());
-		contentPanel.setBackground(SystemColor.menu);
-		contentPanel.setBorder(new EmptyBorder(5, 5, 5, 5));
-		getContentPane().add(contentPanel, BorderLayout.CENTER);
-		contentPanel.setLayout(null);
-		{
-			JButton btnSpeicherortAuswhlen = new JButton(
-					"Speicherort ausw\u00E4hlen");
-			btnSpeicherortAuswhlen.addActionListener(new ActionListener() {
-				public void actionPerformed(ActionEvent arg0) {
-					JFileChooser fc = new JFileChooser();
-					fc.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
-
-					fc.showOpenDialog(getParent());
-					File dir = fc.getSelectedFile();
-					lblNewLabel.setText(dir.getAbsolutePath());
-				}
-			});
-
-			btnSpeicherortAuswhlen.setBounds(57, 124, 141, 23);
-			btnSpeicherortAuswhlen.setVerticalAlignment(SwingConstants.TOP);
-			btnSpeicherortAuswhlen.setHorizontalAlignment(SwingConstants.LEFT);
-			contentPanel.add(btnSpeicherortAuswhlen);
-		}
-
-		lblNewLabel = new JLabel("C:\\");
-		lblNewLabel.setBounds(208, 124, 238, 23);
-		contentPanel.add(lblNewLabel);
-
-		JButton btnDownloadStarten = new JButton("Download starten");
-		btnDownloadStarten.addActionListener(new ActionListener() {
-			public void actionPerformed(ActionEvent arg0) {
-				buttonDownloadActionPerformed(arg0);
-			}
-		});
-
-		btnDownloadStarten.setBounds(57, 168, 141, 23);
-		contentPanel.add(btnDownloadStarten);
-
-		progressBar = new JProgressBar(0, 100);
-		progressBar.setStringPainted(true);
-
-		progressBar.setBounds(57, 202, 497, 30);
-		contentPanel.add(progressBar);
-
-		JLabel lblDownloadgeschwindigkeit = new JLabel(
-				"Downloadgeschwindigkeit:");
-		lblDownloadgeschwindigkeit.setBounds(57, 243, 141, 14);
-		contentPanel.add(lblDownloadgeschwindigkeit);
-
-		downspeed = new JLabel("0");
-		downspeed.setBounds(308, 243, 95, 14);
-		contentPanel.add(downspeed);
-
-		JLabel lblNewLabel_1 = new JLabel("Fertig:");
-		lblNewLabel_1.setBounds(57, 293, 46, 14);
-		contentPanel.add(lblNewLabel_1);
-
-		bytesreadlbl = new JLabel("");
-		bytesreadlbl.setBounds(66, 244, 108, 14);
-		contentPanel.add(bytesreadlbl);
-
-		JLabel lblNewLabel_2 = new JLabel("von:");
-		lblNewLabel_2.setBounds(226, 293, 46, 14);
-		contentPanel.add(lblNewLabel_2);
-
-		lblNewLabel_3 = new JLabel("");
-		lblNewLabel_3.setBounds(235, 244, 108, 14);
-		contentPanel.add(lblNewLabel_3);
-
-		JLabel lblMbVerbleibend = new JLabel("Verbleibend:");
-		lblMbVerbleibend.setBounds(57, 318, 71, 14);
-		contentPanel.add(lblMbVerbleibend);
-
-		labelVerbleibend = new JLabel("");
-		labelVerbleibend.setBounds(91, 269, 108, 14);
-		contentPanel.add(labelVerbleibend);
-
-		JLabel lblGeschtzteVerbleibendeZeit = new JLabel(
-				"Gesch\u00E4tzte Verbleibende Zeit:");
-		lblGeschtzteVerbleibendeZeit.setBounds(57, 268, 150, 14);
-		contentPanel.add(lblGeschtzteVerbleibendeZeit);
-
-		labelZeit = new JLabel("");
-		labelZeit.setBounds(261, 219, 117, 14);
-		contentPanel.add(labelZeit);
-
-		JPanel panel = new JPanel();
-		panel.setLayout(null);
-		panel.setBackground(SystemColor.menu);
-		panel.setBounds(10, 11, 577, 57);
-		contentPanel.add(panel);
-
-		JLabel label = new JLabel("Eingabe Ihrer Daten");
-		label.setFont(new Font("Tahoma", Font.BOLD, 18));
-		label.setBounds(10, 11, 509, 22);
-		panel.add(label);
-
-		JTextPane textPane = new JTextPane();
-		textPane.setText("Geben Sie hier bitte einen sprechenden Imagename sowie Ihre Kontaktdaten an");
-		textPane.setEditable(false);
-		textPane.setBackground(SystemColor.menu);
-		textPane.setBounds(10, 36, 509, 32);
-		panel.add(textPane);
-
-		JSeparator separator = new JSeparator();
-		separator.setBounds(0, 79, 597, 2);
-		contentPanel.add(separator);
-
-		JLabel label_1 = new JLabel("Hauptmen\u00FC");
-		label_1.setForeground(Color.BLUE);
-		label_1.setBounds(20, 88, 61, 20);
-		contentPanel.add(label_1);
-
-		JLabel label_2 = new JLabel(">");
-		label_2.setBounds(80, 91, 14, 14);
-		contentPanel.add(label_2);
-
-		JLabel label_3 = new JLabel("VL-Image");
-		label_3.setForeground(Color.BLUE);
-		label_3.setBounds(91, 88, 46, 20);
-		contentPanel.add(label_3);
-
-		JLabel label_4 = new JLabel(">");
-		label_4.setBounds(139, 91, 14, 14);
-		contentPanel.add(label_4);
-
-		JLabel label_5 = new JLabel("Neu/Bearbeiten");
-		label_5.setBounds(149, 91, 108, 14);
-		contentPanel.add(label_5);
-
-		JSeparator separator_1 = new JSeparator();
-		separator_1.setBounds(-10, 648, 597, 2);
-		contentPanel.add(separator_1);
-
-		JLabel label_6 = new JLabel("1.");
-		label_6.setBounds(24, 128, 23, 14);
-		contentPanel.add(label_6);
-
-		JLabel label_7 = new JLabel("2.");
-		label_7.setBounds(24, 172, 23, 14);
-		contentPanel.add(label_7);
-		{
-			JPanel buttonPane = new JPanel();
-			buttonPane.setBackground(UIManager.getColor("Button.background"));
-			buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT));
-			getContentPane().add(buttonPane, BorderLayout.SOUTH);
-			{
-				buttonback.setEnabled(false);
-				buttonback.addActionListener(new ActionListener() {
-					public void actionPerformed(ActionEvent e) {
-						if (taskrun == true) {
-							task.cancel(true);
-							try {
-								client.DeleteFtpUser(user.userName);
-							} catch (TException e1) {
-								// TODO Auto-generated catch block
-								e1.printStackTrace();
-							}
-						}
-						thrift.closeThriftConnection();
-						SearchEditImage_GUI se=new SearchEditImage_GUI();
-						se.setVisible(true);
-						dispose();
-					}
-				});
-				buttonback.setActionCommand("Cancel");
-				buttonPane.add(buttonback);
-			}
-		}
-		setVisible(true);
-
-	}
-
-	private void buttonDownloadActionPerformed(ActionEvent event) {
-
-		progressBar.setValue(0);
-
-		try {
-			user = client.getFtpUser();
-			
-			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,
-				downloadFile, lblNewLabel.getText(), this);
-		task.addPropertyChangeListener(this);
-		task.execute();
-		taskrun = true;
-
-	}
-
-	public void propertyChange(PropertyChangeEvent arg0) {
-
-		int progress = 0;
-		if ("progress" == arg0.getPropertyName()) {
-			progress = (Integer) arg0.getNewValue();
-			progressBar.setValue(progress);
-			if (progress == 100) {
-				buttonback.setEnabled(true);
-			}
-		}
-
-		if ("speed" == arg0.getPropertyName()) {
-			speed = (double) arg0.getNewValue();
-			// if(speed<=1){
-
-			downspeed.setText(String.valueOf(speed).substring(0,
-					String.valueOf(speed).lastIndexOf(".") + 3)
-					+ " MB/s");
-
-			// }else
-			// {
-			// double MBSpeed=speed/1024;
-			// downspeed.setText(String.valueOf((MBSpeed)).substring(0,
-			// String.valueOf(MBSpeed).indexOf(".")));
-			// }
-
-		}
-		if ("bytesread" == arg0.getPropertyName()) {
-			bytesread = (long) arg0.getNewValue();
-			bytesreadlbl.setText((bytesread / 1024 / 1024) + " MB");
-			labelVerbleibend
-					.setText(((filesize / 1024 / 1024) - (bytesread / 1024 / 1024))
-							+ " MB");
-
-			labelZeit
-					.setText(String
-							.valueOf(
-									((((filesize / 1024 / 1024) - (bytesread / 1024 / 1024)) / speed) / 60) + 1)
-							.substring(
-									0,
-									String.valueOf(
-											(((filesize / 1024 / 1024) - (bytesread / 1024 / 1024)) / speed) / 60)
-											.lastIndexOf("."))
-							+ " Minuten");
-
-		}
-		if ("filesize" == arg0.getPropertyName()) {
-			filesize = (long) arg0.getNewValue();
-			lblNewLabel_3.setText((filesize / 1024 / 1024) + " MB");
-
-		}
-
-	}
-}
\ No newline at end of file
diff --git a/Dozentenmodul/src/gui/FTPEditUploader_GUI.java b/Dozentenmodul/src/gui/FTPEditUploader_GUI.java
deleted file mode 100644
index e7252898..00000000
--- a/Dozentenmodul/src/gui/FTPEditUploader_GUI.java
+++ /dev/null
@@ -1,427 +0,0 @@
-package gui;
-
-import java.awt.BorderLayout;
-import java.awt.Color;
-import java.awt.Dimension;
-import java.awt.EventQueue;
-import java.awt.FlowLayout;
-import java.awt.Font;
-import java.awt.SystemColor;
-import java.awt.Toolkit;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.WindowAdapter;
-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;
-import javax.swing.JLabel;
-import javax.swing.JMenu;
-import javax.swing.JMenuBar;
-import javax.swing.JPanel;
-import javax.swing.JProgressBar;
-import javax.swing.JSeparator;
-import javax.swing.JTextPane;
-import javax.swing.SwingConstants;
-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;
-
-import server.Server.Client;
-import thrift.ThriftConnection;
-import ftp.UploadTask;
-
-
-@SuppressWarnings("serial")
-public class FTPEditUploader_GUI extends JFrame implements PropertyChangeListener {
-
-	@SuppressWarnings("unused")
-	private JPanel contentPane;
-	private final JPanel contentPanel = new JPanel();
-	JLabel lblNewLabel;
-	JProgressBar progressBar;
-	String host="141.79.128.121";
-	int port=21;
-	server.User user;
-	String filename="";
-	File uploadFile;
-	static String arg="";
-	UploadTask task;
-	JLabel UpSpeed;
-	JLabel labelfertig;
-	JLabel labelfilesize;
-	JLabel labelZeit;
-	JLabel labelverbleibend;
-	long filesize;
-	double speed;
-	long bytesread;
-	boolean taskrun=false;
-	ThriftConnection thrift=new ThriftConnection();
-	Client client=thrift.getThriftConnection();
-	/**
-	 * Launch the application.
-	 */
-	public static void main(String[] args) {
-		EventQueue.invokeLater(new Runnable() {
-			public void run() {
-				try {
-					FTPEditUploader_GUI frame = new FTPEditUploader_GUI();
-					frame.setVisible(true);
-				} catch (Exception e) {
-					e.printStackTrace();
-				}
-			}
-		});
-	}
-
-	/**
-	 * Create the frame.
-	 */
-	public FTPEditUploader_GUI() {
-		addWindowListener(new WindowAdapter() {
-			@Override
-			public void windowClosing(WindowEvent arg0) {
-				if(taskrun==true)
-				{
-					try {
-						
-						client.DeleteFtpUser(user.userName);
-					} catch (TException e1) {
-						// TODO Auto-generated catch block
-						e1.printStackTrace();
-					}
-				task.cancel(true);
-				}
-			}
-		});
-		setResizable(false);
-		//setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
-		
-		
-		
-		try {
-			UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
-		} catch (ClassNotFoundException | InstantiationException
-				| IllegalAccessException | UnsupportedLookAndFeelException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-
-		//filename=name;
-		setBackground(Color.WHITE);
-		setTitle("Dozentenmodul *Prototyp*");
-		Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
-		int top=(screenSize.height - 722) / 2;
-		int left=(screenSize.width - 603) / 2;
-		setBounds(left, top, 603, 722);
-		//setBounds(100, 100, 603, 250);
-		getContentPane().setLayout(new BorderLayout());
-		contentPanel.setBackground(SystemColor.menu);
-		contentPanel.setBorder(new EmptyBorder(5, 5, 5, 5));
-		getContentPane().add(contentPanel, BorderLayout.CENTER);
-		contentPanel.setLayout(null);
-		{
-			JButton btnSpeicherortAuswhlen = new JButton("VMDK ausw\u00E4hlen");
-			btnSpeicherortAuswhlen.addActionListener(new ActionListener() {
-				public void actionPerformed(ActionEvent arg0) {
-					JFileChooser fc=new JFileChooser();
-					fc.setFileSelectionMode(JFileChooser.FILES_ONLY);
-					
-					fc.showOpenDialog(getParent());
-					File dir=fc.getSelectedFile();
-					uploadFile=dir;
-					filename=uploadFile.getName();
-					lblNewLabel.setText(dir.getAbsolutePath());
-				}
-			});
-
-			btnSpeicherortAuswhlen.setBounds(10, 124, 141, 23);
-			btnSpeicherortAuswhlen.setVerticalAlignment(SwingConstants.TOP);
-			btnSpeicherortAuswhlen.setHorizontalAlignment(SwingConstants.LEFT);
-			contentPanel.add(btnSpeicherortAuswhlen);
-		}
-		
-		lblNewLabel = new JLabel("");
-		lblNewLabel.setBounds(184, 124, 255, 23);
-		contentPanel.add(lblNewLabel);
-		
-		JButton btnDownloadStarten = new JButton("Upload starten");
-		btnDownloadStarten.addActionListener(new ActionListener() {
-			public void actionPerformed(ActionEvent arg0) {
-				buttonUploadActionPerformed(arg0);
-				
-			}
-		});
-
-		btnDownloadStarten.setBounds(10, 330, 141, 23);
-		contentPanel.add(btnDownloadStarten);
-		
-		progressBar = new JProgressBar(0,100);
-		progressBar.setStringPainted(true);
-
-		
-		progressBar.setBounds(10, 158, 577, 30);
-		contentPanel.add(progressBar);
-		
-		JLabel label = new JLabel("Downloadgeschwindigkeit:");
-		label.setBounds(10, 199, 141, 14);
-		contentPanel.add(label);
-		
-		JLabel label_1 = new JLabel("Fertig:");
-		label_1.setBounds(10, 249, 46, 14);
-		contentPanel.add(label_1);
-		
-		labelfertig = new JLabel("0");
-		labelfertig.setBounds(66, 249, 108, 14);
-		contentPanel.add(labelfertig);
-		
-		UpSpeed = new JLabel("0");
-		UpSpeed.setBounds(329, 199, 95, 14);
-		contentPanel.add(UpSpeed);
-		
-		JLabel label_4 = new JLabel("von:");
-		label_4.setBounds(184, 249, 46, 14);
-		contentPanel.add(label_4);
-		
-		labelfilesize = new JLabel("0");
-		labelfilesize.setBounds(240, 249, 108, 14);
-		contentPanel.add(labelfilesize);
-		
-		JLabel label_6 = new JLabel("Verbleibend:");
-		label_6.setBounds(10, 274, 71, 14);
-		contentPanel.add(label_6);
-		
-		JLabel label_7 = new JLabel("Gesch\u00E4tzte Verbleibende Zeit:");
-		label_7.setBounds(10, 224, 150, 14);
-		contentPanel.add(label_7);
-		
-		labelZeit = new JLabel("0");
-		labelZeit.setBounds(329, 224, 117, 14);
-		contentPanel.add(labelZeit);
-		
-		labelverbleibend = new JLabel("0");
-		labelverbleibend.setBounds(91, 274, 108, 14);
-		contentPanel.add(labelverbleibend);
-		
-		JPanel panel = new JPanel();
-		panel.setLayout(null);
-		panel.setBackground(SystemColor.menu);
-		panel.setBounds(10, 11, 577, 57);
-		contentPanel.add(panel);
-		
-		JLabel label_2 = new JLabel("Eingabe Ihrer Daten");
-		label_2.setFont(new Font("Tahoma", Font.BOLD, 18));
-		label_2.setBounds(10, 11, 509, 22);
-		panel.add(label_2);
-		
-		JTextPane textPane = new JTextPane();
-		textPane.setText("Geben Sie hier bitte einen sprechenden Imagename sowie Ihre Kontaktdaten an");
-		textPane.setEditable(false);
-		textPane.setBackground(SystemColor.menu);
-		textPane.setBounds(10, 36, 509, 32);
-		panel.add(textPane);
-		
-		JSeparator separator = new JSeparator();
-		separator.setBounds(0, 79, 597, 2);
-		contentPanel.add(separator);
-		
-		JLabel lblNewLabel_1 = new JLabel("Hauptmen\u00FC");
-		lblNewLabel_1.setForeground(Color.BLUE);
-		lblNewLabel_1.setBounds(20, 88, 61, 20);
-		contentPanel.add(lblNewLabel_1);
-		
-		JLabel label_3 = new JLabel(">");
-		label_3.setBounds(80, 91, 14, 14);
-		contentPanel.add(label_3);
-		
-		JLabel lblVlimage = new JLabel("VL-Image");
-		lblVlimage.setForeground(Color.BLUE);
-		lblVlimage.setBounds(91, 88, 46, 20);
-		contentPanel.add(lblVlimage);
-		
-		JLabel label_5 = new JLabel(">");
-		label_5.setBounds(139, 91, 14, 14);
-		contentPanel.add(label_5);
-		
-		JLabel lblNeubearbeiten = new JLabel("Neu/Bearbeiten");
-		lblNeubearbeiten.setBounds(149, 91, 108, 14);
-		contentPanel.add(lblNeubearbeiten);
-		
-		JSeparator separator_1 = new JSeparator();
-		separator_1.setBounds(0, 627, 597, 2);
-		contentPanel.add(separator_1);
-		
-		JButton btnCopyFileTo = new JButton("Copy File to Prod");
-		btnCopyFileTo.addActionListener(new ActionListener() {
-			public void actionPerformed(ActionEvent e) {
-				try {
-					client.startFileCopy(user.path+"/"+uploadFile.getName());
-				} catch (TException e1) {
-					// TODO Auto-generated catch block
-					e1.printStackTrace();
-				}
-			}
-		});
-		btnCopyFileTo.setBounds(10, 375, 264, 23);
-		contentPanel.add(btnCopyFileTo);
-		{
-			JPanel buttonPane = new JPanel();
-			buttonPane.setBackground(UIManager.getColor("Button.background"));
-			buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT));
-			getContentPane().add(buttonPane, BorderLayout.SOUTH);
-			{
-				JButton ButtonReady = new JButton("Abschlie\u00DFen");
-				ButtonReady.addActionListener(new ActionListener() {
-					public void actionPerformed(ActionEvent e) {
-						
-						updateData();
-						dispose();
-						MainMenue_GUI m=new MainMenue_GUI();
-						m.setVisible(true);
-						
-						if(taskrun==true)
-						{
-						try {
-							client.DeleteFtpUser(user.userName);
-							
-						} catch (TException  e1) {
-							// TODO Auto-generated catch block
-							e1.printStackTrace();
-						}
-						task.cancel(true);
-						}
-						thrift.closeThriftConnection();
-					}
-				});
-				
-				JButton buttonCancel = new JButton("Schlie\u00DFen");
-				buttonCancel.setActionCommand("Cancel");
-				buttonPane.add(buttonCancel);
-				ButtonReady.setActionCommand("Cancel");
-				buttonPane.add(ButtonReady);
-			}
-		}
-		
-		JMenuBar menuBar = new JMenuBar();
-		setJMenuBar(menuBar);
-		
-		JMenu mnHillfe = new JMenu("Hillfe");
-		menuBar.add(mnHillfe);
-		setVisible(true);
-		
-	}
-	
-    private void buttonUploadActionPerformed(ActionEvent event) {
-		// File (or directory) with old name
-	   // File file = new File(lblNewLabel.getText());
-
-	    // File (or directory) with new name
-	    //System.out.println(file.getAbsolutePath().substring(0,file.getAbsolutePath().lastIndexOf("\\"))+"\\"+vm.vl.getLaborname()+".vmdk");
-	    //File file2 = new File(file.getAbsoluteFile()+"\\"+vm.vl.getLaborname()+".vmdk");
-	    
-
-	    // Rename file (or directory)
-	    //boolean success = file.renameTo(file2);
-	    //if (!success) {
-	        // File was not successfully renamed
-	    	//System.out.println("Not OK");
-	    //}
-	    //else
-	    //{
-	    	//System.out.println("OK");
-	    //}
-        progressBar.setValue(0);
-
-        try {
-			user=client.getFtpUser();
-			System.out.println("name"+user.userName);
-			System.out.println("path"+user.path);
-			System.out.println("pass"+user.password);
-		} catch (TException e) {
-			// 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);
-        task.execute();
-        taskrun=true;
-        
-        //createXML();
-        //TransferToSatellit();
-        
-    	
-    }
-
-	public void propertyChange(PropertyChangeEvent arg0) {
-        if ("progress" == arg0.getPropertyName()) {
-            int progress = (Integer) arg0.getNewValue();
-            progressBar.setValue(progress);
-        }
-        if("speed"==arg0.getPropertyName()){
-        	speed=(double)arg0.getNewValue();
-        	//if(speed<=1){
-        		
-        		UpSpeed.setText(String.valueOf(speed).substring(0,String.valueOf(speed).lastIndexOf(".")+3)+" MB/s");
-        		
-        //	}else
-        	//{
-        		//double MBSpeed=speed/1024;
-        		//downspeed.setText(String.valueOf((MBSpeed)).substring(0, String.valueOf(MBSpeed).indexOf(".")));
-        	//}
-        	
-        }
-        if("bytesread"==arg0.getPropertyName())
-        {
-        	bytesread=(long)arg0.getNewValue();
-        	labelfertig.setText((bytesread/1024/1024)+" MB");
-        	labelverbleibend.setText(((filesize/1024/1024)-(bytesread/1024/1024))+" MB");
-        	
-        	
-        	labelZeit.setText(String.valueOf(((((filesize/1024/1024)-(bytesread/1024/1024))/speed)/60)+1).substring(0,String.valueOf((((filesize/1024/1024)-(bytesread/1024/1024))/speed)/60).lastIndexOf("."))+ " Minuten");
-        	
-        
-        }
-        if("filesize"==arg0.getPropertyName())
-        {
-        	filesize=(long)arg0.getNewValue();
-        	labelfilesize.setText((filesize/1024/1024)+" MB");
-        	
-        }
-		        	
-        }
-	
-    public boolean updateData(){
-    	
-    	try {
-			
-				
-    		System.out.println("Start Update");
-			client.updateImageData(Image.image.getImagename(),Image.image.getNewName(), Image.image.isLicensed(), Image.image.isInternet(), Image.image.getRam(), Image.image.getCpu(),Image.image.getImageId(),Image.image.getVersion());
-			} catch (TException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-			return false;
-		}
-		return true;
-    	
-    	
-    }
-}
\ No newline at end of file
diff --git a/Dozentenmodul/src/gui/Login_GUI.java b/Dozentenmodul/src/gui/Login_GUI.java
deleted file mode 100644
index 172895d6..00000000
--- a/Dozentenmodul/src/gui/Login_GUI.java
+++ /dev/null
@@ -1,260 +0,0 @@
-package gui;
-
-import java.awt.Dimension;
-import java.awt.EventQueue;
-import java.awt.Image;
-import java.awt.SystemColor;
-import java.awt.Toolkit;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.WindowAdapter;
-import java.awt.event.WindowEvent;
-import java.io.File;
-import java.io.IOException;
-
-import javax.swing.ImageIcon;
-import javax.swing.JButton;
-import javax.swing.JFrame;
-import javax.swing.JLabel;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
-import javax.swing.JPasswordField;
-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;
-//import org.apache.thrift.protocol.TProtocol;
-import org.ini4j.Wini;
-//import thrift.AuthenticationException;
-//import thrift.ImageServer;
-//import thrift.InvalidTokenException;
-//import thrift.SessionData;
-import thrift.MasterThriftConnection;
-import thrift.ImageServer.Client;
-import thrift.UserInfo;
-
-import config.config_file;
-
-@SuppressWarnings("serial")
-public class Login_GUI extends JFrame {
-
-	private JPanel contentPane;
-	private JTextField username;
-	private JPasswordField pass;
-
-	/**
-	 * Launch the application.
-	 */
-	public static void main(String[] args) {
-		EventQueue.invokeLater(new Runnable() {
-			public void run() {
-				try {
-					// Prüfe und Erzeuge gegebenfalls Config
-					config_file cf = new config_file();
-					boolean conf = cf.createConfig();
-					if (conf == true) {
-						// Aufruf und Anzeige des Login Fensters
-						Login_GUI frame = new Login_GUI();
-						frame.setVisible(true);
-					} else {
-						JOptionPane.showMessageDialog(null,
-								"Fehler beim erzeugen der Konfigurationsfile",
-								"Message", JOptionPane.ERROR_MESSAGE);
-					}
-
-				} catch (Exception e) {
-					e.printStackTrace();
-				}
-			}
-		});
-	}
-
-	/**
-	 * Create the frame.
-	 */
-	public Login_GUI() {
-		addWindowListener(new WindowAdapter() {
-			@Override
-			public void windowClosing(WindowEvent e) {
-				System.exit(0);
-			}
-		});
-
-		// Fenster darf nicht vergrößert werden
-		setResizable(false);
-		try {
-			// Setzt das Look and Feel auf System
-			UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
-		} catch (ClassNotFoundException | InstantiationException
-				| IllegalAccessException | UnsupportedLookAndFeelException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		// Titel des Fensters setzen
-		setTitle("Dozentenmodul *Prototyp*");
-		// Aktion die beim Schließen durchgeführt werden soll
-		setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
-		// Größe des Fensters definieren
-		Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
-		int top = (screenSize.height - 400) / 2;
-		int left = (screenSize.width - 603) / 2;
-		setBounds(left, top, 603, 400);
-		// Erzeugen eines Panels
-		contentPane = new JPanel();
-		// Hintergrund Farbe des Panels setzen
-		contentPane.setBackground(SystemColor.menu);
-		// Rahmen des Fensters setzen
-		contentPane.setBorder(new EmptyBorder(5, 5, 5, 5));
-		setContentPane(contentPane);
-		// Layout setzen
-		contentPane.setLayout(null);
-		// Label für das Logo erzeugen
-		JLabel imgLabel = new JLabel();
-		// Größe und Position des Logos festelegen
-		imgLabel.setBounds(150, 11, 350, 142);
-		// Pfadangabe des Logos
-
-		ImageIcon icon = new ImageIcon(getClass().getResource(
-				"/Logo_bwLehrpool.png"), "Logo");
-		// Skalierung des Logos
-		Image scaled = icon.getImage().getScaledInstance(270, 64, 0);
-		imgLabel.setIcon(new ImageIcon(scaled));
-		// Hinzufügen des Logos in das Fenster
-		contentPane.add(imgLabel);
-
-		// Erzeugen und Hinzufügen des Labels
-		JLabel LabelUser = new JLabel("bwIDM-Benutzername:");
-		LabelUser.setBounds(111, 164, 134, 20);
-		contentPane.add(LabelUser);
-
-		// Erzeugen und Hinzufügen des Textfeldes
-		username = new JTextField();
-		username.setToolTipText("Bitte geben Sie Ihren bwIDM-Benutzernamen ein.");
-		username.addActionListener(new ActionListener() {
-			public void actionPerformed(ActionEvent arg0) {
-				performLogin();
-			}
-		});
-		username.setBounds(304, 164, 196, 20);
-		contentPane.add(username);
-		username.setColumns(10);
-
-		// Erzeugen und Hinzufügen des Labels
-		JLabel LabelPass = new JLabel("bwIDM-Passwort:");
-		LabelPass.setBounds(111, 195, 134, 20);
-		contentPane.add(LabelPass);
-
-		// Erzeugen, Hinzufügen und definierung der Aktion des Buttons
-		JButton BtnLogin = new JButton("Login");
-		BtnLogin.addActionListener(new ActionListener() {
-			public void actionPerformed(ActionEvent arg0) {
-				performLogin();
-			}// end actionPerformed
-		});
-
-		BtnLogin.setBounds(304, 244, 196, 23);
-		contentPane.add(BtnLogin);
-
-		// Erzeugen und Hinzufügen des Passwortfeldes
-		pass = new JPasswordField();
-		pass.setToolTipText("Bitte geben Sie Ihr bwIDM-Passwort ein.");
-		pass.addActionListener(new ActionListener() {
-			public void actionPerformed(ActionEvent e) {
-				performLogin();
-			}
-		});
-		pass.setBounds(304, 195, 196, 20);
-		contentPane.add(pass);
-	}// end LoginGUI()
-
-	//Versuche den Benutzer einzuloggen
-	public void performLogin() {
-		// Aufruf der Ldap Klasse, welche die Ldap überprüfung vornimmt
-		// Ldap check=new Ldap();
-		boolean login = true;
-		// boolean login=check.LdapAuth(username.getText(), new
-		// String(pass.getPassword()));
-		MasterThriftConnection thrift = new MasterThriftConnection();
-		Client client = thrift.getMasterThriftConnection();
-		String token = null;
-		final thrift.SessionData result;
-		try {
-			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,
-				    "Benutzeranmeldung fehlgeschlagen: Bitte Benutzername und Passwort überprüfen.",
-				    "Anmeldung fehlgeschlagen",
-				    JOptionPane.ERROR_MESSAGE);
-
-			return;
-		} catch (TException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-			return;
-		}
-		System.out
-				.println("Konnte mich beim MasterServer authentifizieren. Meine Session-ID ist "
-						+ result.sessionId
-						+ ", mein Token für den Satelliten "
-						+ result.authToken);
-		token = result.authToken;
-		if (login == true) {
-
-			try {
-				Wini ini = new Wini(new File("C:\\Users\\"
-						+ System.getProperty("user.name")
-						+ "\\AppData\\Roaming\\bwLehrpoolSuite\\config.ini"));
-				// Prüfe ob Bills Of Rights schon akzeptiert wurden, wenn nicht
-				// zeige diese an
-				if (ini.get("main", "BillOfRights", boolean.class) == false) {
-					// Erstellen einer Instanz der Aktionsauswahl
-					BillOfRights_GUI re = new BillOfRights_GUI();
-					re.setVisible(true);
-					// Schließen des Fensters nach erfolgreichen Login
-					setVisible(false);
-				} else {
-					// Prüfe ob die Links zu vmware angezeigt werden sollen
-					if (ini.get("main", "vmware", boolean.class) == false) {
-						VmWareLink_GUI vm = new VmWareLink_GUI();
-						vm.setVisible(true);
-						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);
-						person.verantwortlicher.setEMail(user.eMail);
-						person.verantwortlicher.setHochschule(hochschule);
-						// Öffne das Hauprmenü
-						MainMenue_GUI main = new MainMenue_GUI();
-						main.setVisible(true);
-						setVisible(false);
-					}
-				}
-			} catch (IOException | TException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			}
-
-		} else {
-			JOptionPane.showMessageDialog(null, "Login denied!", "Message",
-					JOptionPane.INFORMATION_MESSAGE);
-		}
-	}// end performLogin
-
-}// end class
diff --git a/Dozentenmodul/src/gui/SearchEditImage_GUI.java b/Dozentenmodul/src/gui/SearchEditImage_GUI.java
deleted file mode 100644
index dbc2562c..00000000
--- a/Dozentenmodul/src/gui/SearchEditImage_GUI.java
+++ /dev/null
@@ -1,495 +0,0 @@
-package gui;
-
-
-import java.awt.Color;
-import java.awt.Dimension;
-import java.awt.FlowLayout;
-import java.awt.Font;
-import java.awt.SystemColor;
-import java.awt.Toolkit;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.KeyAdapter;
-import java.awt.event.KeyEvent;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-import java.awt.event.WindowAdapter;
-import java.awt.event.WindowEvent;
-import java.util.Iterator;
-import java.util.List;
-import javax.swing.JButton;
-import javax.swing.JComboBox;
-import javax.swing.JDialog;
-import javax.swing.JFrame;
-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;
-import javax.swing.JSeparator;
-import javax.swing.JTabbedPane;
-import javax.swing.JTable;
-import javax.swing.JTextField;
-import javax.swing.JTextPane;
-import javax.swing.RowFilter;
-import javax.swing.UIManager;
-import javax.swing.UnsupportedLookAndFeelException;
-import javax.swing.border.EmptyBorder;
-import javax.swing.border.TitledBorder;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
-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;
-
-import server.Server.Client;
-import thrift.ThriftConnection;
-
-
-@SuppressWarnings("serial")
-public class SearchEditImage_GUI extends JFrame {
-
-	private final JPanel contentPanel = new JPanel();
-	String[] result;
-	JRadioButton rdbtnInternetJa;
-	JRadioButton rdbtnInternetNein;
-	JComboBox<String> comboBox;
-	JTable tableAllImages;
-	JTable tablemyImages;
-	private JTextField textFieldName;
-	JTabbedPane tabbedPane;
-	String[] titles= {"Image-Name", "Lizenzpflichtig", "OS", "Veranstaltung", "Verantwortlicher", "Letztes Update", "Schlagwort","ID", "Version"};
-    ThriftConnection con=new ThriftConnection();
-    Client client=con.getThriftConnection();
-    final DefaultTableModel modelAll = new DefaultTableModel( titles, 0 );
-    final DefaultTableModel modelMyImages = new DefaultTableModel( titles, 0 );
-    final TableRowSorter<TableModel> rowSorterAll = new TableRowSorter<TableModel>( modelAll );
-    final TableRowSorter<TableModel> rowSorterMyImages = new TableRowSorter<TableModel>( modelMyImages );
-    
-	/**
-	 * Launch the application.
-	 */
-	public static void main(String[] args) {
-		try {
-			SearchEditImage_GUI dialog = new SearchEditImage_GUI();
-			dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
-			dialog.setVisible(true);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * Create the dialog.
-	 */
-	public SearchEditImage_GUI() {
-		addWindowListener(new WindowAdapter() {
-			@Override
-			public void windowClosing(WindowEvent arg0) {
-				//Beendet die Anwendung nach klick auf X
-				con.closeThriftConnection();
-				System.exit(0);
-			}
-		});
-		//Verhindert das Vergrößern Des Fensters
-		setResizable(false);
-		
-		try {
-			//Setzt das Look & Feel auf System
-			UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
-		} catch (ClassNotFoundException | InstantiationException
-				| IllegalAccessException | UnsupportedLookAndFeelException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		//Setzt den Fenstertitel
-		setTitle("bwLehrpool Suite *Prototyp*");
-		//Zentriert das Fenster in die Bildmitte
-		Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
-		int top=(screenSize.height - 722) / 2;
-		int left=(screenSize.width - 603) / 2;
-		setBounds(left, top, 603, 722);
-		
-
-		
-		final DefaultTableModel model = new DefaultTableModel( titles, 0 );
-		
-		
-		getContentPane().setLayout(null);
-		{
-			JPanel panel = new JPanel();
-			panel.setBackground(SystemColor.menu);
-			panel.setBounds(10, 11, 577, 57);
-			getContentPane().add(panel);
-			panel.setLayout(null);
-			{
-				JLabel lblNewLabel = new JLabel("Suche nach VL-Image");
-				lblNewLabel.setBounds(10, 11, 509, 22);
-				panel.add(lblNewLabel);
-				lblNewLabel.setFont(new Font("Tahoma", Font.BOLD, 18));
-			}
-			
-			JTextPane txtpnBitteWhlenSie = new JTextPane();
-			txtpnBitteWhlenSie.setEditable(false);
-			txtpnBitteWhlenSie.setBackground(SystemColor.menu);
-			txtpnBitteWhlenSie.setText("Hier k\u00F6nnen Sie nach Ihrem gew\u00FCnschten VL-Image suchen und dieses f\u00FCr weitere Schritte ausw\u00E4hlen");
-			txtpnBitteWhlenSie.setBounds(10, 36, 509, 32);
-			panel.add(txtpnBitteWhlenSie);
-		}
-		contentPanel.setBounds(10, 85, 577, 531);
-		contentPanel.setBackground(SystemColor.menu);
-		contentPanel.setBorder(new EmptyBorder(5, 5, 5, 5));
-		getContentPane().add(contentPanel);
-		contentPanel.setLayout(null);
-		
-		JPanel panel_1 = new JPanel();
-		panel_1.setBackground(SystemColor.menu);
-		panel_1.setBorder(new TitledBorder(null, "Filterfunktionen", TitledBorder.LEADING, TitledBorder.TOP, null, null));
-		panel_1.setBounds(10, 49, 557, 131);
-		contentPanel.add(panel_1);
-		panel_1.setLayout(null);
-		
-		JLabel lblNewLabel_2 = new JLabel("Anzeigename:");
-		lblNewLabel_2.setBounds(10, 30, 250, 20);
-		panel_1.add(lblNewLabel_2);
-		
-		JLabel lblInternetIstInnerhalb = new JLabel("Betriebssystem:");
-		lblInternetIstInnerhalb.setBounds(10, 58, 250, 20);
-		panel_1.add(lblInternetIstInnerhalb);
-		
-		textFieldName = new JTextField();
-		//Key Listener der Tastatureingabe registriert
-		textFieldName.addKeyListener(new KeyAdapter() {
-			@Override
-			public void keyReleased(KeyEvent e) {
-				//Textfield eingabe auslesen
-				String stext=textFieldName.getText();
-
-				//Wenn Textfield nicht leer
-				if(stext!="")
-				{
-					//Filtere nach der Eingabe
-					rowSorterAll.setRowFilter(RowFilter.regexFilter(textFieldName.getText(), 0));
-					rowSorterMyImages.setRowFilter(RowFilter.regexFilter(textFieldName.getText(), 0));
-					
-				}
-		}});
-
-
-		textFieldName.setBounds(270, 30, 250, 20);
-		panel_1.add(textFieldName);
-		textFieldName.setColumns(10);
-		
-		JLabel lblErweiterteSuche = new JLabel("<html><u>Erweiterte Suche</u></html>");
-		lblErweiterteSuche.addMouseListener(new MouseAdapter() {
-			@Override
-			public void mouseClicked(MouseEvent arg0) {
-				//Öffnet das Fenster Extended GUI
-				con.closeThriftConnection();
-				ExtendedSearch_GUI es=new ExtendedSearch_GUI();
-				es.setVisible(true);
-			}
-		});
-		lblErweiterteSuche.setForeground(Color.BLUE);
-		
-		lblErweiterteSuche.setBounds(431, 106, 89, 14);
-		panel_1.add(lblErweiterteSuche);
-		
-		comboBox = new JComboBox<String>();
-		try {
-			//Holt sich eine Liste aller verfügbaren Betriebssysteme vom Server
-			List<String> list=client.getAllOS();
-			//Leeres Item hinzufügen
-			comboBox.addItem("");
-			for(int i=0;i<list.size();i++)
-			{
-				//Hinzufügen der verfügbaren Betriebssysteme
-				comboBox.addItem(list.get(i));
-			}
-		} catch (TException e2) {
-			// TODO Auto-generated catch block
-			e2.printStackTrace();
-		}
-		//Registriert Auswahländerungen der Box
-		comboBox.addActionListener(new ActionListener() {
-			public void actionPerformed(ActionEvent arg0) {
-				//Prüft das die Auswahl nicht leer ist
-				if(comboBox.getSelectedItem().toString()!="")
-				{
-					//Filtert nach dem ausgewählten Betriebssystem
-					rowSorterAll.setRowFilter(RowFilter.regexFilter(comboBox.getSelectedItem().toString(), 2));
-					rowSorterMyImages.setRowFilter(RowFilter.regexFilter(comboBox.getSelectedItem().toString(), 2));
-				}							
-			}
-			
-		});
-		comboBox.setBounds(270, 58, 250, 20);
-		panel_1.add(comboBox);
-		
-		JLabel lblHauptmen = new JLabel("Hauptmen\u00FC");
-		lblHauptmen.addMouseListener(new MouseAdapter() {
-			@Override
-			public void mouseClicked(MouseEvent arg0) {
-				//Öffnet das Hauütmenü
-				con.closeThriftConnection();
-				SearchEditImage_GUI.this.setVisible(false);
-				MainMenue_GUI main=new MainMenue_GUI();
-				main.setVisible(true);
-			}
-		});
-		lblHauptmen.setForeground(Color.BLUE);
-		lblHauptmen.setBounds(10, 11, 61, 14);
-		contentPanel.add(lblHauptmen);
-		
-		JLabel label_1 = new JLabel(">");
-		label_1.setBounds(69, 11, 13, 14);
-		contentPanel.add(label_1);
-		
-		JLabel lblVlimage = new JLabel("VL-Image");
-		lblVlimage.setForeground(Color.BLUE);
-		lblVlimage.setBounds(81, 11, 45, 14);
-		contentPanel.add(lblVlimage);
-		
-		JLabel label_2 = new JLabel(">");
-		label_2.setBounds(133, 11, 13, 14);
-		contentPanel.add(label_2);
-		
-		JLabel lblNewLabel_1 = new JLabel("Imageauswahl");
-		lblNewLabel_1.setBounds(146, 11, 85, 14);
-		contentPanel.add(lblNewLabel_1);
-		
-		tabbedPane = new JTabbedPane(JTabbedPane.TOP);
-		tabbedPane.addChangeListener(new ChangeListener() {
-			public void stateChanged(ChangeEvent arg0) {
-				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){
-
-					
-					
-				}
-				
-			}
-		});
-
-		tabbedPane.setBounds(10, 197, 557, 300);
-		contentPanel.add(tabbedPane);
-		initTableModel(modelMyImages);
-		
-		JScrollPane scrollPaneAllImages = new JScrollPane();
-		tableAllImages=new JTable();
-		tableAllImages.setModel(modelAll);
-		tableAllImages.getColumnModel().getColumn(1).sizeWidthToFit();
-		tableAllImages.getColumnModel().getColumn(2).sizeWidthToFit();
-		tableAllImages.getColumnModel().getColumn(3).sizeWidthToFit();
-		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);
-		
-		JScrollPane scrollPaneCoopImages = new JScrollPane();
-		JTable tableCoopImages=new JTable();
-		tableCoopImages.setModel(model);
-		tableCoopImages.getColumnModel().getColumn(1).sizeWidthToFit();
-		tableCoopImages.getColumnModel().getColumn(2).sizeWidthToFit();
-		tableCoopImages.getColumnModel().getColumn(3).sizeWidthToFit();
-		tableCoopImages.getColumnModel().getColumn(4).sizeWidthToFit();
-		tableCoopImages.getColumnModel().getColumn(5).sizeWidthToFit();
-
-		scrollPaneCoopImages.setViewportView(tableCoopImages);
-		tabbedPane.addTab("Kooperative Images", null, scrollPaneCoopImages, null);
-		tabbedPane.setEnabledAt(2, false);
-		
-		JScrollPane scrollPanePublicImages = new JScrollPane();
-		JTable tablePublicImages=new JTable();
-		tablePublicImages.setModel(model);
-		tablePublicImages.getColumnModel().getColumn(1).sizeWidthToFit();
-		tablePublicImages.getColumnModel().getColumn(2).sizeWidthToFit();
-		tablePublicImages.getColumnModel().getColumn(3).sizeWidthToFit();
-		tablePublicImages.getColumnModel().getColumn(4).sizeWidthToFit();
-		tablePublicImages.getColumnModel().getColumn(5).sizeWidthToFit();
-
-		scrollPanePublicImages.setViewportView(tablePublicImages);
-		tabbedPane.addTab("\u00D6ffentliche Images", null, scrollPanePublicImages, null);
-		tabbedPane.setEnabledAt(3, false);
-		
-		JScrollPane scrollPanePublicVorlagen = new JScrollPane();
-		JTable tablePublicVorlagen=new JTable();
-		tablePublicVorlagen.setModel(model);
-		tablePublicVorlagen.getColumnModel().getColumn(1).sizeWidthToFit();
-		tablePublicVorlagen.getColumnModel().getColumn(2).sizeWidthToFit();
-		tablePublicVorlagen.getColumnModel().getColumn(3).sizeWidthToFit();
-		tablePublicVorlagen.getColumnModel().getColumn(4).sizeWidthToFit();
-		tablePublicVorlagen.getColumnModel().getColumn(5).sizeWidthToFit();
-
-		scrollPanePublicVorlagen.setViewportView(tablePublicVorlagen);
-		tabbedPane.addTab("\u00D6ffentliche Vorlagen", null, scrollPanePublicVorlagen, null);
-		tabbedPane.setEnabledAt(4, false);
-		
-		
-		
-
-		JButton btnDownload = new JButton("Download");
-		btnDownload.addActionListener(new ActionListener() {
-			public void actionPerformed(ActionEvent arg0) {
-				//Öffnet den Downloader
-				
-				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);
-		contentPanel.add(btnDownload);
-		{
-			JPanel buttonPane = new JPanel();
-			buttonPane.setBounds(0, 640, 597, 33);
-			buttonPane.setBackground(SystemColor.menu);
-			buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT));
-			getContentPane().add(buttonPane);
-			{
-				JButton okButton = new JButton("Zur\u00FCck");
-				okButton.addActionListener(new ActionListener() {
-					public void actionPerformed(ActionEvent e) {
-						//Öffnet das Hauptmenü
-						con.closeThriftConnection();
-						MainMenue_GUI main=new MainMenue_GUI();
-						main.setVisible(true);
-						dispose();
-					}
-				});
-				okButton.setActionCommand("OK");
-				buttonPane.add(okButton);
-				getRootPane().setDefaultButton(okButton);
-			}
-			{
-				JButton cancelButton = new JButton("Weiter");
-				cancelButton.addActionListener(new ActionListener() {
-					public void actionPerformed(ActionEvent e) {
-						con.closeThriftConnection();
-						
-						//Image.image.setImageId(imageid);
-						if(tabbedPane.getSelectedIndex()==0){
-						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);
-						con.closeThriftConnection();
-						EditImageAllgemein_GUI ea=new EditImageAllgemein_GUI();
-						ea.setVisible(true);
-						dispose();		
-						}
-						else{
-							JOptionPane.showMessageDialog(null, "Bitte wählen Sie ein eigenes Image aus", "Message",
-									JOptionPane.INFORMATION_MESSAGE);
-						}
-					}
-				});
-				cancelButton.setActionCommand("Cancel");
-				buttonPane.add(cancelButton);
-			}
-		}
-		
-		JSeparator separator = new JSeparator();
-		separator.setBounds(0, 78, 597, 2);
-		getContentPane().add(separator);
-		
-		JSeparator separator_1 = new JSeparator();
-		separator_1.setBounds(0, 627, 597, 2);
-		getContentPane().add(separator_1);
-		
-		JMenuBar menuBar = new JMenuBar();
-		setJMenuBar(menuBar);
-		
-		JMenu mnNewMenu_1 = new JMenu("Hilfe");
-		menuBar.add(mnNewMenu_1);
-		
-		JMenuItem mntmFaq = new JMenuItem("FAQ");
-		mnNewMenu_1.add(mntmFaq);
-		
-		JMenuItem mntmOtrs = new JMenuItem("OTRS");
-		mnNewMenu_1.add(mntmOtrs);
-		
-	}
-	//Initiale Beffülung eines Table models
-	public DefaultTableModel initTableModel(DefaultTableModel model){
-		List<server.Image> images;
-		try {
-			//Hole eine Liste der Images
-			images = client.getImageList();
-			
-			Iterator<server.Image> i=images.iterator();
-			
-			int x=0;
-			
-			while(i.hasNext())
-			{
-				//erzeuge Objekte für die Tabelle
-				Object [] obj={images.get(x).getImageName(),images.get(x).getLicenseRestriction(),images.get(x).getOsName(),images.get(x).getLectureName(),images.get(x).getUserData(),images.get(x).getUpdateTime(),"",images.get(x).id,images.get(x).getVersion()};
-				//System.out.println("id:"+images.get(x).getId());
-				//Füge diese Objekte der Tabelle hinzu
-				model.addRow(obj);
-				x++;
-				i.next();
-				
-			}
-			
-			return model;
-		} catch (TException e1) {
-			// TODO Auto-generated catch block
-			e1.printStackTrace();
-		}
-		return model;
-	}
-	
-	}
-
-
diff --git a/Dozentenmodul/src/gui/SearchMethod_GUI.java b/Dozentenmodul/src/gui/SearchMethod_GUI.java
deleted file mode 100644
index 24a12959..00000000
--- a/Dozentenmodul/src/gui/SearchMethod_GUI.java
+++ /dev/null
@@ -1,243 +0,0 @@
-package gui;
-
-
-import java.awt.Color;
-import java.awt.Dimension;
-import java.awt.FlowLayout;
-import java.awt.Font;
-import java.awt.SystemColor;
-import java.awt.Toolkit;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-import java.awt.event.WindowAdapter;
-import java.awt.event.WindowEvent;
-
-import javax.swing.ButtonGroup;
-import javax.swing.JButton;
-import javax.swing.JDialog;
-import javax.swing.JFrame;
-import javax.swing.JLabel;
-import javax.swing.JMenu;
-import javax.swing.JMenuBar;
-import javax.swing.JMenuItem;
-import javax.swing.JPanel;
-import javax.swing.JRadioButton;
-import javax.swing.JSeparator;
-import javax.swing.JTextArea;
-import javax.swing.JTextPane;
-import javax.swing.UIManager;
-import javax.swing.UnsupportedLookAndFeelException;
-import javax.swing.border.EmptyBorder;
-import javax.swing.border.TitledBorder;
-
-@SuppressWarnings("serial")
-public class SearchMethod_GUI extends JFrame {
-
-	private final JPanel contentPanel = new JPanel();
-	String[] result;
-	JRadioButton rdbtnNachEinemVlimage;
-	JRadioButton rdbtnNachEinerVeranstaltung;
-	private final ButtonGroup buttonGroup = new ButtonGroup();
-	/**
-	 * Launch the application.
-	 */
-	public static void main(String[] args) {
-		try {
-			SearchMethod_GUI dialog = new SearchMethod_GUI();
-			dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
-			dialog.setVisible(true);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * Create the dialog.
-	 */
-	public SearchMethod_GUI() {
-		addWindowListener(new WindowAdapter() {
-			@Override
-			public void windowClosing(WindowEvent arg0) {
-				System.exit(0);
-			}
-		});
-		setResizable(false);
-		
-		try {
-			UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
-		} catch (ClassNotFoundException | InstantiationException
-				| IllegalAccessException | UnsupportedLookAndFeelException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		setTitle("bwLehrpool Suite *Prototyp*");
-		Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
-		int top=(screenSize.height - 603) / 2;
-		int left=(screenSize.width - 722) / 2;
-		setBounds(left, top, 603, 722);
-		//setBounds(100, 100, 603, 722);
-		getContentPane().setLayout(null);
-		{
-			JPanel panel = new JPanel();
-			panel.setBackground(SystemColor.menu);
-			panel.setBounds(10, 11, 577, 57);
-			getContentPane().add(panel);
-			panel.setLayout(null);
-			{
-				JLabel lblNewLabel = new JLabel("Eingabe Ihrer Daten");
-				lblNewLabel.setBounds(10, 11, 509, 22);
-				panel.add(lblNewLabel);
-				lblNewLabel.setFont(new Font("Tahoma", Font.BOLD, 18));
-			}
-			
-			JTextPane txtpnBitteWhlenSie = new JTextPane();
-			txtpnBitteWhlenSie.setEditable(false);
-			txtpnBitteWhlenSie.setBackground(SystemColor.menu);
-			txtpnBitteWhlenSie.setText("Geben Sie hier bitte einen sprechenden Imagename sowie Ihre Kontaktdaten an");
-			txtpnBitteWhlenSie.setBounds(10, 36, 509, 32);
-			panel.add(txtpnBitteWhlenSie);
-		}
-		contentPanel.setBounds(10, 85, 577, 493);
-		contentPanel.setBackground(SystemColor.menu);
-		contentPanel.setBorder(new EmptyBorder(5, 5, 5, 5));
-		getContentPane().add(contentPanel);
-		contentPanel.setLayout(null);
-		
-		JPanel panel_1 = new JPanel();
-		panel_1.setBackground(SystemColor.menu);
-		panel_1.setBorder(new TitledBorder(null, "Wählen Sie bitte die Suchmethode Ihrer Suche", TitledBorder.LEADING, TitledBorder.TOP, null, null));
-		panel_1.setBounds(10, 36, 557, 369);
-		contentPanel.add(panel_1);
-		panel_1.setLayout(null);
-		
-		rdbtnNachEinemVlimage = new JRadioButton("Nach einem VL-Image oder Vorlagen suchen");
-		buttonGroup.add(rdbtnNachEinemVlimage);
-		rdbtnNachEinemVlimage.setBounds(6, 38, 545, 23);
-		panel_1.add(rdbtnNachEinemVlimage);
-		
-		JTextArea txtrHierKlickenWenn = new JTextArea();
-		txtrHierKlickenWenn.setBackground(SystemColor.menu);
-		txtrHierKlickenWenn.setLineWrap(true);
-		txtrHierKlickenWenn.setFont(new Font("Tahoma", Font.PLAIN, 11));
-		txtrHierKlickenWenn.setText("Hier klicken, wenn Sie nach einem konkreten Image suchen, von dem Sie exakte Daten kennen. Hierzu geh\u00F6ren z.B. das Betriebssystem oder die installierte Software.\r\nEs werden zudem alle Vorlagen aufgelistet.");
-		txtrHierKlickenWenn.setBounds(25, 68, 518, 80);
-		panel_1.add(txtrHierKlickenWenn);
-		
-		JTextArea txtrHierKlickenWenn_1 = new JTextArea();
-		txtrHierKlickenWenn_1.setText("Hier klicken, wenn Sie nur wissen f\u00FCr welche Veranstaltung das gesuchte Image verwendet wird. Hierzu geh\u00F6ren z.B. der Name des Dozenten oder der Name der Veranstaltung.");
-		txtrHierKlickenWenn_1.setLineWrap(true);
-		txtrHierKlickenWenn_1.setFont(new Font("Tahoma", Font.PLAIN, 11));
-		txtrHierKlickenWenn_1.setBackground(SystemColor.menu);
-		txtrHierKlickenWenn_1.setBounds(25, 210, 518, 80);
-		panel_1.add(txtrHierKlickenWenn_1);
-		
-		rdbtnNachEinerVeranstaltung = new JRadioButton("Nach einer Veranstaltung suchen");
-		buttonGroup.add(rdbtnNachEinerVeranstaltung);
-		rdbtnNachEinerVeranstaltung.setBounds(6, 180, 545, 23);
-		panel_1.add(rdbtnNachEinerVeranstaltung);
-		
-		JPanel panel = new JPanel();
-		panel.setBounds(10, 402, 577, 33);
-		contentPanel.add(panel);
-		panel.setLayout(null);
-		panel.setBorder(new EmptyBorder(5, 5, 5, 5));
-		panel.setBackground(SystemColor.menu);
-		
-		JLabel lblHauptmen = new JLabel("Hauptmen\u00FC");
-		lblHauptmen.addMouseListener(new MouseAdapter() {
-			@Override
-			public void mouseClicked(MouseEvent arg0) {
-				
-				SearchMethod_GUI.this.setVisible(false);
-				MainMenue_GUI main=new MainMenue_GUI();
-				main.setVisible(true);
-			}
-		});
-		lblHauptmen.setForeground(Color.BLUE);
-		lblHauptmen.setBounds(10, 11, 61, 14);
-		contentPanel.add(lblHauptmen);
-		
-		JLabel label_1 = new JLabel(">");
-		label_1.setBounds(69, 11, 13, 14);
-		contentPanel.add(label_1);
-		
-		JLabel lblVlimage = new JLabel("VL-Image");
-		lblVlimage.setForeground(Color.BLUE);
-		lblVlimage.setBounds(81, 11, 45, 14);
-		contentPanel.add(lblVlimage);
-		
-		JLabel label_2 = new JLabel(">");
-		label_2.setBounds(133, 11, 13, 14);
-		contentPanel.add(label_2);
-		
-		JLabel lblNewLabel_1 = new JLabel("Suchmethode");
-		lblNewLabel_1.setBounds(146, 11, 82, 14);
-		contentPanel.add(lblNewLabel_1);
-		{
-			JPanel buttonPane = new JPanel();
-			buttonPane.setBounds(0, 640, 597, 33);
-			buttonPane.setBackground(SystemColor.menu);
-			buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT));
-			getContentPane().add(buttonPane);
-			{
-				JButton okButton = new JButton("Zur\u00FCck");
-				okButton.addActionListener(new ActionListener() {
-					public void actionPerformed(ActionEvent e) {
-						MainMenue_GUI sr=new MainMenue_GUI();
-						sr.setVisible(true);
-						dispose();
-					}
-				});
-				okButton.setActionCommand("OK");
-				buttonPane.add(okButton);
-				getRootPane().setDefaultButton(okButton);
-			}
-			{
-				JButton cancelButton = new JButton("Weiter");
-				cancelButton.addActionListener(new ActionListener() {
-					public void actionPerformed(ActionEvent e) {
-					
-						if(rdbtnNachEinemVlimage.isSelected()==true)
-						{
-						SearchImage_GUI ea=new SearchImage_GUI();
-						ea.setVisible(true);
-						dispose();
-						}
-						}
-
-					});
-				cancelButton.setActionCommand("Cancel");
-				buttonPane.add(cancelButton);
-			}
-		}
-		
-		JSeparator separator = new JSeparator();
-		separator.setBounds(0, 78, 597, 2);
-		getContentPane().add(separator);
-		
-		JSeparator separator_1 = new JSeparator();
-		separator_1.setBounds(0, 627, 597, 2);
-		getContentPane().add(separator_1);
-		
-		JMenuBar menuBar = new JMenuBar();
-		setJMenuBar(menuBar);
-		
-		JMenu mnNewMenu = new JMenu("Suchen");
-		menuBar.add(mnNewMenu);
-		
-		JMenuItem mntmVlSuche = new JMenuItem("VL Suche");
-		mnNewMenu.add(mntmVlSuche);
-		
-		JMenu mnNewMenu_1 = new JMenu("Hilfe");
-		menuBar.add(mnNewMenu_1);
-		
-		JMenuItem mntmFaq = new JMenuItem("FAQ");
-		mnNewMenu_1.add(mntmFaq);
-		
-		JMenuItem mntmOtrs = new JMenuItem("OTRS");
-		mnNewMenu_1.add(mntmOtrs);
-		
-	}
-}
diff --git a/Dozentenmodul/src/gui/VmWareLink_GUI.java b/Dozentenmodul/src/gui/VmWareLink_GUI.java
deleted file mode 100644
index 43df06a6..00000000
--- a/Dozentenmodul/src/gui/VmWareLink_GUI.java
+++ /dev/null
@@ -1,215 +0,0 @@
-package gui;
-
-import java.awt.Desktop;
-import java.awt.Dimension;
-import java.awt.FlowLayout;
-import java.awt.Toolkit;
-import javax.swing.JFrame;
-import javax.swing.JButton;
-import javax.swing.JDialog;
-import javax.swing.JPanel;
-import javax.swing.UIManager;
-import javax.swing.UnsupportedLookAndFeelException;
-import javax.swing.border.EmptyBorder;
-import javax.swing.JLabel;
-import java.awt.Font;
-import javax.swing.JTextPane;
-import java.awt.SystemColor;
-import java.awt.event.ActionListener;
-import java.awt.event.ActionEvent;
-import javax.swing.JSeparator;
-import javax.swing.JMenuBar;
-import javax.swing.JMenu;
-import javax.swing.JMenuItem;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-import java.io.File;
-import java.io.IOException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.awt.event.WindowAdapter;
-import java.awt.event.WindowEvent;
-import javax.swing.JCheckBox;
-import javax.swing.event.ChangeListener;
-import javax.swing.event.ChangeEvent;
-
-import org.ini4j.InvalidFileFormatException;
-import org.ini4j.Wini;
-
-
-@SuppressWarnings("serial")
-public class VmWareLink_GUI extends JFrame {
-
-	private final JPanel contentPanel = new JPanel();
-	String[] result;
-	JCheckBox chckbxNewCheckBox;
-	/**
-	 * Launch the application.
-	 */
-	public static void main(String[] args) {
-		try {
-			VmWareLink_GUI dialog = new VmWareLink_GUI();
-			dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
-			dialog.setVisible(true);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * Create the dialog.
-	 */
-	public VmWareLink_GUI() {
-		addWindowListener(new WindowAdapter() {
-			@Override
-			public void windowClosing(WindowEvent e) {
-				System.exit(0);
-			}
-		});
-		try {
-			UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
-		} catch (ClassNotFoundException | InstantiationException
-				| IllegalAccessException | UnsupportedLookAndFeelException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		setTitle("Dozentenmodul *Prototyp*");
-		Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
-		int top=(screenSize.height - 722) / 2;
-		int left=(screenSize.width - 603) / 2;
-		setBounds(left, top, 603, 722);
-		//setBounds(100, 100, 603, 722);
-		getContentPane().setLayout(null);
-		{
-			JPanel panel = new JPanel();
-			panel.setBounds(0, 0, 577, 80);
-			getContentPane().add(panel);
-			panel.setLayout(null);
-			{
-				JLabel lblNewLabel = new JLabel("Hinweis VMWare Player");
-				lblNewLabel.setBounds(10, 11, 509, 22);
-				panel.add(lblNewLabel);
-				lblNewLabel.setFont(new Font("Tahoma", Font.PLAIN, 18));
-			}
-			
-			JTextPane txtpnBitteWhlenSie = new JTextPane();
-			txtpnBitteWhlenSie.setEditable(false);
-			txtpnBitteWhlenSie.setBackground(SystemColor.menu);
-			txtpnBitteWhlenSie.setBounds(10, 36, 509, 42);
-			panel.add(txtpnBitteWhlenSie);
-		}
-		contentPanel.setBounds(10, 104, 567, 502);
-		contentPanel.setBackground(SystemColor.menu);
-		contentPanel.setBorder(new EmptyBorder(5, 5, 5, 5));
-		getContentPane().add(contentPanel);
-		contentPanel.setLayout(null);
-		
-		JTextPane txtpnUmIhreVmdk = new JTextPane();
-		txtpnUmIhreVmdk.setBackground(SystemColor.menu);
-		txtpnUmIhreVmdk.setEditable(false);
-		txtpnUmIhreVmdk.setText("F\u00FCr die Arbeit mit der bwLehrpool Suite wird zwingend ein VMWare Player ben\u00F6tigt. Diesen k\u00F6nnen Sie sich unter folgendem Link kostenfrei downloaden.");
-		txtpnUmIhreVmdk.setBounds(10, 16, 499, 66);
-		contentPanel.add(txtpnUmIhreVmdk);
-		
-		JLabel lblNewLabel_1 = new JLabel("<html><b>Windows: </b></html>");
-		lblNewLabel_1.addMouseListener(new MouseAdapter() {
-			@Override
-			public void mouseReleased(MouseEvent arg0) {
-				URI url;
-				try {
-					url = new URI("https://my.vmware.com/web/vmware/free#desktop_end_user_computing/vmware_player/6_0");
-					Desktop.getDesktop().browse(url);
-				} catch (URISyntaxException | IOException e) {
-					// TODO Auto-generated catch block
-					e.printStackTrace();
-				}
-				
-			}
-		});
-	
-		lblNewLabel_1.setBounds(10, 93, 499, 14);
-		contentPanel.add(lblNewLabel_1);
-		
-		chckbxNewCheckBox = new JCheckBox("Diese Benachrichtigung nicht mehr anzeigen.");
-		chckbxNewCheckBox.addChangeListener(new ChangeListener() {
-			public void stateChanged(ChangeEvent arg0) {
-				if(chckbxNewCheckBox.isSelected()==true)
-				{
-					try {
-						Wini ini=new Wini(new File("C:\\Users\\"+System.getProperty("user.name")+"\\AppData\\Roaming\\bwLehrpoolSuite\\config.ini"));
-						ini.put("main", "vmware",true);
-						ini.store();
-					} catch (InvalidFileFormatException e1) {
-						// TODO Auto-generated catch block
-						e1.printStackTrace();
-					} catch (IOException e1) {
-						// TODO Auto-generated catch block
-						e1.printStackTrace();
-					}
-				}
-			}
-		});
-		chckbxNewCheckBox.setBounds(6, 472, 555, 23);
-		contentPanel.add(chckbxNewCheckBox);
-		
-		JLabel lbllinuxvmwarePlayer = new JLabel("<html><b>Linux:    </b></html>");
-		lbllinuxvmwarePlayer.setBounds(10, 178, 499, 14);
-		contentPanel.add(lbllinuxvmwarePlayer);
-		
-		JLabel lblvmwarePlayerDownload = new JLabel("<html><a href=\"https:////my.vmware.com//web//vmware//free#desktop_end_user_computing//vmware_player//6_0\" >vmWare Player Download</a></html>");
-		lblvmwarePlayerDownload.setBounds(10, 118, 499, 14);
-		contentPanel.add(lblvmwarePlayerDownload);
-		
-		JLabel lblvmwarePlayerDownload_1 = new JLabel("<html><a href=\"https:////my.vmware.com//web//vmware//free#desktop_end_user_computing//vmware_player//6_0\" >vmWare Player Download</a></html>");
-		lblvmwarePlayerDownload_1.setBounds(10, 203, 499, 14);
-		contentPanel.add(lblvmwarePlayerDownload_1);
-		{
-			JPanel buttonPane = new JPanel();
-			buttonPane.setBounds(0, 630, 587, 33);
-			buttonPane.setBackground(SystemColor.menu);
-			buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT));
-			getContentPane().add(buttonPane);
-			{
-				JButton cancelButton = new JButton("Weiter");
-				cancelButton.addActionListener(new ActionListener() {
-					public void actionPerformed(ActionEvent e) {
-						MainMenue_GUI ea=new MainMenue_GUI();
-						ea.setVisible(true);
-						dispose();
-					}
-				});
-				cancelButton.setActionCommand("Cancel");
-				buttonPane.add(cancelButton);
-			}
-		}
-		{
-			JSeparator separator = new JSeparator();
-			separator.setBounds(0, 617, 587, 2);
-			getContentPane().add(separator);
-		}
-		{
-			JSeparator separator = new JSeparator();
-			separator.setBounds(0, 91, 587, 2);
-			getContentPane().add(separator);
-		}
-		{
-			JMenuBar menuBar = new JMenuBar();
-			setJMenuBar(menuBar);
-			{
-				JMenu mnHilfe = new JMenu("Hilfe");
-				menuBar.add(mnHilfe);
-				{
-					JMenuItem mntmFaq = new JMenuItem("FAQ");
-					mnHilfe.add(mntmFaq);
-				}
-				{
-					JMenuItem mntmHilfe = new JMenuItem("Hilfe");
-					mnHilfe.add(mntmHilfe);
-				}
-			}
-		}
-		
-		
-
-	}
-}
diff --git a/Dozentenmodul/src/gui/EingabeImageAllgemein_GUI.java b/Dozentenmodul/src/gui/image/CreateImageAllgemein_GUI.java
index da4f6997..bf1d0230 100644
--- a/Dozentenmodul/src/gui/EingabeImageAllgemein_GUI.java
+++ b/Dozentenmodul/src/gui/image/CreateImageAllgemein_GUI.java
@@ -1,6 +1,8 @@
-package gui;
+package gui.image;
 
 
+import gui.intro.MainMenue_GUI;
+
 import java.awt.Dimension;
 import java.awt.FlowLayout;
 import java.awt.Toolkit;
@@ -36,7 +38,7 @@ import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 
 @SuppressWarnings("serial")
-public class EingabeImageAllgemein_GUI extends JFrame {
+public class CreateImageAllgemein_GUI extends JFrame {
 
 	private final JPanel contentPanel = new JPanel();
 	String[] result;
@@ -49,7 +51,7 @@ public class EingabeImageAllgemein_GUI extends JFrame {
 	/**
 	 * Create the dialog.
 	 */
-	public EingabeImageAllgemein_GUI() {
+	public CreateImageAllgemein_GUI() {
 		addWindowListener(new WindowAdapter() {
 			@Override
 			public void windowClosing(WindowEvent arg0) {
@@ -209,7 +211,7 @@ public class EingabeImageAllgemein_GUI extends JFrame {
 			@Override
 			public void mouseClicked(MouseEvent arg0) {
 				//Öffnet das Hauptmenü
-				EingabeImageAllgemein_GUI.this.setVisible(false);
+				CreateImageAllgemein_GUI.this.setVisible(false);
 				MainMenue_GUI main=new MainMenue_GUI();
 				main.setVisible(true);
 			}
@@ -262,13 +264,13 @@ public class EingabeImageAllgemein_GUI extends JFrame {
 						{
 						//Schreibt die Daten in das Model
 						Image.image.setImagename(imagename.getText());
-						EingabeImageTechnisch_GUI ea=new EingabeImageTechnisch_GUI();
+						CreateImageTechnisch_GUI ea=new CreateImageTechnisch_GUI();
 						ea.setVisible(true);
 						dispose();
 						}
 						else{
 							JOptionPane.showMessageDialog(null, "Bitte geben Sie alle notwendigen Daten an!",
-									"Error", JOptionPane.ERROR_MESSAGE);	
+									"Daten unvollständig", JOptionPane.INFORMATION_MESSAGE);	
 						}
 					}
 				});
diff --git a/Dozentenmodul/src/gui/EingabeImageTechnisch_GUI.java b/Dozentenmodul/src/gui/image/CreateImageTechnisch_GUI.java
index 7c26ca23..e9d2d91a 100644
--- a/Dozentenmodul/src/gui/EingabeImageTechnisch_GUI.java
+++ b/Dozentenmodul/src/gui/image/CreateImageTechnisch_GUI.java
@@ -1,6 +1,8 @@
-package gui;
+package gui.image;
 
 
+import gui.intro.MainMenue_GUI;
+
 import java.awt.Dimension;
 import java.awt.FlowLayout;
 import java.awt.Toolkit;
@@ -36,7 +38,7 @@ import javax.swing.SpinnerNumberModel;
 import models.Image;
 
 @SuppressWarnings("serial")
-public class EingabeImageTechnisch_GUI extends JFrame {
+public class CreateImageTechnisch_GUI extends JFrame {
 
 	private final JPanel contentPanel = new JPanel();
 	String[] result;
@@ -53,7 +55,7 @@ public class EingabeImageTechnisch_GUI extends JFrame {
 	 */
 	public static void main(String[] args) {
 		try {
-			EingabeImageTechnisch_GUI dialog = new EingabeImageTechnisch_GUI();
+			CreateImageTechnisch_GUI dialog = new CreateImageTechnisch_GUI();
 			dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
 			dialog.setVisible(true);
 		} catch (Exception e) {
@@ -64,7 +66,7 @@ public class EingabeImageTechnisch_GUI extends JFrame {
 	/**
 	 * Create the dialog.
 	 */
-	public EingabeImageTechnisch_GUI() {
+	public CreateImageTechnisch_GUI() {
 		addWindowListener(new WindowAdapter() {
 			@Override
 			public void windowClosing(WindowEvent arg0) {
@@ -234,7 +236,7 @@ public class EingabeImageTechnisch_GUI extends JFrame {
 			@Override
 			public void mouseClicked(MouseEvent arg0) {
 				
-				EingabeImageTechnisch_GUI.this.setVisible(false);
+				CreateImageTechnisch_GUI.this.setVisible(false);
 				MainMenue_GUI main=new MainMenue_GUI();
 				main.setVisible(true);
 			}
@@ -290,7 +292,7 @@ public class EingabeImageTechnisch_GUI extends JFrame {
 						Image.image.setCpu(Integer.valueOf(spinnerCPU.getValue().toString()).intValue());
 						Image.image.setRam(Integer.valueOf(spinnerRam.getValue().toString()).intValue());
 						
-						EingabeImageAllgemein_GUI sr=new EingabeImageAllgemein_GUI();
+						CreateImageAllgemein_GUI sr=new CreateImageAllgemein_GUI();
 						sr.setVisible(true);
 						dispose();
 					}
@@ -322,7 +324,7 @@ public class EingabeImageTechnisch_GUI extends JFrame {
 						}
 						Image.image.setCpu(Integer.valueOf(spinnerCPU.getValue().toString()).intValue());
 						Image.image.setRam(Integer.valueOf(spinnerRam.getValue().toString()).intValue());
-						FTPUploader_GUI ea=new FTPUploader_GUI();
+						FTPCreateUploader_GUI ea=new FTPCreateUploader_GUI();
 						ea.setVisible(true);
 						dispose();
 						
diff --git a/Dozentenmodul/src/gui/DeleteImage_GUI.java b/Dozentenmodul/src/gui/image/DeleteImage_GUI.java
index 7ee5209b..0611880c 100644
--- a/Dozentenmodul/src/gui/DeleteImage_GUI.java
+++ b/Dozentenmodul/src/gui/image/DeleteImage_GUI.java
@@ -1,6 +1,9 @@
-package gui;
+package gui.image;
 
 
+import gui.intro.MainMenue_GUI;
+import gui.lecture.ExtendedSearchForImages_GUI;
+
 import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.FlowLayout;
@@ -193,8 +196,12 @@ public class DeleteImage_GUI extends JFrame {
 			@Override
 			public void mouseClicked(MouseEvent arg0) {
 				//Öffnet das Fenster Extended GUI
+<<<<<<< HEAD:Dozentenmodul/src/gui/DeleteImage_GUI.java
 				con.closeThriftConnection();
 				ExtendedSearch_GUI es=new ExtendedSearch_GUI();
+=======
+				ExtendedSearchForImages_GUI es=new ExtendedSearchForImages_GUI();
+>>>>>>> 0c626844e491923e61657f5483586b9a2a3f6bb8:Dozentenmodul/src/gui/image/DeleteImage_GUI.java
 				es.setVisible(true);
 			}
 		});
diff --git a/Dozentenmodul/src/GUI/EditImageAllgemein_GUI.java b/Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java
index 1d30e9d0..b80e4953 100644
--- a/Dozentenmodul/src/GUI/EditImageAllgemein_GUI.java
+++ b/Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java
@@ -1,4 +1,6 @@
-package gui;
+package gui.image;
+
+import gui.intro.MainMenue_GUI;
 
 import java.awt.Color;
 import java.awt.Dimension;
@@ -13,7 +15,6 @@ import java.awt.event.MouseEvent;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
 import java.util.Map;
-
 import javax.swing.JButton;
 import javax.swing.JFrame;
 import javax.swing.JLabel;
@@ -30,15 +31,11 @@ import javax.swing.UIManager;
 import javax.swing.UnsupportedLookAndFeelException;
 import javax.swing.border.EmptyBorder;
 import javax.swing.border.TitledBorder;
-
 import org.apache.thrift.TException;
-
 import models.Image;
 import models.person;
 import server.Server.Client;
 import thrift.ThriftConnection;
-//import org.eclipse.wb.swing.FocusTraversalOnArray;
-import java.awt.Component;
 
 @SuppressWarnings("serial")
 public class EditImageAllgemein_GUI extends JFrame {
@@ -257,8 +254,8 @@ 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);
+						SearchEditImage_GUI se=new SearchEditImage_GUI();
+						se.setVisible(true);
 						dispose();
 					}
 				});
@@ -270,17 +267,12 @@ public class EditImageAllgemein_GUI extends JFrame {
 				okButton = new JButton("Weiter");
 				okButton.addActionListener(new ActionListener() {
 					public void actionPerformed(ActionEvent arg0) {
-						System.out.println("text length="+imagename.getText().length());
-						//Setzen der Eingabe im Model, dadurch bleiben die Daten bei einem erneuten Aufruf verfügbar
-
-						//TODO
-						//Prüfung ob alle notwendigen Felder ausgefüllt sind --> funktioniert aktuell nicht
-						//der Button wechselt beim Klick auf die nächste Seite, selbst wenn kein handler implementiert ist... WTF???
+						//check is textfield has content
 						if(imagename.getText().length() <= 0){
 							JOptionPane.showMessageDialog(null,
 								    "Bitte geben Sie einen Labornamen ein.",
 								    "Daten nicht vollständig",
-								    JOptionPane.WARNING_MESSAGE);
+								    JOptionPane.INFORMATION_MESSAGE);
 						} else {
 							Image.image.setNewName(imagename.getText());
 							con.closeThriftConnection();
diff --git a/Dozentenmodul/src/GUI/EditImageTechnisch_GUI.java b/Dozentenmodul/src/gui/image/EditImageTechnisch_GUI.java
index 3c6109ae..7d9de383 100644
--- a/Dozentenmodul/src/GUI/EditImageTechnisch_GUI.java
+++ b/Dozentenmodul/src/gui/image/EditImageTechnisch_GUI.java
@@ -1,5 +1,6 @@
-package gui;
+package gui.image;
 
+import gui.intro.MainMenue_GUI;
 
 import java.awt.Color;
 import java.awt.Dimension;
@@ -13,9 +14,6 @@ import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
-import java.util.HashMap;
-import java.util.Map;
-
 import javax.swing.ButtonGroup;
 import javax.swing.JButton;
 import javax.swing.JFrame;
@@ -34,12 +32,6 @@ import javax.swing.UIManager;
 import javax.swing.UnsupportedLookAndFeelException;
 import javax.swing.border.EmptyBorder;
 import javax.swing.border.TitledBorder;
-
-import org.apache.thrift.TException;
-
-import server.Server.Client;
-import thrift.ThriftConnection;
-
 import models.Image;
 
 @SuppressWarnings("serial")
@@ -56,7 +48,6 @@ public class EditImageTechnisch_GUI extends JFrame {
 	private final ButtonGroup buttonGrouplicense = new ButtonGroup();
 	private final ButtonGroup buttonGroupInternet = new ButtonGroup();
 
-
 	/**
 	 * Create the dialog.
 	 */
@@ -64,32 +55,31 @@ public class EditImageTechnisch_GUI extends JFrame {
 		addWindowListener(new WindowAdapter() {
 			@Override
 			public void windowClosing(WindowEvent arg0) {
-				//Beendet die Anwendung bei Klick auf das X 
-				
+				// Beendet die Anwendung bei Klick auf das X
+
 				System.exit(0);
 			}
-			
+
 		});
-		//Verhindert das Vergrößern des Fensters
+		// Verhindert das Vergrößern des Fensters
 		setResizable(false);
-		
+
 		try {
-			//setzt das Look & Feel
+			// setzt das Look & Feel
 			UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
 		} catch (ClassNotFoundException | InstantiationException
 				| IllegalAccessException | UnsupportedLookAndFeelException e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
 		}
-		//Setzt den Titel des Fensters
+		// Setzt den Titel des Fensters
 		setTitle("bwLehrpool Suite *Prototyp*");
-		//Zentriert das Fenster
+		// Zentriert das Fenster
 		Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
-		int top=(screenSize.height - 722) / 2;
-		int left=(screenSize.width - 603) / 2;
+		int top = (screenSize.height - 722) / 2;
+		int left = (screenSize.width - 603) / 2;
 		setBounds(left, top, 603, 722);
-	
-		
+
 		getContentPane().setLayout(null);
 		{
 			JPanel panel = new JPanel();
@@ -103,11 +93,12 @@ public class EditImageTechnisch_GUI extends JFrame {
 				panel.add(lblNewLabel);
 				lblNewLabel.setFont(new Font("Tahoma", Font.BOLD, 18));
 			}
-			
+
 			JTextPane txtpnBitteWhlenSie = new JTextPane();
 			txtpnBitteWhlenSie.setEditable(false);
 			txtpnBitteWhlenSie.setBackground(SystemColor.menu);
-			txtpnBitteWhlenSie.setText("Geben Sie hier bitte einen sprechenden Imagename sowie Ihre Kontaktdaten an");
+			txtpnBitteWhlenSie
+					.setText("Geben Sie hier bitte einen sprechenden Imagename sowie Ihre Kontaktdaten an");
 			txtpnBitteWhlenSie.setBounds(10, 36, 509, 32);
 			panel.add(txtpnBitteWhlenSie);
 		}
@@ -119,147 +110,152 @@ public class EditImageTechnisch_GUI extends JFrame {
 
 		JPanel panel_1 = new JPanel();
 		panel_1.setBackground(SystemColor.menu);
-		panel_1.setBorder(new TitledBorder(null, "Informationen zum Image", TitledBorder.LEADING, TitledBorder.TOP, null, null));
+		panel_1.setBorder(new TitledBorder(null, "Informationen zum Image",
+				TitledBorder.LEADING, TitledBorder.TOP, null, null));
 		panel_1.setBounds(10, 66, 557, 95);
 		contentPanel.add(panel_1);
 		panel_1.setLayout(null);
-		
-		JLabel lblNewLabel_2 = new JLabel("Image enth\u00E4lt lizenzpflichtige Software:");
+
+		JLabel lblNewLabel_2 = new JLabel(
+				"Image enth\u00E4lt lizenzpflichtige Software:");
 		lblNewLabel_2.setBounds(10, 30, 250, 20);
 		panel_1.add(lblNewLabel_2);
-		
+
 		rdbtnlicenseJa = new JRadioButton("Ja");
 		rdbtnlicenseJa.setSelected(true);
 		buttonGrouplicense.add(rdbtnlicenseJa);
 		rdbtnlicenseJa.setBounds(266, 29, 109, 23);
 		panel_1.add(rdbtnlicenseJa);
-		
+
 		rdbtnlicenseNein = new JRadioButton("Nein");
 		buttonGrouplicense.add(rdbtnlicenseNein);
 		rdbtnlicenseNein.setBounds(377, 29, 109, 23);
 		panel_1.add(rdbtnlicenseNein);
-		if(Image.image.isLicensed()==true){
+		if (Image.image.isLicensed() == true) {
 			rdbtnlicenseJa.setSelected(true);
-		}
-		else
-		{
+		} else {
 			rdbtnlicenseNein.setSelected(true);
 		}
-		
 
-		
-		JLabel lblInternetIstInnerhalb = new JLabel("Internet ist innerhalb des Image gesperrt:");
+		JLabel lblInternetIstInnerhalb = new JLabel(
+				"Internet ist innerhalb des Image gesperrt:");
 		lblInternetIstInnerhalb.setBounds(10, 58, 250, 20);
 		panel_1.add(lblInternetIstInnerhalb);
-		
+
 		rdbtnInternetJa = new JRadioButton("Ja");
 		buttonGroupInternet.add(rdbtnInternetJa);
 		rdbtnInternetJa.setBounds(266, 57, 109, 23);
 		panel_1.add(rdbtnInternetJa);
-		
+
 		rdbtnInternetNein = new JRadioButton("Nein");
 		rdbtnInternetNein.setSelected(true);
 		buttonGroupInternet.add(rdbtnInternetNein);
 		rdbtnInternetNein.setBounds(377, 57, 109, 23);
 		panel_1.add(rdbtnInternetNein);
-		if(Image.image.isInternet()==true){
+		if (Image.image.isInternet() == true) {
 			rdbtnInternetJa.setSelected(true);
-		}
-		else
-		{
+		} else {
 			rdbtnInternetNein.setSelected(true);
 		}
 		JLabel lblHauptmen = new JLabel("Hauptmen\u00FC");
 		lblHauptmen.addMouseListener(new MouseAdapter() {
 			@Override
 			public void mouseClicked(MouseEvent arg0) {
-				//Macht dieses Fenster unsichtbar und das vorhergehende Fenster sichtbar
+				// Macht dieses Fenster unsichtbar und das vorhergehende Fenster
+				// sichtbar
 				EditImageTechnisch_GUI.this.setVisible(false);
-				MainMenue_GUI main=new MainMenue_GUI();
+				MainMenue_GUI main = new MainMenue_GUI();
 				main.setVisible(true);
 			}
 		});
 		lblHauptmen.setForeground(Color.BLUE);
 		lblHauptmen.setBounds(10, 11, 61, 14);
 		contentPanel.add(lblHauptmen);
-		
+
 		JLabel label_1 = new JLabel(">");
 		label_1.setBounds(69, 11, 13, 14);
 		contentPanel.add(label_1);
-		
+
 		JLabel lblVlimage = new JLabel("VL-Image");
 		lblVlimage.setForeground(Color.BLUE);
 		lblVlimage.setBounds(81, 11, 45, 14);
 		contentPanel.add(lblVlimage);
-		
+
 		JLabel label_2 = new JLabel(">");
 		label_2.setBounds(133, 11, 13, 14);
 		contentPanel.add(label_2);
-		
+
 		JLabel lblNewLabel_1 = new JLabel("Neu");
 		lblNewLabel_1.setBounds(146, 11, 46, 14);
 		contentPanel.add(lblNewLabel_1);
-		
+
 		JPanel panel_2 = new JPanel();
 		panel_2.setLayout(null);
-		panel_2.setBorder(new TitledBorder(null, "Empfehlung bezüglich Ressourcen", TitledBorder.LEADING, TitledBorder.TOP, null, null));
+		panel_2.setBorder(new TitledBorder(null,
+				"Empfehlung bezüglich Ressourcen", TitledBorder.LEADING,
+				TitledBorder.TOP, null, null));
 		panel_2.setBackground(SystemColor.menu);
 		panel_2.setBounds(10, 172, 557, 338);
 		contentPanel.add(panel_2);
-		
+
 		JTextArea txtrHinweisSolltenSie = new JTextArea();
 		txtrHinweisSolltenSie.setBackground(SystemColor.menu);
 		txtrHinweisSolltenSie.setFont(new Font("Tahoma", Font.PLAIN, 13));
-		txtrHinweisSolltenSie.setText("Hinweis: Sollten Sie keine Software einsetzen, die viele Ressourcen ben\u00F6tigt,\r\nk\u00F6nnen Sie sich an den Beispielwerten orientieren.");
+		txtrHinweisSolltenSie
+				.setText("Hinweis: Sollten Sie keine Software einsetzen, die viele Ressourcen ben\u00F6tigt,\r\nk\u00F6nnen Sie sich an den Beispielwerten orientieren.");
 		txtrHinweisSolltenSie.setBounds(10, 25, 537, 55);
 		panel_2.add(txtrHinweisSolltenSie);
-		
-		JLabel lblNewLabel_3 = new JLabel("Wie viel Arbeitsspeicher empfehlen Sie f\u00FCr das Image:");
+
+		JLabel lblNewLabel_3 = new JLabel(
+				"Wie viel Arbeitsspeicher empfehlen Sie f\u00FCr das Image:");
 		lblNewLabel_3.setBounds(10, 91, 280, 20);
 		panel_2.add(lblNewLabel_3);
-		
+
 		JLabel lblMindestens = new JLabel("mindestens");
 		lblMindestens.setBounds(315, 91, 60, 20);
 		panel_2.add(lblMindestens);
-		
+
 		spinnerRam = new JSpinner();
 		spinnerRam.setModel(new SpinnerNumberModel(1, 1, 8, 1));
 		spinnerRam.setBounds(385, 88, 29, 20);
 		spinnerRam.setValue(Image.image.getRam());
 		panel_2.add(spinnerRam);
-		
+
 		JLabel lblGbyte = new JLabel("GByte");
 		lblGbyte.setBounds(424, 91, 46, 20);
 		panel_2.add(lblGbyte);
-		
+
 		JTextArea txtrBeispielWindows = new JTextArea();
-		txtrBeispielWindows.setText("Beispiel:\r\nWindows 7 32/64 Bit: 2 GByte\r\nLinux/Unix 32/64 Bit:  1 GByte");
+		txtrBeispielWindows
+				.setText("Beispiel:\r\nWindows 7 32/64 Bit: 2 GByte\r\nLinux/Unix 32/64 Bit:  1 GByte");
 		txtrBeispielWindows.setFont(new Font("Tahoma", Font.PLAIN, 11));
 		txtrBeispielWindows.setBackground(SystemColor.menu);
 		txtrBeispielWindows.setBounds(20, 111, 280, 55);
 		panel_2.add(txtrBeispielWindows);
-		
+
 		JTextArea txtrBeispielWindows_1 = new JTextArea();
-		txtrBeispielWindows_1.setText("Beispiel:\r\nWindows 7 32/64 Bit: 1 Kern\r\nLinux/Unix 32/64 Bit:  1 Kern");
+		txtrBeispielWindows_1
+				.setText("Beispiel:\r\nWindows 7 32/64 Bit: 1 Kern\r\nLinux/Unix 32/64 Bit:  1 Kern");
 		txtrBeispielWindows_1.setFont(new Font("Tahoma", Font.PLAIN, 11));
 		txtrBeispielWindows_1.setBackground(SystemColor.menu);
 		txtrBeispielWindows_1.setBounds(20, 226, 280, 55);
 		panel_2.add(txtrBeispielWindows_1);
-		
-		JLabel lblWieVieleCpus = new JLabel("Wie viele CPUs empfehlen Sie f\u00FCr das Image:");
+
+		JLabel lblWieVieleCpus = new JLabel(
+				"Wie viele CPUs empfehlen Sie f\u00FCr das Image:");
 		lblWieVieleCpus.setBounds(10, 201, 280, 20);
 		panel_2.add(lblWieVieleCpus);
-		
+
 		JLabel label_3 = new JLabel("mindestens");
 		label_3.setBounds(315, 201, 60, 20);
 		panel_2.add(label_3);
-		
+
 		spinnerCPU = new JSpinner();
 		spinnerCPU.setModel(new SpinnerNumberModel(1, 1, 4, 1));
 		spinnerCPU.setBounds(385, 198, 29, 20);
 		spinnerCPU.setValue(Image.image.getCpu());
 		panel_2.add(spinnerCPU);
-		
+
 		JLabel lblKerne = new JLabel("Kerne");
 		lblKerne.setBounds(424, 201, 46, 20);
 		panel_2.add(lblKerne);
@@ -273,29 +269,25 @@ public class EditImageTechnisch_GUI extends JFrame {
 				JButton okButton = new JButton("Zur\u00FCck");
 				okButton.addActionListener(new ActionListener() {
 					public void actionPerformed(ActionEvent e) {
-						//Setzt die Imagewerte in das Model
-						Image.image.setCpu(Integer.valueOf(spinnerCPU.getValue().toString()).intValue());
-						Image.image.setRam(Integer.valueOf(spinnerRam.getValue().toString()).intValue());
-						if(rdbtnInternetJa.isSelected()==true)
-						{
+						// Setzt die Imagewerte in das Model
+						Image.image.setCpu(Integer.valueOf(
+								spinnerCPU.getValue().toString()).intValue());
+						Image.image.setRam(Integer.valueOf(
+								spinnerRam.getValue().toString()).intValue());
+						if (rdbtnInternetJa.isSelected() == true) {
 							Image.image.setInternet(true);
-						}
-						else
-						{
+						} else {
 							Image.image.setInternet(false);
 						}
-						
-						if(rdbtnlicenseJa.isSelected()==true)
-						{
+
+						if (rdbtnlicenseJa.isSelected() == true) {
 							Image.image.setLicensed(true);
-						}
-						else
-						{
+						} else {
 							Image.image.setLicensed(false);
 						}
-						//Öffnet das vorherige Fenster
-						EingabeImageAllgemein_GUI sr=new EingabeImageAllgemein_GUI();
-						sr.setVisible(true);
+						// Öffnet das vorherige Fenster
+						EditImageAllgemein_GUI ei = new EditImageAllgemein_GUI();
+						ei.setVisible(true);
 						dispose();
 					}
 				});
@@ -307,60 +299,53 @@ public class EditImageTechnisch_GUI extends JFrame {
 				JButton cancelButton = new JButton("Weiter");
 				cancelButton.addActionListener(new ActionListener() {
 					public void actionPerformed(ActionEvent e) {
-						Image.image.setCpu(Integer.valueOf(spinnerCPU.getValue().toString()).intValue());
-						Image.image.setRam(Integer.valueOf(spinnerRam.getValue().toString()).intValue());
-						if(rdbtnInternetJa.isSelected()==true)
-						{
+						Image.image.setCpu(Integer.valueOf(
+								spinnerCPU.getValue().toString()).intValue());
+						Image.image.setRam(Integer.valueOf(
+								spinnerRam.getValue().toString()).intValue());
+						if (rdbtnInternetJa.isSelected() == true) {
 							Image.image.setInternet(true);
-						}
-						else
-						{
+						} else {
 							Image.image.setInternet(false);
 						}
-						
-						if(rdbtnlicenseJa.isSelected()==true)
-						{
+
+						if (rdbtnlicenseJa.isSelected() == true) {
 							Image.image.setLicensed(true);
-						}
-						else
-						{
+						} else {
 							Image.image.setLicensed(false);
 						}
-						//Öffnet das nächste Fenster
-						FTPEditUploader_GUI ea=new FTPEditUploader_GUI();
+						// Öffnet das nächste Fenster
+						FTPEditUploader_GUI ea = new FTPEditUploader_GUI();
 						ea.setVisible(true);
 						dispose();
-						
+
 					}
 				});
 				cancelButton.setActionCommand("Cancel");
 				buttonPane.add(cancelButton);
 			}
 		}
-		
+
 		JSeparator separator = new JSeparator();
 		separator.setBounds(0, 78, 597, 2);
 		getContentPane().add(separator);
-		
+
 		JSeparator separator_1 = new JSeparator();
 		separator_1.setBounds(0, 627, 597, 2);
 		getContentPane().add(separator_1);
-		
+
 		JMenuBar menuBar = new JMenuBar();
 		setJMenuBar(menuBar);
 
 		JMenu mnNewMenu_1 = new JMenu("Hilfe");
 		menuBar.add(mnNewMenu_1);
-		
+
 		JMenuItem mntmFaq = new JMenuItem("FAQ");
 		mnNewMenu_1.add(mntmFaq);
-		
+
 		JMenuItem mntmOtrs = new JMenuItem("OTRS");
 		mnNewMenu_1.add(mntmOtrs);
-		
-	}
-	
-	
 
 	}
 
+}
diff --git a/Dozentenmodul/src/gui/FTPUploader_GUI.java b/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java
index 05cfbd34..1bf8cc3a 100644
--- a/Dozentenmodul/src/gui/FTPUploader_GUI.java
+++ b/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java
@@ -1,4 +1,4 @@
-package gui;
+package gui.image;
 
 import java.awt.BorderLayout;
 import java.awt.Color;
@@ -39,16 +39,19 @@ import server.Server.Client;
 import thrift.ThriftConnection;
 //import util.XMLCreator;
 import ftp.UploadTask;
+import gui.intro.MainMenue_GUI;
 
 @SuppressWarnings("serial")
-public class FTPUploader_GUI extends JFrame implements PropertyChangeListener {
+public class FTPCreateUploader_GUI extends JFrame implements
+		PropertyChangeListener {
 
 	@SuppressWarnings("unused")
 	private JPanel contentPane;
 	private final JPanel contentPanel = new JPanel();
-	JLabel lblNewLabel;
+	JLabel lblPath;
 	JProgressBar progressBar;
-	String host = "141.79.128.121";
+	//String host = "141.79.128.121";
+	String host = "141.79.128.102";
 	int port = 21;
 	server.User user;
 	String filename = "";
@@ -67,6 +70,9 @@ public class FTPUploader_GUI extends JFrame implements PropertyChangeListener {
 	ThriftConnection thrift = new ThriftConnection();
 	Client client = thrift.getThriftConnection();
 	JButton finishButton = new JButton("Fertigstellen");
+	JButton btnUploadStarten = new JButton("Upload auf Server starten");
+	JButton btnZurck = new JButton("Zur\u00FCck");
+	int progress = 0; // progress of upload
 
 	/**
 	 * Launch the application.
@@ -75,7 +81,7 @@ public class FTPUploader_GUI extends JFrame implements PropertyChangeListener {
 		EventQueue.invokeLater(new Runnable() {
 			public void run() {
 				try {
-					FTPUploader_GUI frame = new FTPUploader_GUI();
+					FTPCreateUploader_GUI frame = new FTPCreateUploader_GUI();
 					frame.setVisible(true);
 				} catch (Exception e) {
 					e.printStackTrace();
@@ -87,13 +93,12 @@ public class FTPUploader_GUI extends JFrame implements PropertyChangeListener {
 	/**
 	 * Create the frame.
 	 */
-	public FTPUploader_GUI() {
+	public FTPCreateUploader_GUI() {
 		addWindowListener(new WindowAdapter() {
 			@Override
 			public void windowClosing(WindowEvent arg0) {
 				if (taskrun == true) {
 					try {
-
 						client.DeleteFtpUser(user.userName);
 					} catch (TException e1) {
 						// TODO Auto-generated catch block
@@ -101,10 +106,10 @@ public class FTPUploader_GUI extends JFrame implements PropertyChangeListener {
 					}
 					task.cancel(true);
 				}
-			}
+				System.exit(0);
+			}// end window closing
 		});
 		setResizable(false);
-		// setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
 
 		try {
 			UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
@@ -136,16 +141,16 @@ public class FTPUploader_GUI extends JFrame implements PropertyChangeListener {
 
 					fc.showOpenDialog(getParent());
 					File file = fc.getSelectedFile();
-					//check if a file is selected and exists
+					// check if a file is selected and exists
 					if (file != null) {
-						System.out.println("File to upload exists");
+						// file selected
 						uploadFile = file;
 						filename = uploadFile.getName();
-						lblNewLabel.setText(file.getAbsolutePath());
+						lblPath.setText(file.getAbsolutePath());
 					} else {
-						System.out.println("No file selected");
-						lblNewLabel.setText("");
-					}//end if
+						// no file selected
+						lblPath.setText("");
+					}// end if
 				}
 			});
 
@@ -154,12 +159,25 @@ public class FTPUploader_GUI extends JFrame implements PropertyChangeListener {
 			contentPanel.add(btnSpeicherortAuswhlen);
 		}
 
-		lblNewLabel = new JLabel("");
-		lblNewLabel.setHorizontalAlignment(SwingConstants.LEFT);
-		lblNewLabel.setBounds(285, 124, 302, 23);
-		contentPanel.add(lblNewLabel);
+		lblPath = new JLabel("");
+		lblPath.addPropertyChangeListener(new PropertyChangeListener() {
+			public void propertyChange(PropertyChangeEvent arg0) {
+				if (lblPath.getText().isEmpty()) {
+					// wenn leer, dann upload button nicht freigeben
+					btnUploadStarten.setEnabled(false);
+					btnUploadStarten.setText("Bitte warten");
+				} else {
+					// wenn leer, dann upload button nicht freigeben
+					btnUploadStarten.setEnabled(true);
+					btnUploadStarten.setText("Upload auf Server starten");
+				}
+			}
+		});
+		lblPath.setHorizontalAlignment(SwingConstants.LEFT);
+		lblPath.setBounds(102, 158, 485, 23);
+		contentPanel.add(lblPath);
 
-		JButton btnUploadStarten = new JButton("Upload auf Server starten");
+		btnUploadStarten.setEnabled(false);
 		btnUploadStarten.addActionListener(new ActionListener() {
 			public void actionPerformed(ActionEvent arg0) {
 				buttonUploadActionPerformed(arg0);
@@ -167,58 +185,58 @@ public class FTPUploader_GUI extends JFrame implements PropertyChangeListener {
 			}
 		});
 
-		btnUploadStarten.setBounds(102, 168, 173, 23);
+		btnUploadStarten.setBounds(102, 200, 173, 23);
 		contentPanel.add(btnUploadStarten);
 
 		progressBar = new JProgressBar(0, 100);
 		progressBar.setStringPainted(true);
 
-		progressBar.setBounds(102, 202, 485, 30);
+		progressBar.setBounds(102, 234, 485, 30);
 		contentPanel.add(progressBar);
 
 		JLabel lblUploadgeschwindigkeit = new JLabel("Uploadgeschwindigkeit:");
-		lblUploadgeschwindigkeit.setBounds(102, 243, 141, 14);
+		lblUploadgeschwindigkeit.setBounds(102, 275, 141, 14);
 		contentPanel.add(lblUploadgeschwindigkeit);
 
 		JLabel label_1 = new JLabel("Fertig:");
-		label_1.setBounds(102, 293, 46, 14);
+		label_1.setBounds(102, 325, 46, 14);
 		contentPanel.add(label_1);
 
 		labelfertig = new JLabel("0");
 		labelfertig.setHorizontalAlignment(SwingConstants.LEFT);
-		labelfertig.setBounds(183, 293, 108, 14);
+		labelfertig.setBounds(183, 325, 108, 14);
 		contentPanel.add(labelfertig);
 
 		UpSpeed = new JLabel("0");
 		UpSpeed.setHorizontalAlignment(SwingConstants.LEFT);
-		UpSpeed.setBounds(374, 243, 117, 14);
+		UpSpeed.setBounds(374, 275, 117, 14);
 		contentPanel.add(UpSpeed);
 
 		JLabel label_4 = new JLabel("von:");
-		label_4.setBounds(318, 293, 46, 14);
+		label_4.setBounds(318, 325, 46, 14);
 		contentPanel.add(label_4);
 
 		labelfilesize = new JLabel("0");
 		labelfilesize.setHorizontalAlignment(SwingConstants.LEFT);
-		labelfilesize.setBounds(374, 293, 117, 14);
+		labelfilesize.setBounds(374, 325, 117, 14);
 		contentPanel.add(labelfilesize);
 
 		JLabel label_6 = new JLabel("Verbleibend:");
-		label_6.setBounds(102, 318, 71, 14);
+		label_6.setBounds(102, 350, 71, 14);
 		contentPanel.add(label_6);
 
 		JLabel label_7 = new JLabel("Gesch\u00E4tzte Verbleibende Zeit:");
-		label_7.setBounds(102, 268, 150, 14);
+		label_7.setBounds(102, 300, 150, 14);
 		contentPanel.add(label_7);
 
 		labelZeit = new JLabel("0");
 		labelZeit.setHorizontalAlignment(SwingConstants.LEFT);
-		labelZeit.setBounds(374, 268, 117, 14);
+		labelZeit.setBounds(374, 300, 117, 14);
 		contentPanel.add(labelZeit);
 
 		labelverbleibend = new JLabel("0");
 		labelverbleibend.setHorizontalAlignment(SwingConstants.LEFT);
-		labelverbleibend.setBounds(183, 318, 108, 14);
+		labelverbleibend.setBounds(183, 350, 108, 14);
 		contentPanel.add(labelverbleibend);
 
 		JPanel panel = new JPanel();
@@ -262,7 +280,7 @@ public class FTPUploader_GUI extends JFrame implements PropertyChangeListener {
 		label_5.setBounds(139, 91, 14, 14);
 		contentPanel.add(label_5);
 
-		JLabel lblNeubearbeiten = new JLabel("Neu/Bearbeiten");
+		JLabel lblNeubearbeiten = new JLabel("Neu");
 		lblNeubearbeiten.setBounds(149, 91, 108, 14);
 		contentPanel.add(lblNeubearbeiten);
 
@@ -271,10 +289,12 @@ public class FTPUploader_GUI extends JFrame implements PropertyChangeListener {
 		contentPanel.add(separator_1);
 
 		JButton btnCopyFileTo = new JButton("Copy File to Prod");
+		btnCopyFileTo.setEnabled(false);
 		btnCopyFileTo.addActionListener(new ActionListener() {
 			public void actionPerformed(ActionEvent e) {
 				try {
-					System.out.println("Copying file to "+ user.path + "/" + uploadFile.getName());
+					System.out.println("Copying file to " + user.path + "/"
+							+ uploadFile.getName());
 					client.startFileCopy(user.path + "/" + uploadFile.getName());
 				} catch (TException e1) {
 					// TODO Auto-generated catch block
@@ -282,24 +302,24 @@ public class FTPUploader_GUI extends JFrame implements PropertyChangeListener {
 				}
 			}
 		});
-		btnCopyFileTo.setBounds(102, 343, 173, 23);
+		btnCopyFileTo.setBounds(102, 375, 173, 23);
 		contentPanel.add(btnCopyFileTo);
 
-		JLabel lblShritt = new JLabel("Schritt 1:");
-		lblShritt.setBounds(24, 128, 57, 14);
-		contentPanel.add(lblShritt);
+		JLabel lblSchritt_1 = new JLabel("Schritt 1:");
+		lblSchritt_1.setBounds(24, 128, 57, 14);
+		contentPanel.add(lblSchritt_1);
 
-		JLabel lblSchritt = new JLabel("Schritt 2:");
-		lblSchritt.setBounds(24, 172, 57, 14);
-		contentPanel.add(lblSchritt);
+		JLabel lblSchritt_2 = new JLabel("Schritt 2:");
+		lblSchritt_2.setBounds(24, 204, 57, 14);
+		contentPanel.add(lblSchritt_2);
 
-		JLabel lblSchritt_1 = new JLabel("Schritt 3:");
-		lblSchritt_1.setBounds(20, 391, 57, 14);
-		contentPanel.add(lblSchritt_1);
+		JLabel lblSchritt_3 = new JLabel("Schritt 3:");
+		lblSchritt_3.setBounds(20, 423, 57, 14);
+		contentPanel.add(lblSchritt_3);
 
 		JLabel lblKlickenSieAuf = new JLabel(
 				"Klicken Sie auf \"Fertigstellen\".");
-		lblKlickenSieAuf.setBounds(98, 391, 241, 14);
+		lblKlickenSieAuf.setBounds(98, 423, 241, 14);
 		contentPanel.add(lblKlickenSieAuf);
 		{
 			JPanel buttonPane = new JPanel();
@@ -307,8 +327,6 @@ public class FTPUploader_GUI extends JFrame implements PropertyChangeListener {
 			buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT));
 			getContentPane().add(buttonPane, BorderLayout.SOUTH);
 			{
-				// Button for starting upload
-				// JButton finishButton = new JButton("Fertigstellen");
 				finishButton.setEnabled(false);
 				finishButton.addActionListener(new ActionListener() {
 					public void actionPerformed(ActionEvent e) {
@@ -330,29 +348,16 @@ public class FTPUploader_GUI extends JFrame implements PropertyChangeListener {
 					}
 				});
 
-				// Button for going back to Main Menu
-				JButton cancelButton = new JButton("Hauptmen\u00FC");
-				cancelButton.addActionListener(new ActionListener() {
-					public void actionPerformed(ActionEvent arg0) {
-						dispose();
-						MainMenue_GUI m = new MainMenue_GUI();
-						m.setVisible(true);
-					}
-				});
-
-				JButton btnZurck = new JButton("Zur\u00FCck");
 				btnZurck.addActionListener(new ActionListener() {
 					public void actionPerformed(ActionEvent e) {
 						dispose();
-						EingabeImageTechnisch_GUI m = new EingabeImageTechnisch_GUI();
+						thrift.closeThriftConnection();
+						CreateImageTechnisch_GUI m = new CreateImageTechnisch_GUI();
 						m.setVisible(true);
 					}
 				});
 				btnZurck.setActionCommand("Cancel");
 				buttonPane.add(btnZurck);
-
-				cancelButton.setActionCommand("Cancel");
-				buttonPane.add(cancelButton);
 				finishButton.setActionCommand("Cancel");
 				buttonPane.add(finishButton);
 			}
@@ -368,31 +373,16 @@ public class FTPUploader_GUI extends JFrame implements PropertyChangeListener {
 	}
 
 	private void buttonUploadActionPerformed(ActionEvent event) {
-		// File (or directory) with old name
-		// File file = new File(lblNewLabel.getText());
-
-		// File (or directory) with new name
-		// System.out.println(file.getAbsolutePath().substring(0,file.getAbsolutePath().lastIndexOf("\\"))+"\\"+vm.vl.getLaborname()+".vmdk");
-		// File file2 = new
-		// File(file.getAbsoluteFile()+"\\"+vm.vl.getLaborname()+".vmdk");
-
-		// Rename file (or directory)
-		// boolean success = file.renameTo(file2);
-		// if (!success) {
-		// File was not successfully renamed
-		// System.out.println("Not OK");
-		// }
-		// else
-		// {
-		// System.out.println("OK");
-		// }
+
 		progressBar.setValue(0);
+		btnUploadStarten.setEnabled(false); // verhindert einen weiteren klick
+		btnUploadStarten.setText("Bitte warten");
 
 		try {
 			user = client.getFtpUser();
-			System.out.println("name" + user.userName);
-			System.out.println("path" + user.path);
-			System.out.println("pass" + user.password);
+			System.out.println("FTP name" + user.userName);
+			System.out.println("FTP path" + user.path);
+			System.out.println("FTP pass" + user.password);
 		} catch (TException e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
@@ -414,24 +404,34 @@ public class FTPUploader_GUI extends JFrame implements PropertyChangeListener {
 		task.execute();
 		taskrun = true;
 
-		// createXML();
-		// TransferToSatellit();
-
 	}
 
 	public void propertyChange(PropertyChangeEvent arg0) {
-		int progress = 0;
+		progress = 0;
 		if ("progress" == arg0.getPropertyName()) {
 			progress = (Integer) arg0.getNewValue();
 			progressBar.setValue(progress);
-
+			
 			// Button zum Fertigstellen freischalten, wenn 100% erreicht sind
+			if (progress == 0 || progress == 100) {
+				// not uploading currently
+				btnZurck.setEnabled(true);
+			} else {
+				// currently uploading, don't let user interact
+				btnZurck.setEnabled(false);
+			}
+
+			// Fertigstellen erlauben wenn upload abgeschlossen
 			if (progress == 100) {
 				finishButton.setEnabled(true);
+			} else {
+				finishButton.setEnabled(false);
 			}
 
 		}
 
+		
+
 		if ("speed" == arg0.getPropertyName()) {
 			speed = (double) arg0.getNewValue();
 			// if(speed<=1){
@@ -440,13 +440,6 @@ public class FTPUploader_GUI extends JFrame implements PropertyChangeListener {
 					String.valueOf(speed).lastIndexOf(".") + 3)
 					+ " MB/s");
 
-			// }else
-			// {
-			// double MBSpeed=speed/1024;
-			// downspeed.setText(String.valueOf((MBSpeed)).substring(0,
-			// String.valueOf(MBSpeed).indexOf(".")));
-			// }
-
 		}
 		if ("bytesread" == arg0.getPropertyName()) {
 			bytesread = (long) arg0.getNewValue();
diff --git a/Dozentenmodul/src/GUI/FTPDownloader_GUI.java b/Dozentenmodul/src/gui/image/FTPDownloader_GUI.java
index cb53fc3d..d0f789f4 100644
--- a/Dozentenmodul/src/GUI/FTPDownloader_GUI.java
+++ b/Dozentenmodul/src/gui/image/FTPDownloader_GUI.java
@@ -1,4 +1,4 @@
-package gui;
+package gui.image;
 
 import java.awt.BorderLayout;
 import java.awt.Color;
@@ -6,7 +6,6 @@ import java.awt.Dimension;
 import java.awt.FlowLayout;
 import java.awt.Toolkit;
 import java.io.File;
-
 import javax.swing.JButton;
 import javax.swing.JFileChooser;
 import javax.swing.JFrame;
@@ -17,8 +16,8 @@ import javax.swing.SwingConstants;
 import javax.swing.UIManager;
 import javax.swing.UnsupportedLookAndFeelException;
 import javax.swing.border.EmptyBorder;
-
 import ftp.DownloadTask;
+import gui.intro.MainMenue_GUI;
 
 import java.awt.event.ActionListener;
 import java.awt.event.ActionEvent;
@@ -30,11 +29,8 @@ import java.awt.SystemColor;
 import java.awt.Font;
 import javax.swing.JTextPane;
 import javax.swing.JSeparator;
-
 import models.Image;
-
 import org.apache.thrift.TException;
-
 import server.Server.Client;
 import server.User;
 import thrift.ThriftConnection;
@@ -45,38 +41,31 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener
 	@SuppressWarnings("unused")
 	private JPanel contentPane;
 	private final JPanel contentPanel = new JPanel();
-	JLabel lblNewLabel;
+	JLabel lblPath;
 	JLabel downspeed;
 	User user;
 	JProgressBar progressBar;
-	String host = "141.79.128.121";
+	//String host = "141.79.128.121";
+	String host = "141.79.128.102";
 	int port = 21;
-	String username = "openslx";
-	String password = "openslx-ng";
 	String downloadFile = "";
 	static String arg = "";
 	DownloadTask task;
-	JLabel bytesreadlbl;
+	JLabel lblBytesread;
 	JLabel lblNewLabel_3;
 	JLabel labelVerbleibend;
 	long filesize;
 	double speed;
+	int progress = 0; // progress of download
 	long bytesread;
 	JLabel labelZeit;
 	boolean taskrun = false;
 	ThriftConnection thrift = new ThriftConnection();
 	Client client = thrift.getThriftConnection();
-	JButton buttonback = new JButton("Zur\u00FCck");
+	JButton btnZurck = new JButton("Zur\u00FCck");
+	JButton btnDownloadStarten = new JButton("Download starten");
+	JButton btnMainMenu = new JButton("Hauptmen\u00FC");
 
-	/**
-	 * Launch the application.
-	 */
-	/*
-	 * public static void main(String[] args) { EventQueue.invokeLater(new
-	 * Runnable() { public void run() { try { FTPDownloader frame = new
-	 * FTPDownloader(); frame.setVisible(true); } catch (Exception e) {
-	 * e.printStackTrace(); } } }); }
-	 */
 
 	/**
 	 * Create the frame.
@@ -95,14 +84,13 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener
 					}
 					task.cancel(true);
 				}
-				dispose();
-			}
+				//dispose();
+				System.exit(0);
+			}//end window closing
 		});
 		setResizable(false);
 		// setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
 
-		
-
 		try {
 			UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
 		} catch (ClassNotFoundException | InstantiationException
@@ -111,7 +99,6 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener
 			e.printStackTrace();
 		}
 
-		
 		setBackground(Color.WHITE);
 		setTitle("Dozentenmodul *Prototyp*");
 		Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
@@ -133,76 +120,95 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener
 
 					fc.showOpenDialog(getParent());
 					File dir = fc.getSelectedFile();
-					lblNewLabel.setText(dir.getAbsolutePath());
+					// check if directory is selected
+					if (dir != null) {
+						// is selected
+						lblPath.setText(dir.getAbsolutePath());
+					} else {
+						// no directory selected
+						lblPath.setText("");
+					}// end if
 				}
 			});
 
-			btnSpeicherortAuswhlen.setBounds(57, 124, 141, 23);
+			btnSpeicherortAuswhlen.setBounds(102, 124, 173, 23);
 			btnSpeicherortAuswhlen.setVerticalAlignment(SwingConstants.TOP);
-			btnSpeicherortAuswhlen.setHorizontalAlignment(SwingConstants.LEFT);
 			contentPanel.add(btnSpeicherortAuswhlen);
 		}
 
-		lblNewLabel = new JLabel("C:\\");
-		lblNewLabel.setBounds(208, 124, 238, 23);
-		contentPanel.add(lblNewLabel);
+		lblPath = new JLabel("");
+		lblPath.addPropertyChangeListener(new PropertyChangeListener() {
+			public void propertyChange(PropertyChangeEvent arg0) {
+				if (lblPath.getText().isEmpty()) {
+					// wenn leer, dann upload button nicht freigeben
+					btnDownloadStarten.setEnabled(false);
+					btnDownloadStarten.setText("Bitte warten");
+				} else {
+					// wenn leer, dann upload button nicht freigeben
+					btnDownloadStarten.setEnabled(true);
+					btnDownloadStarten.setText("Download starten");
+				}
+			}
+		});
+		lblPath.setBounds(102, 158, 485, 23);
+		contentPanel.add(lblPath);
 
-		JButton btnDownloadStarten = new JButton("Download starten");
+		btnDownloadStarten.setEnabled(false);
 		btnDownloadStarten.addActionListener(new ActionListener() {
 			public void actionPerformed(ActionEvent arg0) {
 				buttonDownloadActionPerformed(arg0);
 			}
 		});
 
-		btnDownloadStarten.setBounds(57, 168, 141, 23);
+		btnDownloadStarten.setBounds(102, 200, 173, 23);
 		contentPanel.add(btnDownloadStarten);
 
 		progressBar = new JProgressBar(0, 100);
 		progressBar.setStringPainted(true);
 
-		progressBar.setBounds(57, 202, 497, 30);
+		progressBar.setBounds(102, 234, 485, 30);
 		contentPanel.add(progressBar);
 
 		JLabel lblDownloadgeschwindigkeit = new JLabel(
 				"Downloadgeschwindigkeit:");
-		lblDownloadgeschwindigkeit.setBounds(57, 243, 141, 14);
+		lblDownloadgeschwindigkeit.setBounds(102, 275, 141, 14);
 		contentPanel.add(lblDownloadgeschwindigkeit);
 
 		downspeed = new JLabel("0");
-		downspeed.setBounds(308, 243, 95, 14);
+		downspeed.setBounds(374, 275, 117, 14);
 		contentPanel.add(downspeed);
 
-		JLabel lblNewLabel_1 = new JLabel("Fertig:");
-		lblNewLabel_1.setBounds(57, 293, 46, 14);
-		contentPanel.add(lblNewLabel_1);
+		JLabel lblFertig = new JLabel("Fertig:");
+		lblFertig.setBounds(102, 325, 46, 14);
+		contentPanel.add(lblFertig);
 
-		bytesreadlbl = new JLabel("");
-		bytesreadlbl.setBounds(66, 244, 108, 14);
-		contentPanel.add(bytesreadlbl);
+		lblBytesread = new JLabel("0");
+		lblBytesread.setBounds(183, 325, 108, 14);
+		contentPanel.add(lblBytesread);
 
-		JLabel lblNewLabel_2 = new JLabel("von:");
-		lblNewLabel_2.setBounds(226, 293, 46, 14);
-		contentPanel.add(lblNewLabel_2);
+		JLabel lblVon = new JLabel("von:");
+		lblVon.setBounds(318, 325, 46, 14);
+		contentPanel.add(lblVon);
 
-		lblNewLabel_3 = new JLabel("");
-		lblNewLabel_3.setBounds(235, 244, 108, 14);
+		lblNewLabel_3 = new JLabel("0");
+		lblNewLabel_3.setBounds(374, 325, 117, 14);
 		contentPanel.add(lblNewLabel_3);
 
 		JLabel lblMbVerbleibend = new JLabel("Verbleibend:");
-		lblMbVerbleibend.setBounds(57, 318, 71, 14);
+		lblMbVerbleibend.setBounds(102, 350, 71, 14);
 		contentPanel.add(lblMbVerbleibend);
 
-		labelVerbleibend = new JLabel("");
-		labelVerbleibend.setBounds(91, 269, 108, 14);
+		labelVerbleibend = new JLabel("0");
+		labelVerbleibend.setBounds(183, 350, 108, 14);
 		contentPanel.add(labelVerbleibend);
 
 		JLabel lblGeschtzteVerbleibendeZeit = new JLabel(
 				"Gesch\u00E4tzte Verbleibende Zeit:");
-		lblGeschtzteVerbleibendeZeit.setBounds(57, 268, 150, 14);
+		lblGeschtzteVerbleibendeZeit.setBounds(102, 300, 150, 14);
 		contentPanel.add(lblGeschtzteVerbleibendeZeit);
 
-		labelZeit = new JLabel("");
-		labelZeit.setBounds(261, 219, 117, 14);
+		labelZeit = new JLabel("0");
+		labelZeit.setBounds(374, 300, 117, 14);
 		contentPanel.add(labelZeit);
 
 		JPanel panel = new JPanel();
@@ -253,21 +259,29 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener
 		separator_1.setBounds(-10, 648, 597, 2);
 		contentPanel.add(separator_1);
 
-		JLabel label_6 = new JLabel("1.");
-		label_6.setBounds(24, 128, 23, 14);
-		contentPanel.add(label_6);
+		JLabel lblSchritt = new JLabel("Schritt 1:");
+		lblSchritt.setBounds(24, 128, 57, 14);
+		contentPanel.add(lblSchritt);
+
+		JLabel lblSchritt_1 = new JLabel("Schritt 2:");
+		lblSchritt_1.setBounds(24, 204, 57, 14);
+		contentPanel.add(lblSchritt_1);
 
-		JLabel label_7 = new JLabel("2.");
-		label_7.setBounds(24, 172, 23, 14);
-		contentPanel.add(label_7);
+		JLabel lblSchritt_3 = new JLabel("Schritt 3:");
+		lblSchritt_3.setBounds(20, 423, 57, 14);
+		contentPanel.add(lblSchritt_3);
+
+		JLabel lblKlickenSieAuf = new JLabel(
+				"Klicken Sie auf \"Fertigstellen\".");
+		lblKlickenSieAuf.setBounds(98, 423, 241, 14);
+		contentPanel.add(lblKlickenSieAuf);
 		{
 			JPanel buttonPane = new JPanel();
 			buttonPane.setBackground(UIManager.getColor("Button.background"));
 			buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT));
 			getContentPane().add(buttonPane, BorderLayout.SOUTH);
 			{
-				buttonback.setEnabled(false);
-				buttonback.addActionListener(new ActionListener() {
+				btnZurck.addActionListener(new ActionListener() {
 					public void actionPerformed(ActionEvent e) {
 						if (taskrun == true) {
 							task.cancel(true);
@@ -279,14 +293,26 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener
 							}
 						}
 						thrift.closeThriftConnection();
-						SearchEditImage_GUI se=new SearchEditImage_GUI();
+						SearchEditImage_GUI se = new SearchEditImage_GUI();
 						se.setVisible(true);
 						dispose();
 					}
 				});
-				buttonback.setActionCommand("Cancel");
-				buttonPane.add(buttonback);
+				btnZurck.setActionCommand("Cancel");
+				buttonPane.add(btnZurck);
 			}
+			
+			
+			btnMainMenu.addActionListener(new ActionListener() {
+				public void actionPerformed(ActionEvent arg0) {
+					thrift.closeThriftConnection();
+					MainMenue_GUI mm = new MainMenue_GUI();
+					mm.setVisible(true);
+					dispose();
+				}
+			});
+			btnMainMenu.setActionCommand("Cancel");
+			buttonPane.add(btnMainMenu);
 		}
 		setVisible(true);
 
@@ -295,19 +321,22 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener
 	private void buttonDownloadActionPerformed(ActionEvent event) {
 
 		progressBar.setValue(0);
-
+		btnDownloadStarten.setEnabled(false); // verhindert schnellen zweiten
+												// Klick
+		btnDownloadStarten.setText("Bitte warten");
 		try {
 			user = client.getFtpUser();
-			
-			downloadFile=client.getPathOfImage(Image.image.getImageId(),Image.image.getVersion());
-			
+
+			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,
-				downloadFile, lblNewLabel.getText(), this);
+				downloadFile, lblPath.getText(), this);
 		task.addPropertyChangeListener(this);
 		task.execute();
 		taskrun = true;
@@ -316,12 +345,20 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener
 
 	public void propertyChange(PropertyChangeEvent arg0) {
 
-		int progress = 0;
+		progress = 0;
 		if ("progress" == arg0.getPropertyName()) {
 			progress = (Integer) arg0.getNewValue();
 			progressBar.setValue(progress);
-			if (progress == 100) {
-				buttonback.setEnabled(true);
+			
+			// Button zum Fertigstellen freischalten, wenn 100% erreicht sind
+			if (progress == 0 || progress == 100) {
+				// not uploading currently
+				btnZurck.setEnabled(true);
+				btnMainMenu.setEnabled(true);
+			} else {
+				// currently uploading, don't let user interact
+				btnZurck.setEnabled(false);
+				btnMainMenu.setEnabled(false);
 			}
 		}
 
@@ -333,17 +370,10 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener
 					String.valueOf(speed).lastIndexOf(".") + 3)
 					+ " MB/s");
 
-			// }else
-			// {
-			// double MBSpeed=speed/1024;
-			// downspeed.setText(String.valueOf((MBSpeed)).substring(0,
-			// String.valueOf(MBSpeed).indexOf(".")));
-			// }
-
 		}
 		if ("bytesread" == arg0.getPropertyName()) {
 			bytesread = (long) arg0.getNewValue();
-			bytesreadlbl.setText((bytesread / 1024 / 1024) + " MB");
+			lblBytesread.setText((bytesread / 1024 / 1024) + " MB");
 			labelVerbleibend
 					.setText(((filesize / 1024 / 1024) - (bytesread / 1024 / 1024))
 							+ " MB");
diff --git a/Dozentenmodul/src/GUI/FTPUploader_GUI.java b/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java
index eaaf9544..b184c96c 100644
--- a/Dozentenmodul/src/GUI/FTPUploader_GUI.java
+++ b/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java
@@ -1,500 +1,475 @@
-package gui;

-

-import java.awt.BorderLayout;

-import java.awt.Color;

-import java.awt.Dimension;

-import java.awt.EventQueue;

-import java.awt.FlowLayout;

-import java.awt.Font;

-import java.awt.SystemColor;

-import java.awt.Toolkit;

-import java.awt.event.ActionEvent;

-import java.awt.event.ActionListener;

-import java.awt.event.WindowAdapter;

-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;

-import javax.swing.JLabel;

-import javax.swing.JMenu;

-import javax.swing.JMenuBar;

-import javax.swing.JPanel;

-import javax.swing.JProgressBar;

-import javax.swing.JSeparator;

-import javax.swing.JTextPane;

-import javax.swing.SwingConstants;

-import javax.swing.UIManager;

-import javax.swing.UnsupportedLookAndFeelException;

-import javax.swing.border.EmptyBorder;

-import models.Image;

-import models.person;

-import org.apache.thrift.TException;

-import server.Server.Client;

-import thrift.ThriftConnection;

-//import util.XMLCreator;

-import ftp.UploadTask;

-

-@SuppressWarnings("serial")

-public class FTPUploader_GUI extends JFrame implements PropertyChangeListener {

-

-	@SuppressWarnings("unused")

-	private JPanel contentPane;

-	private final JPanel contentPanel = new JPanel();

-	JLabel lblNewLabel;

-	JProgressBar progressBar;

-	String host = "141.79.128.121";

-	int port = 21;

-	server.User user;

-	String filename = "";

-	File uploadFile;

-	static String arg = "";

-	UploadTask task;

-	JLabel UpSpeed;

-	JLabel labelfertig;

-	JLabel labelfilesize;

-	JLabel labelZeit;

-	JLabel labelverbleibend;

-	long filesize;

-	double speed;

-	long bytesread;

-	boolean taskrun = false;

-	ThriftConnection thrift = new ThriftConnection();

-	Client client = thrift.getThriftConnection();

-	JButton finishButton = new JButton("Fertigstellen");

-

-	/**

-	 * Launch the application.

-	 */

-	public static void main(String[] args) {

-		EventQueue.invokeLater(new Runnable() {

-			public void run() {

-				try {

-					FTPUploader_GUI frame = new FTPUploader_GUI();

-					frame.setVisible(true);

-				} catch (Exception e) {

-					e.printStackTrace();

-				}

-			}

-		});

-	}

-

-	/**

-	 * Create the frame.

-	 */

-	public FTPUploader_GUI() {

-		addWindowListener(new WindowAdapter() {

-			@Override

-			public void windowClosing(WindowEvent arg0) {

-				if (taskrun == true) {

-					try {

-

-						client.DeleteFtpUser(user.userName);

-					} catch (TException e1) {

-						// TODO Auto-generated catch block

-						e1.printStackTrace();

-					}

-					task.cancel(true);

-				}

-			}

-		});

-		setResizable(false);

-		// setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);

-

-		try {

-			UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());

-		} catch (ClassNotFoundException | InstantiationException

-				| IllegalAccessException | UnsupportedLookAndFeelException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		}

-

-		// filename=name;

-		setBackground(Color.WHITE);

-		setTitle("Dozentenmodul *Prototyp*");

-		Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();

-		int top = (screenSize.height - 722) / 2;

-		int left = (screenSize.width - 603) / 2;

-		setBounds(left, top, 603, 722);

-		// setBounds(100, 100, 603, 250);

-		getContentPane().setLayout(new BorderLayout());

-		contentPanel.setBackground(SystemColor.menu);

-		contentPanel.setBorder(new EmptyBorder(5, 5, 5, 5));

-		getContentPane().add(contentPanel, BorderLayout.CENTER);

-		contentPanel.setLayout(null);

-		{

-			JButton btnSpeicherortAuswhlen = new JButton("Image ausw\u00E4hlen");

-			btnSpeicherortAuswhlen.addActionListener(new ActionListener() {

-				public void actionPerformed(ActionEvent arg0) {

-					JFileChooser fc = new JFileChooser();

-					fc.setFileSelectionMode(JFileChooser.FILES_ONLY);

-

-					fc.showOpenDialog(getParent());

-					File file = fc.getSelectedFile();

-					//check if a file is selected and exists

-					if (file != null) {

-						System.out.println("File to upload exists");

-						uploadFile = file;

-						filename = uploadFile.getName();

-						lblNewLabel.setText(file.getAbsolutePath());

-					} else {

-						System.out.println("No file selected");

-						lblNewLabel.setText("");

-					}//end if

-				}

-			});

-

-			btnSpeicherortAuswhlen.setBounds(102, 124, 173, 23);

-			btnSpeicherortAuswhlen.setVerticalAlignment(SwingConstants.TOP);

-			contentPanel.add(btnSpeicherortAuswhlen);

-		}

-

-		lblNewLabel = new JLabel("");

-		lblNewLabel.setHorizontalAlignment(SwingConstants.LEFT);

-		lblNewLabel.setBounds(285, 124, 302, 23);

-		contentPanel.add(lblNewLabel);

-

-		JButton btnUploadStarten = new JButton("Upload auf Server starten");

-		btnUploadStarten.addActionListener(new ActionListener() {

-			public void actionPerformed(ActionEvent arg0) {

-				buttonUploadActionPerformed(arg0);

-

-			}

-		});

-

-		btnUploadStarten.setBounds(102, 168, 173, 23);

-		contentPanel.add(btnUploadStarten);

-

-		progressBar = new JProgressBar(0, 100);

-		progressBar.setStringPainted(true);

-

-		progressBar.setBounds(102, 202, 485, 30);

-		contentPanel.add(progressBar);

-

-		JLabel lblUploadgeschwindigkeit = new JLabel("Uploadgeschwindigkeit:");

-		lblUploadgeschwindigkeit.setBounds(102, 243, 141, 14);

-		contentPanel.add(lblUploadgeschwindigkeit);

-

-		JLabel label_1 = new JLabel("Fertig:");

-		label_1.setBounds(102, 293, 46, 14);

-		contentPanel.add(label_1);

-

-		labelfertig = new JLabel("0");

-		labelfertig.setHorizontalAlignment(SwingConstants.LEFT);

-		labelfertig.setBounds(183, 293, 108, 14);

-		contentPanel.add(labelfertig);

-

-		UpSpeed = new JLabel("0");

-		UpSpeed.setHorizontalAlignment(SwingConstants.LEFT);

-		UpSpeed.setBounds(374, 243, 117, 14);

-		contentPanel.add(UpSpeed);

-

-		JLabel label_4 = new JLabel("von:");

-		label_4.setBounds(318, 293, 46, 14);

-		contentPanel.add(label_4);

-

-		labelfilesize = new JLabel("0");

-		labelfilesize.setHorizontalAlignment(SwingConstants.LEFT);

-		labelfilesize.setBounds(374, 293, 117, 14);

-		contentPanel.add(labelfilesize);

-

-		JLabel label_6 = new JLabel("Verbleibend:");

-		label_6.setBounds(102, 318, 71, 14);

-		contentPanel.add(label_6);

-

-		JLabel label_7 = new JLabel("Gesch\u00E4tzte Verbleibende Zeit:");

-		label_7.setBounds(102, 268, 150, 14);

-		contentPanel.add(label_7);

-

-		labelZeit = new JLabel("0");

-		labelZeit.setHorizontalAlignment(SwingConstants.LEFT);

-		labelZeit.setBounds(374, 268, 117, 14);

-		contentPanel.add(labelZeit);

-

-		labelverbleibend = new JLabel("0");

-		labelverbleibend.setHorizontalAlignment(SwingConstants.LEFT);

-		labelverbleibend.setBounds(183, 318, 108, 14);

-		contentPanel.add(labelverbleibend);

-

-		JPanel panel = new JPanel();

-		panel.setLayout(null);

-		panel.setBackground(SystemColor.menu);

-		panel.setBounds(10, 11, 577, 57);

-		contentPanel.add(panel);

-

-		JLabel lblUploadIhresImage = new JLabel("Upload Ihres Image");

-		lblUploadIhresImage.setFont(new Font("Tahoma", Font.BOLD, 18));

-		lblUploadIhresImage.setBounds(10, 11, 509, 22);

-		panel.add(lblUploadIhresImage);

-

-		JTextPane txtpnFhreSieBitte = new JTextPane();

-		txtpnFhreSieBitte

-				.setText("F\u00FChre Sie bitte die folgenden 3 Schritte aus um Ihr Image auf unseren Server zu laden.");

-		txtpnFhreSieBitte.setEditable(false);

-		txtpnFhreSieBitte.setBackground(SystemColor.menu);

-		txtpnFhreSieBitte.setBounds(10, 36, 509, 32);

-		panel.add(txtpnFhreSieBitte);

-

-		JSeparator separator = new JSeparator();

-		separator.setBounds(0, 79, 597, 2);

-		contentPanel.add(separator);

-

-		JLabel lblNewLabel_1 = new JLabel("Hauptmen\u00FC");

-		lblNewLabel_1.setForeground(Color.BLUE);

-		lblNewLabel_1.setBounds(20, 88, 61, 20);

-		contentPanel.add(lblNewLabel_1);

-

-		JLabel label_3 = new JLabel(">");

-		label_3.setBounds(80, 91, 14, 14);

-		contentPanel.add(label_3);

-

-		JLabel lblVlimage = new JLabel("VL-Image");

-		lblVlimage.setForeground(Color.BLUE);

-		lblVlimage.setBounds(91, 88, 46, 20);

-		contentPanel.add(lblVlimage);

-

-		JLabel label_5 = new JLabel(">");

-		label_5.setBounds(139, 91, 14, 14);

-		contentPanel.add(label_5);

-

-		JLabel lblNeubearbeiten = new JLabel("Neu/Bearbeiten");

-		lblNeubearbeiten.setBounds(149, 91, 108, 14);

-		contentPanel.add(lblNeubearbeiten);

-

-		JSeparator separator_1 = new JSeparator();

-		separator_1.setBounds(0, 627, 597, 2);

-		contentPanel.add(separator_1);

-

-		JButton btnCopyFileTo = new JButton("Copy File to Prod");

-		btnCopyFileTo.addActionListener(new ActionListener() {

-			public void actionPerformed(ActionEvent e) {

-				try {

-					System.out.println("Copying file to "+ user.path + "/" + uploadFile.getName());

-					client.startFileCopy(user.path + "/" + uploadFile.getName());

-				} catch (TException e1) {

-					// TODO Auto-generated catch block

-					e1.printStackTrace();

-				}

-			}

-		});

-		btnCopyFileTo.setBounds(102, 343, 173, 23);

-		contentPanel.add(btnCopyFileTo);

-

-		JLabel lblShritt = new JLabel("Schritt 1:");

-		lblShritt.setBounds(24, 128, 57, 14);

-		contentPanel.add(lblShritt);

-

-		JLabel lblSchritt = new JLabel("Schritt 2:");

-		lblSchritt.setBounds(24, 172, 57, 14);

-		contentPanel.add(lblSchritt);

-

-		JLabel lblSchritt_1 = new JLabel("Schritt 3:");

-		lblSchritt_1.setBounds(20, 391, 57, 14);

-		contentPanel.add(lblSchritt_1);

-

-		JLabel lblKlickenSieAuf = new JLabel(

-				"Klicken Sie auf \"Fertigstellen\".");

-		lblKlickenSieAuf.setBounds(98, 391, 241, 14);

-		contentPanel.add(lblKlickenSieAuf);

-		{

-			JPanel buttonPane = new JPanel();

-			buttonPane.setBackground(UIManager.getColor("Button.background"));

-			buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT));

-			getContentPane().add(buttonPane, BorderLayout.SOUTH);

-			{

-				// Button for starting upload

-				// JButton finishButton = new JButton("Fertigstellen");

-				finishButton.setEnabled(false);

-				finishButton.addActionListener(new ActionListener() {

-					public void actionPerformed(ActionEvent e) {

-						writeData();

-						dispose();

-						MainMenue_GUI m = new MainMenue_GUI();

-						m.setVisible(true);

-						if (taskrun == true) {

-							try {

-								client.DeleteFtpUser(user.userName);

-								thrift.closeThriftConnection();

-							} catch (TException e1) {

-								// TODO Auto-generated catch block

-								e1.printStackTrace();

-							}

-							task.cancel(true);

-						}

-

-					}

-				});

-

-				// Button for going back to Main Menu

-				JButton cancelButton = new JButton("Hauptmen\u00FC");

-				cancelButton.addActionListener(new ActionListener() {

-					public void actionPerformed(ActionEvent arg0) {

-						dispose();

-						MainMenue_GUI m = new MainMenue_GUI();

-						m.setVisible(true);

-					}

-				});

-

-				JButton btnZurck = new JButton("Zur\u00FCck");

-				btnZurck.addActionListener(new ActionListener() {

-					public void actionPerformed(ActionEvent e) {

-						dispose();

-						EingabeImageTechnisch_GUI m = new EingabeImageTechnisch_GUI();

-						m.setVisible(true);

-					}

-				});

-				btnZurck.setActionCommand("Cancel");

-				buttonPane.add(btnZurck);

-

-				cancelButton.setActionCommand("Cancel");

-				buttonPane.add(cancelButton);

-				finishButton.setActionCommand("Cancel");

-				buttonPane.add(finishButton);

-			}

-		}

-

-		JMenuBar menuBar = new JMenuBar();

-		setJMenuBar(menuBar);

-

-		JMenu mnHillfe = new JMenu("Hillfe");

-		menuBar.add(mnHillfe);

-		setVisible(true);

-

-	}

-

-	private void buttonUploadActionPerformed(ActionEvent event) {

-		// File (or directory) with old name

-		// File file = new File(lblNewLabel.getText());

-

-		// File (or directory) with new name

-		// System.out.println(file.getAbsolutePath().substring(0,file.getAbsolutePath().lastIndexOf("\\"))+"\\"+vm.vl.getLaborname()+".vmdk");

-		// File file2 = new

-		// File(file.getAbsoluteFile()+"\\"+vm.vl.getLaborname()+".vmdk");

-

-		// Rename file (or directory)

-		// boolean success = file.renameTo(file2);

-		// if (!success) {

-		// File was not successfully renamed

-		// System.out.println("Not OK");

-		// }

-		// else

-		// {

-		// System.out.println("OK");

-		// }

-		progressBar.setValue(0);

-

-		try {

-			user = client.getFtpUser();

-			System.out.println("name" + user.userName);

-			System.out.println("path" + user.path);

-			System.out.println("pass" + user.password);

-		} catch (TException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		}

-		DateFormat formatter = new SimpleDateFormat("yyyMMddhhmmss");

-

-		System.out.println(formatter.format(new Date()) + "_"

-				+ person.verantwortlicher.getHochschule() + "_"

-				+ person.verantwortlicher.getUsername() + "_"

-				+ Image.image.getImagename() + ".vmdk");

-		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);

-		task.execute();

-		taskrun = true;

-

-		// createXML();

-		// TransferToSatellit();

-

-	}

-

-	public void propertyChange(PropertyChangeEvent arg0) {

-		int progress = 0;

-		if ("progress" == arg0.getPropertyName()) {

-			progress = (Integer) arg0.getNewValue();

-			progressBar.setValue(progress);

-

-			// Button zum Fertigstellen freischalten, wenn 100% erreicht sind

-			if (progress == 100) {

-				finishButton.setEnabled(true);

-			}

-

-		}

-

-		if ("speed" == arg0.getPropertyName()) {

-			speed = (double) arg0.getNewValue();

-			// if(speed<=1){

-

-			UpSpeed.setText(String.valueOf(speed).substring(0,

-					String.valueOf(speed).lastIndexOf(".") + 3)

-					+ " MB/s");

-

-			// }else

-			// {

-			// double MBSpeed=speed/1024;

-			// downspeed.setText(String.valueOf((MBSpeed)).substring(0,

-			// String.valueOf(MBSpeed).indexOf(".")));

-			// }

-

-		}

-		if ("bytesread" == arg0.getPropertyName()) {

-			bytesread = (long) arg0.getNewValue();

-			labelfertig.setText((bytesread / 1024 / 1024) + " MB");

-			labelverbleibend

-					.setText(((filesize / 1024 / 1024) - (bytesread / 1024 / 1024))

-							+ " MB");

-

-			labelZeit

-					.setText(String

-							.valueOf(

-									((((filesize / 1024 / 1024) - (bytesread / 1024 / 1024)) / speed) / 60) + 1)

-							.substring(

-									0,

-									String.valueOf(

-											(((filesize / 1024 / 1024) - (bytesread / 1024 / 1024)) / speed) / 60)

-											.lastIndexOf("."))

-							+ " Minuten");

-

-		}

-		if ("filesize" == arg0.getPropertyName()) {

-			filesize = (long) arg0.getNewValue();

-			labelfilesize.setText((filesize / 1024 / 1024) + " MB");

-

-		}

-

-	}

-

-	public boolean writeData() {

-

-		try {

-

-			client.writeVLdata(Image.image.getImagename(),

-					person.verantwortlicher.getVorname(),

-					person.verantwortlicher.getName(),

-					person.verantwortlicher.getHochschule(),

-					person.verantwortlicher.getEMail(),

-					person.verantwortlicher.getTel(),

-					person.verantwortlicher.getFakultät(),

-					Image.image.isLicensed(), Image.image.isInternet(),

-					Image.image.getRam(), Image.image.getCpu(),

-					"/srv/openslx/nfs/temp/" + Image.image.getNewName());

-		} catch (TException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-			return false;

-		}

-		return true;

-

-	}

+package gui.image;
+
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.EventQueue;
+import java.awt.FlowLayout;
+import java.awt.Font;
+import java.awt.SystemColor;
+import java.awt.Toolkit;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.WindowAdapter;
+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;
+import javax.swing.JLabel;
+import javax.swing.JMenu;
+import javax.swing.JMenuBar;
+import javax.swing.JPanel;
+import javax.swing.JProgressBar;
+import javax.swing.JSeparator;
+import javax.swing.JTextPane;
+import javax.swing.SwingConstants;
+import javax.swing.UIManager;
+import javax.swing.UnsupportedLookAndFeelException;
+import javax.swing.border.EmptyBorder;
+import models.Image;
+import models.person;
+import org.apache.thrift.TException;
+import server.Server.Client;
+import thrift.ThriftConnection;
+import ftp.UploadTask;
+import gui.intro.MainMenue_GUI;
+
+@SuppressWarnings("serial")
+public class FTPEditUploader_GUI extends JFrame implements
+		PropertyChangeListener {
+
+	@SuppressWarnings("unused")
+	private JPanel contentPane;
+	private final JPanel contentPanel = new JPanel();
+	JLabel lblPath;
+	JProgressBar progressBar;
+	//String host = "141.79.128.121";
+	String host = "141.79.128.102";
+	int port = 21;
+	server.User user;
+	String filename = "";
+	File uploadFile;
+	static String arg = "";
+	UploadTask task;
+	JLabel UpSpeed;
+	JLabel labelfertig;
+	JLabel labelfilesize;
+	JLabel labelZeit;
+	JLabel labelverbleibend;
+	long filesize;
+	double speed;
+	long bytesread;
+	boolean taskrun = false;
+	int progress = 0;
+	ThriftConnection thrift = new ThriftConnection();
+	Client client = thrift.getThriftConnection();
+	JButton btnUploadStarten = new JButton("Upload auf Server starten");
+	JButton btnSpeicherortAuswhlen = new JButton("Image ausw\u00E4hlen");
+	JButton btnCopyFileTo = new JButton("Copy File to Prod");
+	JButton finishButton = new JButton("Fertigstellen");
+	JButton btnZurck = new JButton("Zur\u00FCck");
+
+	/**
+	 * Launch the application.
+	 */
+	public static void main(String[] args) {
+		EventQueue.invokeLater(new Runnable() {
+			public void run() {
+				try {
+					FTPEditUploader_GUI frame = new FTPEditUploader_GUI();
+					frame.setVisible(true);
+				} catch (Exception e) {
+					e.printStackTrace();
+				}
+			}
+		});
+	}
+
+	/**
+	 * Create the frame.
+	 */
+	public FTPEditUploader_GUI() {
+		addWindowListener(new WindowAdapter() {
+			@Override
+			public void windowClosing(WindowEvent arg0) {
+				if (taskrun == true) {
+					try {
+
+						client.DeleteFtpUser(user.userName);
+					} catch (TException e1) {
+						// TODO Auto-generated catch block
+						e1.printStackTrace();
+					}
+					task.cancel(true);
+				}
+				System.exit(0);
+			}// end window closing
+		});
+		setResizable(false);
+		// setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
+
+		try {
+			UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
+		} catch (ClassNotFoundException | InstantiationException
+				| IllegalAccessException | UnsupportedLookAndFeelException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+
+		// filename=name;
+		setBackground(Color.WHITE);
+		setTitle("Dozentenmodul *Prototyp*");
+		Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
+		int top = (screenSize.height - 722) / 2;
+		int left = (screenSize.width - 603) / 2;
+		setBounds(left, top, 603, 722);
+		// setBounds(100, 100, 603, 250);
+		getContentPane().setLayout(new BorderLayout());
+		contentPanel.setBackground(SystemColor.menu);
+		contentPanel.setBorder(new EmptyBorder(5, 5, 5, 5));
+		getContentPane().add(contentPanel, BorderLayout.CENTER);
+		contentPanel.setLayout(null);
+		{
+
+			btnSpeicherortAuswhlen.addActionListener(new ActionListener() {
+				public void actionPerformed(ActionEvent arg0) {
+					JFileChooser fc = new JFileChooser();
+					fc.setFileSelectionMode(JFileChooser.FILES_ONLY);
+
+					fc.showOpenDialog(getParent());
+					File file = fc.getSelectedFile();
+					// check if a file is selected and exists
+					if (file != null) {
+						// file exists
+						uploadFile = file;
+						filename = uploadFile.getName();
+						lblPath.setText(file.getAbsolutePath());
+					} else {
+						// no file selected
+						lblPath.setText("");
+					}// end if
+				}
+			});
+
+			btnSpeicherortAuswhlen.setBounds(102, 124, 173, 23);
+			btnSpeicherortAuswhlen.setVerticalAlignment(SwingConstants.TOP);
+			contentPanel.add(btnSpeicherortAuswhlen);
+		}
+
+		lblPath = new JLabel("");
+		lblPath.addPropertyChangeListener(new PropertyChangeListener() {
+			public void propertyChange(PropertyChangeEvent arg0) {
+				if (lblPath.getText().isEmpty()) {
+					// wenn leer, dann upload button nicht freigeben
+					btnUploadStarten.setEnabled(false);
+					btnUploadStarten.setText("Bitte warten");
+				} else {
+					// wenn leer, dann upload button nicht freigeben
+					btnUploadStarten.setEnabled(true);
+					btnUploadStarten.setText("Upload auf Server starten");
+				}
+			}
+		});
+		lblPath.setBounds(102, 158, 485, 23);
+		contentPanel.add(lblPath);
+
+		btnUploadStarten.setEnabled(false);
+		btnUploadStarten.addActionListener(new ActionListener() {
+			public void actionPerformed(ActionEvent arg0) {
+				buttonUploadActionPerformed(arg0);
+
+			}
+		});
+
+		btnUploadStarten.setBounds(102, 200, 173, 23);
+		contentPanel.add(btnUploadStarten);
+
+		progressBar = new JProgressBar(0, 100);
+		progressBar.setStringPainted(true);
+
+		progressBar.setBounds(102, 234, 485, 30);
+		contentPanel.add(progressBar);
+
+		JLabel lblUploadgeschwindigkeit = new JLabel("Uploadgeschwindigkeit:");
+		lblUploadgeschwindigkeit.setBounds(102, 275, 141, 14);
+		contentPanel.add(lblUploadgeschwindigkeit);
+
+		JLabel label_1 = new JLabel("Fertig:");
+		label_1.setBounds(102, 325, 46, 14);
+		contentPanel.add(label_1);
+
+		labelfertig = new JLabel("0");
+		labelfertig.setBounds(183, 325, 108, 14);
+		contentPanel.add(labelfertig);
+
+		UpSpeed = new JLabel("0");
+		UpSpeed.setBounds(374, 275, 117, 14);
+		contentPanel.add(UpSpeed);
+
+		JLabel label_4 = new JLabel("von:");
+		label_4.setBounds(318, 325, 46, 14);
+		contentPanel.add(label_4);
+
+		labelfilesize = new JLabel("0");
+		labelfilesize.setBounds(374, 325, 117, 14);
+		contentPanel.add(labelfilesize);
+
+		JLabel label_6 = new JLabel("Verbleibend:");
+		label_6.setBounds(102, 350, 71, 14);
+		contentPanel.add(label_6);
+
+		JLabel label_7 = new JLabel("Gesch\u00E4tzte Verbleibende Zeit:");
+		label_7.setBounds(102, 300, 150, 14);
+		contentPanel.add(label_7);
+
+		labelZeit = new JLabel("0");
+		labelZeit.setBounds(374, 300, 117, 14);
+		contentPanel.add(labelZeit);
+
+		labelverbleibend = new JLabel("0");
+		labelverbleibend.setBounds(183, 350, 108, 14);
+		contentPanel.add(labelverbleibend);
+
+		JPanel panel = new JPanel();
+		panel.setLayout(null);
+		panel.setBackground(SystemColor.menu);
+		panel.setBounds(10, 11, 577, 57);
+		contentPanel.add(panel);
+
+		JLabel lblUploadIhresImage = new JLabel("Upload Ihres Image");
+		lblUploadIhresImage.setFont(new Font("Tahoma", Font.BOLD, 18));
+		lblUploadIhresImage.setBounds(10, 11, 509, 22);
+		panel.add(lblUploadIhresImage);
+
+		JTextPane txtpnFhreSieBitte = new JTextPane();
+		txtpnFhreSieBitte
+				.setText("F\u00FChre Sie bitte die folgenden 3 Schritte aus um Ihr Image auf unseren Server zu laden.");
+		txtpnFhreSieBitte.setEditable(false);
+		txtpnFhreSieBitte.setBackground(SystemColor.menu);
+		txtpnFhreSieBitte.setBounds(10, 36, 509, 32);
+		panel.add(txtpnFhreSieBitte);
+
+		JSeparator separator = new JSeparator();
+		separator.setBounds(0, 79, 597, 2);
+		contentPanel.add(separator);
+
+		JLabel lblNewLabel_1 = new JLabel("Hauptmen\u00FC");
+		lblNewLabel_1.setForeground(Color.BLUE);
+		lblNewLabel_1.setBounds(20, 88, 61, 20);
+		contentPanel.add(lblNewLabel_1);
+
+		JLabel label_3 = new JLabel(">");
+		label_3.setBounds(80, 91, 14, 14);
+		contentPanel.add(label_3);
+
+		JLabel lblVlimage = new JLabel("VL-Image");
+		lblVlimage.setForeground(Color.BLUE);
+		lblVlimage.setBounds(91, 88, 46, 20);
+		contentPanel.add(lblVlimage);
+
+		JLabel label_5 = new JLabel(">");
+		label_5.setBounds(139, 91, 14, 14);
+		contentPanel.add(label_5);
+
+		JLabel lblNeubearbeiten = new JLabel("Bearbeiten");
+		lblNeubearbeiten.setBounds(149, 91, 108, 14);
+		contentPanel.add(lblNeubearbeiten);
+
+		JSeparator separator_1 = new JSeparator();
+		separator_1.setBounds(0, 627, 597, 2);
+		contentPanel.add(separator_1);
+
+		btnCopyFileTo.setEnabled(false);
+		btnCopyFileTo.addActionListener(new ActionListener() {
+			public void actionPerformed(ActionEvent e) {
+				try {
+					client.startFileCopy(user.path + "/" + uploadFile.getName());
+				} catch (TException e1) {
+					// TODO Auto-generated catch block
+					e1.printStackTrace();
+				}
+			}
+		});
+		btnCopyFileTo.setBounds(102, 375, 173, 23);
+		contentPanel.add(btnCopyFileTo);
+
+		JLabel lblSchritt_1 = new JLabel("Schritt 1:");
+		lblSchritt_1.setBounds(24, 128, 57, 14);
+		contentPanel.add(lblSchritt_1);
+
+		JLabel lblSchritt_2 = new JLabel("Schritt 2:");
+		lblSchritt_2.setBounds(24, 204, 57, 14);
+		contentPanel.add(lblSchritt_2);
+
+		JLabel label = new JLabel("Schritt 3:");
+		label.setBounds(20, 423, 57, 14);
+		contentPanel.add(label);
+
+		JLabel label_2 = new JLabel("Klicken Sie auf \"Fertigstellen\".");
+		label_2.setBounds(98, 423, 241, 14);
+		contentPanel.add(label_2);
+		{
+			JPanel buttonPane = new JPanel();
+			buttonPane.setBackground(UIManager.getColor("Button.background"));
+			buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT));
+			getContentPane().add(buttonPane, BorderLayout.SOUTH);
+			{
+
+				finishButton.setEnabled(false);
+				finishButton.addActionListener(new ActionListener() {
+					public void actionPerformed(ActionEvent e) {
+
+						updateData();
+						dispose();
+						MainMenue_GUI m = new MainMenue_GUI();
+						m.setVisible(true);
+
+						if (taskrun == true) {
+							try {
+								client.DeleteFtpUser(user.userName);
+
+							} catch (TException e1) {
+								// TODO Auto-generated catch block
+								e1.printStackTrace();
+							}
+							task.cancel(true);
+						}
+						thrift.closeThriftConnection();
+					}
+				});
+				btnZurck.addActionListener(new ActionListener() {
+					public void actionPerformed(ActionEvent arg0) {
+						dispose();
+						EditImageTechnisch_GUI ei = new EditImageTechnisch_GUI();
+						ei.setVisible(true);
+					}
+				});
+
+				btnZurck.setActionCommand("Cancel");
+				buttonPane.add(btnZurck);
+				finishButton.setActionCommand("Cancel");
+				buttonPane.add(finishButton);
+			}
+		}
+
+		JMenuBar menuBar = new JMenuBar();
+		setJMenuBar(menuBar);
+
+		JMenu mnHillfe = new JMenu("Hillfe");
+		menuBar.add(mnHillfe);
+		setVisible(true);
+
+	}
+
+	private void buttonUploadActionPerformed(ActionEvent event) {
+
+		progressBar.setValue(0);
+		btnUploadStarten.setEnabled(false); // verhindert einen weiteren klick
+		btnUploadStarten.setText("Bitte warten");
+
+		try {
+			user = client.getFtpUser();
+			System.out.println("FTP name" + user.userName);
+			System.out.println("FTP path" + user.path);
+			System.out.println("FTP pass" + user.password);
+		} catch (TException e) {
+			// 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);
+		task.execute();
+		taskrun = true;
+
+	}
+
+	public void propertyChange(PropertyChangeEvent arg0) {
+		if ("progress" == arg0.getPropertyName()) {
+			progress = (Integer) arg0.getNewValue();
+			progressBar.setValue(progress);
+			
+			// Button zum Fertigstellen freischalten, wenn 100% erreicht sind
+			if (progress == 0 || progress == 100) {
+				// not uploading currently
+				btnZurck.setEnabled(true);
+			} else {
+				// currently uploading, don't let user interact
+				btnZurck.setEnabled(false);
+			}
+
+			// Fertigstellen erlauben wenn upload abgeschlossen
+			if (progress == 100) {
+				finishButton.setEnabled(true);
+			} else {
+				finishButton.setEnabled(false);
+			}
+		}
+
+		
+
+		if ("speed" == arg0.getPropertyName()) {
+			speed = (double) arg0.getNewValue();
+			// if(speed<=1){
+
+			UpSpeed.setText(String.valueOf(speed).substring(0,
+					String.valueOf(speed).lastIndexOf(".") + 3)
+					+ " MB/s");
+
+		}
+		if ("bytesread" == arg0.getPropertyName()) {
+			bytesread = (long) arg0.getNewValue();
+			labelfertig.setText((bytesread / 1024 / 1024) + " MB");
+			labelverbleibend
+					.setText(((filesize / 1024 / 1024) - (bytesread / 1024 / 1024))
+							+ " MB");
+
+			labelZeit
+					.setText(String
+							.valueOf(
+									((((filesize / 1024 / 1024) - (bytesread / 1024 / 1024)) / speed) / 60) + 1)
+							.substring(
+									0,
+									String.valueOf(
+											(((filesize / 1024 / 1024) - (bytesread / 1024 / 1024)) / speed) / 60)
+											.lastIndexOf("."))
+							+ " Minuten");
+
+		}
+		if ("filesize" == arg0.getPropertyName()) {
+			filesize = (long) arg0.getNewValue();
+			labelfilesize.setText((filesize / 1024 / 1024) + " MB");
+
+		}
+
+	}
+
+	public boolean updateData() {
+
+		try {
+			client.updateImageData(Image.image.getImagename(),
+					Image.image.getNewName(), Image.image.isLicensed(),
+					Image.image.isInternet(), Image.image.getRam(),
+					Image.image.getCpu(), Image.image.getImageId(),
+					Image.image.getVersion());
+		} catch (TException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+			return false;
+		}
+		return true;
+
+	}
 }
\ No newline at end of file
diff --git a/Dozentenmodul/src/gui/SearchImage_GUI.java b/Dozentenmodul/src/gui/image/SearchEditImage_GUI.java
index 53257f48..e6bb055e 100644
--- a/Dozentenmodul/src/gui/SearchImage_GUI.java
+++ b/Dozentenmodul/src/gui/image/SearchEditImage_GUI.java
@@ -1,4 +1,7 @@
-package gui;
+package gui.image;
+
+import gui.intro.MainMenue_GUI;
+import gui.lecture.ExtendedSearchForImages_GUI;
 
 import java.awt.Color;
 import java.awt.Dimension;
@@ -16,15 +19,14 @@ import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
 import java.util.Iterator;
 import java.util.List;
-
 import javax.swing.JButton;
 import javax.swing.JComboBox;
-import javax.swing.JDialog;
 import javax.swing.JFrame;
 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;
@@ -33,7 +35,6 @@ import javax.swing.JTabbedPane;
 import javax.swing.JTable;
 import javax.swing.JTextField;
 import javax.swing.JTextPane;
-import javax.swing.ListSelectionModel;
 import javax.swing.RowFilter;
 import javax.swing.UIManager;
 import javax.swing.UnsupportedLookAndFeelException;
@@ -44,6 +45,9 @@ import javax.swing.event.ChangeListener;
 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,7 +55,7 @@ import server.Server.Client;
 import thrift.ThriftConnection;
 
 @SuppressWarnings("serial")
-public class SearchImage_GUI extends JFrame {
+public class SearchEditImage_GUI extends JFrame {
 
 	private final JPanel contentPanel = new JPanel();
 	String[] result;
@@ -63,7 +67,7 @@ public class SearchImage_GUI extends JFrame {
 	private JTextField textFieldName;
 	JTabbedPane tabbedPane;
 	String[] titles = { "Image-Name", "Lizenzpflichtig", "OS", "Veranstaltung",
-			"Verantwortlicher", "Letztes Update", "Schlagwort" };
+			"Verantwortlicher", "Letztes Update", "Schlagwort", "ID", "Version" };
 	ThriftConnection con = new ThriftConnection();
 	Client client = con.getThriftConnection();
 	final DefaultTableModel modelAll = new DefaultTableModel(titles, 0);
@@ -75,27 +79,29 @@ public class SearchImage_GUI extends JFrame {
 
 	/**
 	 * Launch the application.
+	 * 
+	 * public static void main(String[] args) { try { SearchEditImage_GUI dialog
+	 * = new SearchEditImage_GUI();
+	 * dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
+	 * dialog.setVisible(true); } catch (Exception e) { e.printStackTrace(); } }
 	 */
-	public static void main(String[] args) {
-		try {
-			SearchImage_GUI dialog = new SearchImage_GUI();
-			dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
-			dialog.setVisible(true);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
 
 	/**
 	 * Create the dialog.
 	 */
-	public SearchImage_GUI() {
+	public SearchEditImage_GUI() {
 		addWindowListener(new WindowAdapter() {
 			@Override
 			public void windowClosing(WindowEvent arg0) {
 				// Beendet die Anwendung nach klick auf X
+				con.closeThriftConnection();
 				System.exit(0);
 			}
+
+			@Override
+			public void windowOpened(WindowEvent arg0) {
+				textFieldName.requestFocusInWindow();
+			}
 		});
 		// Verhindert das Vergrößern Des Fensters
 		setResizable(false);
@@ -192,7 +198,8 @@ public class SearchImage_GUI extends JFrame {
 			@Override
 			public void mouseClicked(MouseEvent arg0) {
 				// Öffnet das Fenster Extended GUI
-				ExtendedSearch_GUI es = new ExtendedSearch_GUI();
+				con.closeThriftConnection();
+				ExtendedSearchForImages_GUI es = new ExtendedSearchForImages_GUI();
 				es.setVisible(true);
 			}
 		});
@@ -237,7 +244,8 @@ public class SearchImage_GUI extends JFrame {
 			@Override
 			public void mouseClicked(MouseEvent arg0) {
 				// Öffnet das Hauütmenü
-				SearchImage_GUI.this.setVisible(false);
+				con.closeThriftConnection();
+				SearchEditImage_GUI.this.setVisible(false);
 				MainMenue_GUI main = new MainMenue_GUI();
 				main.setVisible(true);
 			}
@@ -269,11 +277,13 @@ public class SearchImage_GUI extends JFrame {
 				System.out.println(tabbedPane.getSelectedIndex());
 				if (tabbedPane.getSelectedIndex() == 0) {
 
-				} else if (tabbedPane.getSelectedIndex() == 1) {
-					String username = "Spitzer Tobias";
+					String username = person.verantwortlicher.getName() + " "
+							+ person.verantwortlicher.getVorname();
+					// String username="Spitzer Tobias";
 					rowSorterMyImages.setRowFilter(RowFilter.regexFilter(
 							username, 4));
-					// rowSorterMyImages.toggleSortOrder(0);
+				} else if (tabbedPane.getSelectedIndex() == 1) {
+
 				}
 
 			}
@@ -281,17 +291,7 @@ public class SearchImage_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();
@@ -302,13 +302,23 @@ public class SearchImage_GUI extends JFrame {
 		tableAllImages.getColumnModel().getColumn(4).sizeWidthToFit();
 		tableAllImages.getColumnModel().getColumn(5).sizeWidthToFit();
 		initTableModel(modelAll);
-		tableAllImages.setRowSorter(rowSorterAll);
 
-		scrollPaneAllImages.setViewportView(tableAllImages);
-		tabbedPane.addTab("Alle", null, scrollPaneAllImages, null);
+		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);
 
 		JScrollPane scrollPaneCoopImages = new JScrollPane();
 		JTable tableCoopImages = new JTable();
@@ -356,9 +366,28 @@ public class SearchImage_GUI extends JFrame {
 		btnDownload.addActionListener(new ActionListener() {
 			public void actionPerformed(ActionEvent arg0) {
 				// Öffnet den Downloader
-				FTPDownloader_GUI down = new FTPDownloader_GUI();
-				down.setVisible(true);
-				SearchImage_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);
@@ -370,33 +399,64 @@ public class SearchImage_GUI extends JFrame {
 			buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT));
 			getContentPane().add(buttonPane);
 			{
-				JButton cancelButton = new JButton("Zur\u00FCck");
-				cancelButton.addActionListener(new ActionListener() {
+				JButton okButton = new JButton("Zur\u00FCck");
+				okButton.addActionListener(new ActionListener() {
 					public void actionPerformed(ActionEvent e) {
 						// Öffnet das Hauptmenü
+						con.closeThriftConnection();
 						MainMenue_GUI main = new MainMenue_GUI();
 						main.setVisible(true);
 						dispose();
 					}
 				});
-				cancelButton.setActionCommand("OK");
-				buttonPane.add(cancelButton);
-				getRootPane().setDefaultButton(cancelButton);
+				okButton.setActionCommand("OK");
+				buttonPane.add(okButton);
+				getRootPane().setDefaultButton(okButton);
 			}
 			{
-				JButton continueButton = new JButton("Weiter");
-				continueButton.addActionListener(new ActionListener() {
+				JButton cancelButton = new JButton("Weiter");
+				cancelButton.addActionListener(new ActionListener() {
 					public void actionPerformed(ActionEvent e) {
-
 						con.closeThriftConnection();
-						EditImageAllgemein_GUI ea = new EditImageAllgemein_GUI();
-						ea.setVisible(true);
-						dispose();
 
+						// check if user is in correct tab
+						if (tabbedPane.getSelectedIndex() == 0) {
+							//check if a row is selected
+							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);
+								con.closeThriftConnection();
+								EditImageAllgemein_GUI ea = new EditImageAllgemein_GUI();
+								ea.setVisible(true);
+								dispose();
+							} else {
+								JOptionPane.showMessageDialog(null,
+										"Bitte wählen Sie ein Image aus.",
+										"Image Auswahl", JOptionPane.INFORMATION_MESSAGE);
+							}// end check if row is selected
+						} else {
+							JOptionPane.showMessageDialog(null,
+									"Bitte wählen Sie ein eigenes Image aus.",
+									"Image Auswahl", JOptionPane.INFORMATION_MESSAGE);
+						}//end check if correct tab is selected
 					}
 				});
-				continueButton.setActionCommand("Cancel");
-				buttonPane.add(continueButton);
+				cancelButton.setActionCommand("Cancel");
+				buttonPane.add(cancelButton);
 			}
 		}
 
@@ -427,8 +487,8 @@ public class SearchImage_GUI extends JFrame {
 		List<server.Image> images;
 		try {
 			// Hole eine Liste der Images
-
 			images = client.getImageList();
+
 			Iterator<server.Image> i = images.iterator();
 
 			int x = 0;
@@ -440,7 +500,8 @@ public class SearchImage_GUI extends JFrame {
 						images.get(x).getOsName(),
 						images.get(x).getLectureName(),
 						images.get(x).getUserData(),
-						images.get(x).getUpdateTime() };
+						images.get(x).getUpdateTime(), "", images.get(x).id,
+						images.get(x).getVersion() };
 				// Füge diese Objekte der Tabelle hinzu
 				model.addRow(obj);
 				x++;
diff --git a/Dozentenmodul/src/GUI/SearchImage_GUI.java b/Dozentenmodul/src/gui/image/SearchImage_GUI.java
index 53257f48..493230d3 100644
--- a/Dozentenmodul/src/GUI/SearchImage_GUI.java
+++ b/Dozentenmodul/src/gui/image/SearchImage_GUI.java
@@ -1,5 +1,7 @@
-package gui;
+package gui.image;
 
+import gui.intro.MainMenue_GUI;
+import gui.lecture.ExtendedSearchForImages_GUI;
 import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.FlowLayout;
@@ -16,7 +18,6 @@ import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
 import java.util.Iterator;
 import java.util.List;
-
 import javax.swing.JButton;
 import javax.swing.JComboBox;
 import javax.swing.JDialog;
@@ -33,7 +34,6 @@ import javax.swing.JTabbedPane;
 import javax.swing.JTable;
 import javax.swing.JTextField;
 import javax.swing.JTextPane;
-import javax.swing.ListSelectionModel;
 import javax.swing.RowFilter;
 import javax.swing.UIManager;
 import javax.swing.UnsupportedLookAndFeelException;
@@ -192,7 +192,7 @@ public class SearchImage_GUI extends JFrame {
 			@Override
 			public void mouseClicked(MouseEvent arg0) {
 				// Öffnet das Fenster Extended GUI
-				ExtendedSearch_GUI es = new ExtendedSearch_GUI();
+				ExtendedSearchForImages_GUI es = new ExtendedSearchForImages_GUI();
 				es.setVisible(true);
 			}
 		});
diff --git a/Dozentenmodul/src/GUI/BillOfRights_GUI.java b/Dozentenmodul/src/gui/intro/BillOfRights_GUI.java
index a18ce291..e4f37871 100644
--- a/Dozentenmodul/src/GUI/BillOfRights_GUI.java
+++ b/Dozentenmodul/src/gui/intro/BillOfRights_GUI.java
@@ -1,4 +1,5 @@
-package gui;
+package gui.intro;
+
 
 import java.awt.Dimension;
 import java.awt.FlowLayout;
diff --git a/Dozentenmodul/src/GUI/Login_GUI.java b/Dozentenmodul/src/gui/intro/Login_GUI.java
index 172895d6..e2db747e 100644
--- a/Dozentenmodul/src/GUI/Login_GUI.java
+++ b/Dozentenmodul/src/gui/intro/Login_GUI.java
@@ -1,4 +1,5 @@
-package gui;
+package gui.intro;
+
 
 import java.awt.Dimension;
 import java.awt.EventQueue;
@@ -11,6 +12,7 @@ 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;
@@ -27,13 +29,7 @@ import javax.swing.border.EmptyBorder;
 import models.SessionData;
 import models.person;
 import org.apache.thrift.TException;
-//import org.apache.thrift.protocol.TBinaryProtocol;
-//import org.apache.thrift.protocol.TProtocol;
 import org.ini4j.Wini;
-//import thrift.AuthenticationException;
-//import thrift.ImageServer;
-//import thrift.InvalidTokenException;
-//import thrift.SessionData;
 import thrift.MasterThriftConnection;
 import thrift.ImageServer.Client;
 import thrift.UserInfo;
@@ -185,8 +181,12 @@ public class Login_GUI extends JFrame {
 		final thrift.SessionData result;
 		try {
 			String passText = new String(pass.getPassword());
-			System.out.println(username.getText() + " " + passText);
+			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);
@@ -240,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);
diff --git a/Dozentenmodul/src/gui/MainMenue_GUI.java b/Dozentenmodul/src/gui/intro/MainMenue_GUI.java
index 71c28904..a5588963 100644
--- a/Dozentenmodul/src/gui/MainMenue_GUI.java
+++ b/Dozentenmodul/src/gui/intro/MainMenue_GUI.java
@@ -1,5 +1,7 @@
-package gui;
+package gui.intro;
 
+import gui.image.*;
+import gui.lecture.*;
 import java.awt.Dimension;
 import java.awt.FlowLayout;
 import java.awt.Toolkit;
@@ -10,7 +12,6 @@ import javax.swing.JPanel;
 import javax.swing.UIManager;
 import javax.swing.UnsupportedLookAndFeelException;
 import javax.swing.border.EmptyBorder;
-import java.awt.Color;
 import javax.swing.JLabel;
 import java.awt.Font;
 import javax.swing.JTextPane;
@@ -28,8 +29,6 @@ import javax.swing.ToolTipManager;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
 import javax.swing.border.TitledBorder;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
 import java.awt.ScrollPane;
 import javax.swing.JTextArea;
 import javax.swing.ImageIcon;
@@ -225,44 +224,6 @@ public class MainMenue_GUI extends JFrame {
 		rdbtnVeranstaltungSearch.setBounds(6, 102, 175, 23);
 		panelVeranstaltung.add(rdbtnVeranstaltungSearch);
 
-		JLabel lblCrumbStart = new JLabel("Startseite");
-		lblCrumbStart.addMouseListener(new MouseAdapter() {
-			@Override
-			public void mouseClicked(MouseEvent arg0) {
-				Login_GUI lw = new Login_GUI();
-				lw.setVisible(true);
-				MainMenue_GUI.this.setVisible(false);
-			}
-		});
-		lblCrumbStart.setForeground(Color.BLUE);
-		lblCrumbStart.setBounds(10, 0, 52, 14);
-		contentPanel.add(lblCrumbStart);
-
-		JLabel label = new JLabel(">");
-		label.setBounds(60, 0, 13, 14);
-		contentPanel.add(label);
-
-		JLabel lblRechtshinweis = new JLabel("Rechtshinweis");
-		lblRechtshinweis.addMouseListener(new MouseAdapter() {
-			@Override
-			public void mouseClicked(MouseEvent e) {
-				BillOfRights_GUI rb = new BillOfRights_GUI();
-				rb.setVisible(true);
-				MainMenue_GUI.this.setVisible(false);
-			}
-		});
-		lblRechtshinweis.setForeground(Color.BLUE);
-		lblRechtshinweis.setBounds(72, 0, 68, 14);
-		contentPanel.add(lblRechtshinweis);
-
-		JLabel label_1 = new JLabel(">");
-		label_1.setBounds(142, 0, 13, 14);
-		contentPanel.add(label_1);
-
-		JLabel lblNewLabel_1 = new JLabel("Hauptmen\u00FC");
-		lblNewLabel_1.setBounds(150, 0, 74, 14);
-		contentPanel.add(lblNewLabel_1);
-
 		JPanel panelNews = new JPanel();
 		panelNews.setLayout(null);
 		panelNews.setBorder(new TitledBorder(UIManager
@@ -360,7 +321,7 @@ public class MainMenue_GUI extends JFrame {
 		// ToolTipp lange anzeigen - 60sec
 		ToolTipManager.sharedInstance().setDismissDelay(60000);
 		ToolTipManager.sharedInstance().registerComponent(lblGrafik);
-		lblGrafik.setBounds(82, 11, 391, 110);
+		lblGrafik.setBounds(82, 3, 391, 110);
 		contentPanel.add(lblGrafik);
 
 		JTextPane txtpnUmDetaillierteInformationen = new JTextPane();
@@ -383,7 +344,7 @@ public class MainMenue_GUI extends JFrame {
 					public void actionPerformed(ActionEvent e) {
 
 						if (rdbtnImageNew.isSelected() == true) {
-							EingabeImageAllgemein_GUI sr = new EingabeImageAllgemein_GUI();
+							CreateImageAllgemein_GUI sr = new CreateImageAllgemein_GUI();
 							sr.setVisible(true);
 							dispose();
 						} else if (rdbtnImageEdit.isSelected() == true) {
@@ -392,7 +353,7 @@ public class MainMenue_GUI extends JFrame {
 							si.setVisible(true);
 							dispose();
 						} else if (rdbtnImageSearchDownload.isSelected() == true) {
-							SearchMethod_GUI sm = new SearchMethod_GUI();
+							SearchMethodLecture_GUI sm = new SearchMethodLecture_GUI();
 							sm.setVisible(true);
 							dispose();
 						} else if (rdbtnImageDelete.isSelected() == true) {
@@ -400,12 +361,13 @@ public class MainMenue_GUI extends JFrame {
 							di.setVisible(true);
 							dispose();
 						} else if (rdbtnVeranstaltungNew.isSelected() == true) {
-							EingabeVeranstaltungAllgemein_GUI av = new EingabeVeranstaltungAllgemein_GUI();
+							CreateLectureAllgemein_GUI av = new CreateLectureAllgemein_GUI();
 							av.setVisible(true);
 							dispose();
 						} else if (rdbtnVeranstaltungEdit.isSelected() == true) {
-							SearchEditLecture_GUI sl = new SearchEditLecture_GUI();
-							sl.setVisible(true);
+							//SearchEditLecture_GUI sl = new SearchEditLecture_GUI();
+							EditLectureSearch_GUI el = new EditLectureSearch_GUI();
+							el.setVisible(true);
 							dispose();
 						}
 					}
diff --git a/Dozentenmodul/src/GUI/VmWareLink_GUI.java b/Dozentenmodul/src/gui/intro/VmWareLink_GUI.java
index 43df06a6..2f578e8b 100644
--- a/Dozentenmodul/src/GUI/VmWareLink_GUI.java
+++ b/Dozentenmodul/src/gui/intro/VmWareLink_GUI.java
@@ -1,4 +1,5 @@
-package gui;
+package gui.intro;
+
 
 import java.awt.Desktop;
 import java.awt.Dimension;
diff --git a/Dozentenmodul/src/gui/EingabeVeranstaltungAllgemein_GUI.java b/Dozentenmodul/src/gui/lecture/CreateLectureAllgemein_GUI.java
index 5b2d4751..936f9b13 100644
--- a/Dozentenmodul/src/gui/EingabeVeranstaltungAllgemein_GUI.java
+++ b/Dozentenmodul/src/gui/lecture/CreateLectureAllgemein_GUI.java
@@ -1,4 +1,6 @@
-package gui;
+package gui.lecture;
+
+import gui.intro.MainMenue_GUI;
 
 import java.awt.Color;
 import java.awt.Dimension;
@@ -40,7 +42,7 @@ import com.toedter.calendar.JDateChooser;
 import javax.swing.JRadioButton;
 
 @SuppressWarnings("serial")
-public class EingabeVeranstaltungAllgemein_GUI extends JFrame {
+public class CreateLectureAllgemein_GUI extends JFrame {
 
 	private final JPanel contentPanel = new JPanel();
 	String[] result;
@@ -66,7 +68,7 @@ public class EingabeVeranstaltungAllgemein_GUI extends JFrame {
 	 */
 	public static void main(String[] args) {
 		try {
-			EingabeVeranstaltungAllgemein_GUI dialog = new EingabeVeranstaltungAllgemein_GUI();
+			CreateLectureAllgemein_GUI dialog = new CreateLectureAllgemein_GUI();
 			dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
 			dialog.setVisible(true);
 		} catch (Exception e) {
@@ -77,7 +79,7 @@ public class EingabeVeranstaltungAllgemein_GUI extends JFrame {
 	/**
 	 * Create the dialog.
 	 */
-	public EingabeVeranstaltungAllgemein_GUI() {
+	public CreateLectureAllgemein_GUI() {
 		addWindowListener(new WindowAdapter() {
 			@Override
 			public void windowClosing(WindowEvent arg0) {
@@ -208,7 +210,7 @@ public class EingabeVeranstaltungAllgemein_GUI extends JFrame {
 			@Override
 			public void mouseClicked(MouseEvent arg0) {
 
-				EingabeVeranstaltungAllgemein_GUI.this.setVisible(false);
+				CreateLectureAllgemein_GUI.this.setVisible(false);
 				MainMenue_GUI main = new MainMenue_GUI();
 				main.setVisible(true);
 			}
@@ -396,7 +398,7 @@ public class EingabeVeranstaltungAllgemein_GUI extends JFrame {
 											null,
 											"Das End-Datum liegt vor dem Start-Datum. Bitte ändern.",
 											"Datum fehlerhaft",
-											JOptionPane.ERROR_MESSAGE);
+											JOptionPane.INFORMATION_MESSAGE);
 						} else {
 							// bereit
 							isDateOrderCorrect = true;
@@ -409,7 +411,7 @@ public class EingabeVeranstaltungAllgemein_GUI extends JFrame {
 							JOptionPane.showMessageDialog(null,
 									"Das End-Datum liegt zu weit in der Zukunft. Erlaubt ist maximal:\n"
 											+ endDate, "Datum fehlerhaft",
-									JOptionPane.ERROR_MESSAGE);
+									JOptionPane.INFORMATION_MESSAGE);
 						} else {
 							// bereit
 							isDateMaxLifeTimeCorrect = true;
@@ -424,7 +426,7 @@ public class EingabeVeranstaltungAllgemein_GUI extends JFrame {
 											null,
 											"Bitte geben Sie einen Veranstaltungsnamen und eine Beschreibung ein.",
 											"Datum fehlerhaft",
-											JOptionPane.ERROR_MESSAGE);
+											JOptionPane.INFORMATION_MESSAGE);
 						} else {
 							// Textfelder bereit
 							isAllInformationReady = true;
@@ -451,7 +453,7 @@ public class EingabeVeranstaltungAllgemein_GUI extends JFrame {
 							Image.image.setImagename(txtFldVeranstaltungsname
 									.getText());
 
-							LinkImage_GUI ev = new LinkImage_GUI();
+							CreateLectureLink_GUI ev = new CreateLectureLink_GUI();
 							ev.setVisible(true);
 							dispose();
 						}
diff --git a/Dozentenmodul/src/gui/LinkImage_GUI.java b/Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java
index b4052778..a9125829 100644
--- a/Dozentenmodul/src/gui/LinkImage_GUI.java
+++ b/Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java
@@ -1,4 +1,6 @@
-package gui;
+package gui.lecture;
+
+import gui.intro.MainMenue_GUI;
 
 import java.awt.Color;
 import java.awt.Dimension;
@@ -19,7 +21,6 @@ import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
-
 import javax.swing.JButton;
 import javax.swing.JComboBox;
 import javax.swing.JDialog;
@@ -42,24 +43,25 @@ import javax.swing.UnsupportedLookAndFeelException;
 import javax.swing.border.EmptyBorder;
 import javax.swing.border.TitledBorder;
 import javax.swing.table.DefaultTableModel;
-
 import models.Lecture;
 import models.person;
-
 import org.apache.thrift.TException;
-
 import server.Server.Client;
 import thrift.ThriftConnection;
 
 @SuppressWarnings("serial")
-public class LinkImage_GUI extends JFrame {
+public class CreateLectureLink_GUI extends JFrame {
 
 	private final JPanel contentPanel = new JPanel();
 	String[] result;
 	JRadioButton rdbtnInternetJa;
 	JRadioButton rdbtnInternetNein;
 	JComboBox<String> comboBox;
-	JTable tableAllImages;
+	JTable tableAllImages = new JTable();
+	JTable tablemyImages = new JTable();
+	JTable tableCoopImages = new JTable();
+	JTable tablePublicImages = new JTable();
+	JTable tablePublicVorlagen = new JTable();
 	private JTextField textFieldName;
 	String[] titles = { "Image-Name", "Lizenzpflichtig", "OS", "Veranstaltung",
 			"Verantwortlicher", "Letztes Update", "Schlagwort" };
@@ -71,7 +73,7 @@ public class LinkImage_GUI extends JFrame {
 	 */
 	public static void main(String[] args) {
 		try {
-			LinkImage_GUI dialog = new LinkImage_GUI();
+			CreateLectureLink_GUI dialog = new CreateLectureLink_GUI();
 			dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
 			dialog.setVisible(true);
 		} catch (Exception e) {
@@ -82,7 +84,7 @@ public class LinkImage_GUI extends JFrame {
 	/**
 	 * Create the dialog.
 	 */
-	public LinkImage_GUI() {
+	public CreateLectureLink_GUI() {
 		addWindowListener(new WindowAdapter() {
 			@Override
 			public void windowClosing(WindowEvent arg0) {
@@ -120,7 +122,7 @@ public class LinkImage_GUI extends JFrame {
 			getContentPane().add(panel);
 			panel.setLayout(null);
 			{
-				JLabel lblNewLabel = new JLabel("Suche nach VL-Image");
+				JLabel lblNewLabel = new JLabel("Image zur Verlinkung ausw\u00E4hlen");
 				lblNewLabel.setBounds(10, 11, 509, 22);
 				panel.add(lblNewLabel);
 				lblNewLabel.setFont(new Font("Tahoma", Font.BOLD, 18));
@@ -130,7 +132,7 @@ public class LinkImage_GUI extends JFrame {
 			txtpnBitteWhlenSie.setEditable(false);
 			txtpnBitteWhlenSie.setBackground(SystemColor.menu);
 			txtpnBitteWhlenSie
-					.setText("Hier k\u00F6nnen Sie nach Ihrem gew\u00FCnschten VL-Image suchen und dieses f\u00FCr weitere Schritte ausw\u00E4hlen");
+					.setText("W\u00E4hlen Sie bitte ein Image aus, auf dem Ihre Versanstaltung basiert.");
 			txtpnBitteWhlenSie.setBounds(10, 36, 509, 32);
 			panel.add(txtpnBitteWhlenSie);
 		}
@@ -188,7 +190,7 @@ public class LinkImage_GUI extends JFrame {
 		lblErweiterteSuche.addMouseListener(new MouseAdapter() {
 			@Override
 			public void mouseClicked(MouseEvent arg0) {
-				ExtendedSearch_GUI es = new ExtendedSearch_GUI();
+				ExtendedSearchForImages_GUI es = new ExtendedSearchForImages_GUI();
 				es.setVisible(true);
 			}
 		});
@@ -234,7 +236,7 @@ public class LinkImage_GUI extends JFrame {
 			@Override
 			public void mouseClicked(MouseEvent arg0) {
 
-				LinkImage_GUI.this.setVisible(false);
+				CreateLectureLink_GUI.this.setVisible(false);
 				MainMenue_GUI main = new MainMenue_GUI();
 				main.setVisible(true);
 			}
@@ -247,17 +249,17 @@ public class LinkImage_GUI extends JFrame {
 		label_1.setBounds(69, 11, 13, 14);
 		contentPanel.add(label_1);
 
-		JLabel lblVlimage = new JLabel("VL-Image");
+		JLabel lblVlimage = new JLabel("Veranstaltung");
 		lblVlimage.setForeground(Color.BLUE);
-		lblVlimage.setBounds(81, 11, 45, 14);
+		lblVlimage.setBounds(81, 11, 76, 14);
 		contentPanel.add(lblVlimage);
 
 		JLabel label_2 = new JLabel(">");
-		label_2.setBounds(133, 11, 13, 14);
+		label_2.setBounds(151, 11, 13, 14);
 		contentPanel.add(label_2);
 
 		JLabel lblNewLabel_1 = new JLabel("Imageauswahl");
-		lblNewLabel_1.setBounds(146, 11, 85, 14);
+		lblNewLabel_1.setBounds(164, 11, 85, 14);
 		contentPanel.add(lblNewLabel_1);
 
 		JTabbedPane tabbedPane = new JTabbedPane(JTabbedPane.TOP);
@@ -266,7 +268,7 @@ public class LinkImage_GUI extends JFrame {
 		contentPanel.add(tabbedPane);
 
 		JScrollPane scrollPaneMyImage = new JScrollPane();
-		JTable tablemyImages = new JTable();
+
 		tablemyImages.setModel(model);
 		tablemyImages.getColumnModel().getColumn(1).sizeWidthToFit();
 		tablemyImages.getColumnModel().getColumn(2).sizeWidthToFit();
@@ -290,7 +292,7 @@ public class LinkImage_GUI extends JFrame {
 		tabbedPane.addTab("Meine Images", null, scrollPaneMyImage, null);
 
 		JScrollPane scrollPaneCoopImages = new JScrollPane();
-		JTable tableCoopImages = new JTable();
+
 		tableCoopImages.setModel(model);
 		tableCoopImages.getColumnModel().getColumn(1).sizeWidthToFit();
 		tableCoopImages.getColumnModel().getColumn(2).sizeWidthToFit();
@@ -304,7 +306,7 @@ public class LinkImage_GUI extends JFrame {
 		tabbedPane.setEnabledAt(2, false);
 
 		JScrollPane scrollPanePublicImages = new JScrollPane();
-		JTable tablePublicImages = new JTable();
+
 		tablePublicImages.setModel(model);
 		tablePublicImages.getColumnModel().getColumn(1).sizeWidthToFit();
 		tablePublicImages.getColumnModel().getColumn(2).sizeWidthToFit();
@@ -318,7 +320,7 @@ public class LinkImage_GUI extends JFrame {
 		tabbedPane.setEnabledAt(3, false);
 
 		JScrollPane scrollPanePublicVorlagen = new JScrollPane();
-		JTable tablePublicVorlagen = new JTable();
+
 		tablePublicVorlagen.setModel(model);
 		tablePublicVorlagen.getColumnModel().getColumn(1).sizeWidthToFit();
 		tablePublicVorlagen.getColumnModel().getColumn(2).sizeWidthToFit();
@@ -343,7 +345,7 @@ public class LinkImage_GUI extends JFrame {
 				cancelButton.addActionListener(new ActionListener() {
 					public void actionPerformed(ActionEvent e) {
 						con.closeThriftConnection();
-						EingabeVeranstaltungAllgemein_GUI eVAG = new EingabeVeranstaltungAllgemein_GUI();
+						CreateLectureAllgemein_GUI eVAG = new CreateLectureAllgemein_GUI();
 						eVAG.setVisible(true);
 						dispose();
 					}
@@ -358,49 +360,71 @@ public class LinkImage_GUI extends JFrame {
 				doLinkButton.addActionListener(new ActionListener() {
 					public void actionPerformed(ActionEvent e) {
 
-						String imagename = tableAllImages.getValueAt(
-								tableAllImages.getSelectedRow(), 0).toString();
-						try {
-							DateFormat formatter = new SimpleDateFormat(
-									"yyyy-MM-dd hh:mm:ss");
-							System.out.println("Veranstaltung anlegen um: "
-									+ formatter.format(
-											Lecture.lecture.getStartdate())
-											.toString());
-							client.writeLecturedata(
-									Lecture.lecture.getName(),
-									Lecture.lecture.getShortDesc(),
-									Lecture.lecture.getDesc(),
-									formatter.format(
-											Lecture.lecture.getStartdate())
-											.toString(),
-									formatter.format(
-											Lecture.lecture.getEnddate())
-											.toString(), Lecture.lecture
-											.isActive(), imagename,
-									person.verantwortlicher.getVorname(),
-									person.verantwortlicher.getName(),
-									person.verantwortlicher.getHochschule(),
-									person.verantwortlicher.getEMail(),
-									person.verantwortlicher.getTel(),
-									person.verantwortlicher.getFakultät());
-							JOptionPane
-									.showMessageDialog(
-											null,
-											"Ihre Veranstaltung wurde erfolgreich angelegt. Sie kehren nun zum Hauptmenü zurück.",
-											"Veranstaltung angelegt",
-											JOptionPane.PLAIN_MESSAGE);
-						} catch (TException e1) {
-							// TODO Auto-generated catch block
-							e1.printStackTrace();
-							JOptionPane
-									.showMessageDialog(
-											null,
-											"Beim Anlegen Ihrer Veranstaltung ist ein Fehler aufgetreten.",
-											"Error", JOptionPane.ERROR_MESSAGE);
+						// check if a row is selected
+						if ((tableAllImages.getSelectedRow() != -1)
+								|| (tablemyImages.getSelectedRow() != -1)
+								|| (tableCoopImages.getSelectedRow() != -1)
+								|| (tablePublicImages.getSelectedRow() != -1)
+								|| (tablePublicVorlagen.getSelectedRow() != -1)) {
+
+							// a row is selected, do operations
+							String imagename = tableAllImages.getValueAt(
+									tableAllImages.getSelectedRow(), 0)
+									.toString();
+							try {
+								DateFormat formatter = new SimpleDateFormat(
+										"yyyy-MM-dd hh:mm:ss");
+								System.out.println("Veranstaltung angelegt um: "
+										+ formatter.format(
+												Lecture.lecture.getStartdate())
+												.toString());
+								client.writeLecturedata(
+										Lecture.lecture.getName(),
+										Lecture.lecture.getShortDesc(),
+										Lecture.lecture.getDesc(),
+										formatter.format(
+												Lecture.lecture.getStartdate())
+												.toString(),
+										formatter.format(
+												Lecture.lecture.getEnddate())
+												.toString(),
+										Lecture.lecture.isActive(),
+										imagename,
+										person.verantwortlicher.getVorname(),
+										person.verantwortlicher.getName(),
+										person.verantwortlicher.getHochschule(),
+										person.verantwortlicher.getEMail(),
+										person.verantwortlicher.getTel(),
+										person.verantwortlicher.getFakultät());
+								JOptionPane
+										.showMessageDialog(
+												null,
+												"Ihre Veranstaltung wurde erfolgreich angelegt. Sie kehren nun zum Hauptmenü zurück.",
+												"Veranstaltung angelegt",
+												JOptionPane.INFORMATION_MESSAGE);
+								// zurück zum Menü
+								MainMenue_GUI m = new MainMenue_GUI();
+								m.setVisible(true);
+							} catch (TException e1) {
+								// TODO Auto-generated catch block
+								e1.printStackTrace();
+								JOptionPane
+										.showMessageDialog(
+												null,
+												"Beim Anlegen Ihrer Veranstaltung ist ein Fehler aufgetreten.",
+												"Error",
+												JOptionPane.ERROR_MESSAGE);
+							}
+							con.closeThriftConnection();
+							dispose();
+
+						} else {
+							// nothing selected
+							JOptionPane.showMessageDialog(null,
+									"Bitte wählen Sie ein Image aus.",
+									"Image Auswahl",
+									JOptionPane.INFORMATION_MESSAGE);
 						}
-						con.closeThriftConnection();
-						dispose();
 
 					}
 				});
diff --git a/Dozentenmodul/src/gui/EditVeranstaltungAllgemein_GUI.java b/Dozentenmodul/src/gui/lecture/EditLectureAllgemein_GUI.java
index c6be7580..40b3ce84 100644
--- a/Dozentenmodul/src/gui/EditVeranstaltungAllgemein_GUI.java
+++ b/Dozentenmodul/src/gui/lecture/EditLectureAllgemein_GUI.java
@@ -1,6 +1,8 @@
-package gui;
+package gui.lecture;
 
 
+import gui.intro.MainMenue_GUI;
+
 import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.FlowLayout;
@@ -41,7 +43,7 @@ import javax.swing.ButtonGroup;
 
 
 @SuppressWarnings("serial")
-public class EditVeranstaltungAllgemein_GUI extends JFrame {
+public class EditLectureAllgemein_GUI extends JFrame {
 
 	private final JPanel contentPanel = new JPanel();
 	String[] result;
@@ -61,7 +63,7 @@ public class EditVeranstaltungAllgemein_GUI extends JFrame {
 	 */
 	public static void main(String[] args) {
 		try {
-			EditVeranstaltungAllgemein_GUI dialog = new EditVeranstaltungAllgemein_GUI();
+			EditLectureAllgemein_GUI dialog = new EditLectureAllgemein_GUI();
 			dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
 			dialog.setVisible(true);
 		} catch (Exception e) {
@@ -72,7 +74,7 @@ public class EditVeranstaltungAllgemein_GUI extends JFrame {
 	/**
 	 * Create the dialog.
 	 */
-	public EditVeranstaltungAllgemein_GUI() {
+	public EditLectureAllgemein_GUI() {
 		addWindowListener(new WindowAdapter() {
 			@Override
 			public void windowClosing(WindowEvent arg0) {
@@ -196,7 +198,7 @@ public class EditVeranstaltungAllgemein_GUI extends JFrame {
 			@Override
 			public void mouseClicked(MouseEvent arg0) {
 				
-				EditVeranstaltungAllgemein_GUI.this.setVisible(false);
+				EditLectureAllgemein_GUI.this.setVisible(false);
 				MainMenue_GUI main=new MainMenue_GUI();
 				main.setVisible(true);
 			}
@@ -365,7 +367,7 @@ public class EditVeranstaltungAllgemein_GUI extends JFrame {
 						Image.image.setImagename(textFieldLaborname.getText());
 						
 
-					LinkImage_GUI ev=new LinkImage_GUI();
+					CreateLectureLink_GUI ev=new CreateLectureLink_GUI();
 					ev.setVisible(true);
 					dispose();
 					}
diff --git a/Dozentenmodul/src/GUI/LinkImage_GUI.java b/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java
index b4052778..c245ce79 100644
--- a/Dozentenmodul/src/GUI/LinkImage_GUI.java
+++ b/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java
@@ -1,5 +1,6 @@
-package gui;
+package gui.lecture;
 
+import gui.intro.MainMenue_GUI;
 import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.FlowLayout;
@@ -19,7 +20,6 @@ import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
-
 import javax.swing.JButton;
 import javax.swing.JComboBox;
 import javax.swing.JDialog;
@@ -42,36 +42,37 @@ import javax.swing.UnsupportedLookAndFeelException;
 import javax.swing.border.EmptyBorder;
 import javax.swing.border.TitledBorder;
 import javax.swing.table.DefaultTableModel;
-
 import models.Lecture;
 import models.person;
-
 import org.apache.thrift.TException;
-
 import server.Server.Client;
 import thrift.ThriftConnection;
 
 @SuppressWarnings("serial")
-public class LinkImage_GUI extends JFrame {
+public class EditLectureLink_GUI extends JFrame {
 
 	private final JPanel contentPanel = new JPanel();
 	String[] result;
 	JRadioButton rdbtnInternetJa;
 	JRadioButton rdbtnInternetNein;
 	JComboBox<String> comboBox;
-	JTable tableAllImages;
+	JTable tableAllImages = new JTable();
+	JTable tablemyImages = new JTable();
+	JTable tableCoopImages = new JTable();
+	JTable tablePublicImages = new JTable();
+	JTable tablePublicVorlagen = new JTable();
 	private JTextField textFieldName;
 	String[] titles = { "Image-Name", "Lizenzpflichtig", "OS", "Veranstaltung",
 			"Verantwortlicher", "Letztes Update", "Schlagwort" };
-	ThriftConnection con = new ThriftConnection();
-	Client client = con.getThriftConnection();
+	ThriftConnection thrift = new ThriftConnection();
+	Client client = thrift.getThriftConnection();
 
 	/**
 	 * Launch the application.
 	 */
 	public static void main(String[] args) {
 		try {
-			LinkImage_GUI dialog = new LinkImage_GUI();
+			EditLectureLink_GUI dialog = new EditLectureLink_GUI();
 			dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
 			dialog.setVisible(true);
 		} catch (Exception e) {
@@ -82,17 +83,12 @@ public class LinkImage_GUI extends JFrame {
 	/**
 	 * Create the dialog.
 	 */
-	public LinkImage_GUI() {
+	public EditLectureLink_GUI() {
 		addWindowListener(new WindowAdapter() {
 			@Override
 			public void windowClosing(WindowEvent arg0) {
 				System.exit(0);
 			}
-
-			@Override
-			public void windowOpened(WindowEvent arg0) {
-				textFieldName.requestFocusInWindow();
-			}
 		});
 		setResizable(false);
 
@@ -120,7 +116,8 @@ public class LinkImage_GUI extends JFrame {
 			getContentPane().add(panel);
 			panel.setLayout(null);
 			{
-				JLabel lblNewLabel = new JLabel("Suche nach VL-Image");
+				JLabel lblNewLabel = new JLabel(
+						"Image zur Verlinkung ausw\u00E4hlen");
 				lblNewLabel.setBounds(10, 11, 509, 22);
 				panel.add(lblNewLabel);
 				lblNewLabel.setFont(new Font("Tahoma", Font.BOLD, 18));
@@ -130,7 +127,7 @@ public class LinkImage_GUI extends JFrame {
 			txtpnBitteWhlenSie.setEditable(false);
 			txtpnBitteWhlenSie.setBackground(SystemColor.menu);
 			txtpnBitteWhlenSie
-					.setText("Hier k\u00F6nnen Sie nach Ihrem gew\u00FCnschten VL-Image suchen und dieses f\u00FCr weitere Schritte ausw\u00E4hlen");
+					.setText("W\u00E4hlen Sie bitte ein Image aus, auf dem Ihre Versanstaltung basiert.");
 			txtpnBitteWhlenSie.setBounds(10, 36, 509, 32);
 			panel.add(txtpnBitteWhlenSie);
 		}
@@ -188,7 +185,7 @@ public class LinkImage_GUI extends JFrame {
 		lblErweiterteSuche.addMouseListener(new MouseAdapter() {
 			@Override
 			public void mouseClicked(MouseEvent arg0) {
-				ExtendedSearch_GUI es = new ExtendedSearch_GUI();
+				ExtendedSearchForImages_GUI es = new ExtendedSearchForImages_GUI();
 				es.setVisible(true);
 			}
 		});
@@ -234,7 +231,7 @@ public class LinkImage_GUI extends JFrame {
 			@Override
 			public void mouseClicked(MouseEvent arg0) {
 
-				LinkImage_GUI.this.setVisible(false);
+				EditLectureLink_GUI.this.setVisible(false);
 				MainMenue_GUI main = new MainMenue_GUI();
 				main.setVisible(true);
 			}
@@ -247,17 +244,17 @@ public class LinkImage_GUI extends JFrame {
 		label_1.setBounds(69, 11, 13, 14);
 		contentPanel.add(label_1);
 
-		JLabel lblVlimage = new JLabel("VL-Image");
+		JLabel lblVlimage = new JLabel("Veranstaltung");
 		lblVlimage.setForeground(Color.BLUE);
-		lblVlimage.setBounds(81, 11, 45, 14);
+		lblVlimage.setBounds(81, 11, 76, 14);
 		contentPanel.add(lblVlimage);
 
 		JLabel label_2 = new JLabel(">");
-		label_2.setBounds(133, 11, 13, 14);
+		label_2.setBounds(151, 11, 13, 14);
 		contentPanel.add(label_2);
 
-		JLabel lblNewLabel_1 = new JLabel("Imageauswahl");
-		lblNewLabel_1.setBounds(146, 11, 85, 14);
+		JLabel lblNewLabel_1 = new JLabel("Veranstaltung verlinken");
+		lblNewLabel_1.setBounds(164, 11, 113, 14);
 		contentPanel.add(lblNewLabel_1);
 
 		JTabbedPane tabbedPane = new JTabbedPane(JTabbedPane.TOP);
@@ -266,7 +263,7 @@ public class LinkImage_GUI extends JFrame {
 		contentPanel.add(tabbedPane);
 
 		JScrollPane scrollPaneMyImage = new JScrollPane();
-		JTable tablemyImages = new JTable();
+
 		tablemyImages.setModel(model);
 		tablemyImages.getColumnModel().getColumn(1).sizeWidthToFit();
 		tablemyImages.getColumnModel().getColumn(2).sizeWidthToFit();
@@ -275,7 +272,6 @@ public class LinkImage_GUI extends JFrame {
 		tablemyImages.getColumnModel().getColumn(5).sizeWidthToFit();
 
 		JScrollPane scrollPaneAllImages = new JScrollPane();
-		tableAllImages = new JTable();
 		tableAllImages.setModel(modelAll);
 		tableAllImages.getColumnModel().getColumn(1).sizeWidthToFit();
 		tableAllImages.getColumnModel().getColumn(2).sizeWidthToFit();
@@ -290,7 +286,7 @@ public class LinkImage_GUI extends JFrame {
 		tabbedPane.addTab("Meine Images", null, scrollPaneMyImage, null);
 
 		JScrollPane scrollPaneCoopImages = new JScrollPane();
-		JTable tableCoopImages = new JTable();
+
 		tableCoopImages.setModel(model);
 		tableCoopImages.getColumnModel().getColumn(1).sizeWidthToFit();
 		tableCoopImages.getColumnModel().getColumn(2).sizeWidthToFit();
@@ -304,7 +300,7 @@ public class LinkImage_GUI extends JFrame {
 		tabbedPane.setEnabledAt(2, false);
 
 		JScrollPane scrollPanePublicImages = new JScrollPane();
-		JTable tablePublicImages = new JTable();
+
 		tablePublicImages.setModel(model);
 		tablePublicImages.getColumnModel().getColumn(1).sizeWidthToFit();
 		tablePublicImages.getColumnModel().getColumn(2).sizeWidthToFit();
@@ -318,7 +314,7 @@ public class LinkImage_GUI extends JFrame {
 		tabbedPane.setEnabledAt(3, false);
 
 		JScrollPane scrollPanePublicVorlagen = new JScrollPane();
-		JTable tablePublicVorlagen = new JTable();
+
 		tablePublicVorlagen.setModel(model);
 		tablePublicVorlagen.getColumnModel().getColumn(1).sizeWidthToFit();
 		tablePublicVorlagen.getColumnModel().getColumn(2).sizeWidthToFit();
@@ -331,6 +327,11 @@ public class LinkImage_GUI extends JFrame {
 				scrollPanePublicVorlagen, null);
 		tabbedPane.setEnabledAt(4, false);
 
+		JButton btnLinkLschen = new JButton("Link l\u00F6schen");
+		btnLinkLschen.setEnabled(false);
+		btnLinkLschen.setBounds(478, 508, 89, 23);
+		contentPanel.add(btnLinkLschen);
+
 		initTableModel(modelAll);
 		{
 			JPanel buttonPane = new JPanel();
@@ -339,73 +340,79 @@ public class LinkImage_GUI extends JFrame {
 			buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT));
 			getContentPane().add(buttonPane);
 			{
-				JButton cancelButton = new JButton("Zur\u00FCck");
-				cancelButton.addActionListener(new ActionListener() {
+				JButton okButton = new JButton("Zur\u00FCck");
+				okButton.addActionListener(new ActionListener() {
 					public void actionPerformed(ActionEvent e) {
-						con.closeThriftConnection();
-						EingabeVeranstaltungAllgemein_GUI eVAG = new EingabeVeranstaltungAllgemein_GUI();
-						eVAG.setVisible(true);
+
+						EditLectureAllgemein_GUI el = new EditLectureAllgemein_GUI();
+						el.setVisible(true);
 						dispose();
 					}
 				});
-				cancelButton.setActionCommand("CANCEL");
-				buttonPane.add(cancelButton);
-				getRootPane().setDefaultButton(cancelButton);
+				okButton.setActionCommand("OK");
+				buttonPane.add(okButton);
+				getRootPane().setDefaultButton(okButton);
 			}
 			{
-				JButton doLinkButton = new JButton(
+				JButton cancelButton = new JButton(
 						"Veranstaltung erzeugen und abschlie\u00DFen");
-				doLinkButton.addActionListener(new ActionListener() {
+				cancelButton.addActionListener(new ActionListener() {
 					public void actionPerformed(ActionEvent e) {
 
-						String imagename = tableAllImages.getValueAt(
-								tableAllImages.getSelectedRow(), 0).toString();
-						try {
-							DateFormat formatter = new SimpleDateFormat(
-									"yyyy-MM-dd hh:mm:ss");
-							System.out.println("Veranstaltung anlegen um: "
-									+ formatter.format(
-											Lecture.lecture.getStartdate())
-											.toString());
-							client.writeLecturedata(
-									Lecture.lecture.getName(),
-									Lecture.lecture.getShortDesc(),
-									Lecture.lecture.getDesc(),
-									formatter.format(
-											Lecture.lecture.getStartdate())
-											.toString(),
-									formatter.format(
-											Lecture.lecture.getEnddate())
-											.toString(), Lecture.lecture
-											.isActive(), imagename,
-									person.verantwortlicher.getVorname(),
-									person.verantwortlicher.getName(),
-									person.verantwortlicher.getHochschule(),
-									person.verantwortlicher.getEMail(),
-									person.verantwortlicher.getTel(),
-									person.verantwortlicher.getFakultät());
-							JOptionPane
-									.showMessageDialog(
-											null,
-											"Ihre Veranstaltung wurde erfolgreich angelegt. Sie kehren nun zum Hauptmenü zurück.",
-											"Veranstaltung angelegt",
-											JOptionPane.PLAIN_MESSAGE);
-						} catch (TException e1) {
-							// TODO Auto-generated catch block
-							e1.printStackTrace();
-							JOptionPane
-									.showMessageDialog(
-											null,
-											"Beim Anlegen Ihrer Veranstaltung ist ein Fehler aufgetreten.",
-											"Error", JOptionPane.ERROR_MESSAGE);
+						// check if a row is selected
+						if ((tableAllImages.getSelectedRow() != -1)
+								|| (tablemyImages.getSelectedRow() != -1)
+								|| (tableCoopImages.getSelectedRow() != -1)
+								|| (tablePublicImages.getSelectedRow() != -1)
+								|| (tablePublicVorlagen.getSelectedRow() != -1)) {
+
+							// a row is selected, do operations
+							String imagename = tableAllImages.getValueAt(
+									tableAllImages.getSelectedRow(), 0)
+									.toString();
+							try {
+								DateFormat formatter = new SimpleDateFormat(
+										"yyyy-MM-dd hh:mm:ss");
+								System.out.println(formatter.format(
+										Lecture.lecture.getStartdate())
+										.toString());
+								client.writeLecturedata(
+										Lecture.lecture.getName(),
+										Lecture.lecture.getShortDesc(),
+										Lecture.lecture.getDesc(),
+										formatter.format(
+												Lecture.lecture.getStartdate())
+												.toString(),
+										formatter.format(
+												Lecture.lecture.getEnddate())
+												.toString(),
+										Lecture.lecture.isActive(),
+										imagename,
+										person.verantwortlicher.getVorname(),
+										person.verantwortlicher.getName(),
+										person.verantwortlicher.getHochschule(),
+										person.verantwortlicher.getEMail(),
+										person.verantwortlicher.getTel(),
+										person.verantwortlicher.getFakultät());
+							} catch (TException e1) {
+								// TODO Auto-generated catch block
+								e1.printStackTrace();
+							}
+
+						} else {
+							// nothing selected
+							JOptionPane.showMessageDialog(null,
+									"Bitte wählen Sie ein Image aus.",
+									"Image Auswahl",
+									JOptionPane.INFORMATION_MESSAGE);
+
 						}
-						con.closeThriftConnection();
 						dispose();
 
 					}
 				});
-				doLinkButton.setActionCommand("OK");
-				buttonPane.add(doLinkButton);
+				cancelButton.setActionCommand("Cancel");
+				buttonPane.add(cancelButton);
 			}
 		}
 
@@ -467,5 +474,4 @@ public class LinkImage_GUI extends JFrame {
 		}
 		return model;
 	}
-
 }
diff --git a/Dozentenmodul/src/gui/SearchEditLecture_GUI.java b/Dozentenmodul/src/gui/lecture/EditLectureSearch_GUI.java
index 9553bc6e..ae50fa22 100644
--- a/Dozentenmodul/src/gui/SearchEditLecture_GUI.java
+++ b/Dozentenmodul/src/gui/lecture/EditLectureSearch_GUI.java
@@ -1,6 +1,7 @@
-package gui;
-
+package gui.lecture;
 
+import gui.image.EditImageAllgemein_GUI;
+import gui.intro.MainMenue_GUI;
 import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.FlowLayout;
@@ -46,19 +47,14 @@ import javax.swing.event.ChangeListener;
 import javax.swing.table.DefaultTableModel;
 import javax.swing.table.TableModel;
 import javax.swing.table.TableRowSorter;
-
 import models.Lecture;
 import models.person;
-//import models.person;
-
 import org.apache.thrift.TException;
-
 import server.Server.Client;
 import thrift.ThriftConnection;
 
-
 @SuppressWarnings("serial")
-public class SearchEditLecture_GUI extends JFrame {
+public class EditLectureSearch_GUI extends JFrame {
 
 	private final JPanel contentPanel = new JPanel();
 	String[] result;
@@ -66,22 +62,29 @@ public class SearchEditLecture_GUI extends JFrame {
 	JRadioButton rdbtnInternetNein;
 	JTable tableAllLectures;
 	JTable tablemyLectures;
+	JTable tableCoopImages;
+	JTable tablePublicVorlagen;
+	JTable tablePublicImages;
 	private JTextField textFieldName;
 	JTabbedPane tabbedPane;
-	String[] titles= {"Veranstaltungsname", "Beschreibung", "Gültigkeitsdatum", "Aktiv","Letzte Benutzung" ,"Verantwortlicher", "Image", "Schlagwort","ID"};
-    ThriftConnection con=new ThriftConnection();
-    Client client=con.getThriftConnection();
-    final DefaultTableModel modelAll = new DefaultTableModel( titles, 0 );
-    final DefaultTableModel modelMyLectures = new DefaultTableModel( titles, 0 );
-    final TableRowSorter<TableModel> rowSorterAll = new TableRowSorter<TableModel>( modelAll );
-    final TableRowSorter<TableModel> rowSorterMyLectures = new TableRowSorter<TableModel>( modelMyLectures );
-    
+	String[] titles = { "Veranstaltungsname", "Beschreibung",
+			"Gültigkeitsdatum", "Aktiv", "Letzte Benutzung",
+			"Verantwortlicher", "Image", "Schlagwort", "ID" };
+	ThriftConnection con = new ThriftConnection();
+	Client client = con.getThriftConnection();
+	final DefaultTableModel modelAll = new DefaultTableModel(titles, 0);
+	final DefaultTableModel modelMyLectures = new DefaultTableModel(titles, 0);
+	final TableRowSorter<TableModel> rowSorterAll = new TableRowSorter<TableModel>(
+			modelAll);
+	final TableRowSorter<TableModel> rowSorterMyLectures = new TableRowSorter<TableModel>(
+			modelMyLectures);
+
 	/**
 	 * Launch the application.
 	 */
 	public static void main(String[] args) {
 		try {
-			SearchEditLecture_GUI dialog = new SearchEditLecture_GUI();
+			EditLectureSearch_GUI dialog = new EditLectureSearch_GUI();
 			dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
 			dialog.setVisible(true);
 		} catch (Exception e) {
@@ -92,39 +95,36 @@ public class SearchEditLecture_GUI extends JFrame {
 	/**
 	 * Create the dialog.
 	 */
-	public SearchEditLecture_GUI() {
+	public EditLectureSearch_GUI() {
 		addWindowListener(new WindowAdapter() {
 			@Override
 			public void windowClosing(WindowEvent arg0) {
-				//Beendet die Anwendung nach klick auf X
+				// Beendet die Anwendung nach klick auf X
 				con.closeThriftConnection();
 				System.exit(0);
 			}
 		});
-		//Verhindert das Vergrößern Des Fensters
+		// Verhindert das Vergrößern Des Fensters
 		setResizable(false);
-		
+
 		try {
-			//Setzt das Look & Feel auf System
+			// Setzt das Look & Feel auf System
 			UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
 		} catch (ClassNotFoundException | InstantiationException
 				| IllegalAccessException | UnsupportedLookAndFeelException e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
 		}
-		//Setzt den Fenstertitel
+		// Setzt den Fenstertitel
 		setTitle("bwLehrpool Suite *Prototyp*");
-		//Zentriert das Fenster in die Bildmitte
+		// Zentriert das Fenster in die Bildmitte
 		Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
-		int top=(screenSize.height - 722) / 2;
-		int left=(screenSize.width - 603) / 2;
+		int top = (screenSize.height - 722) / 2;
+		int left = (screenSize.width - 603) / 2;
 		setBounds(left, top, 603, 722);
-		
 
-		
-		final DefaultTableModel model = new DefaultTableModel( titles, 0 );
-		
-		
+		final DefaultTableModel model = new DefaultTableModel(titles, 0);
+
 		getContentPane().setLayout(null);
 		{
 			JPanel panel = new JPanel();
@@ -138,11 +138,12 @@ public class SearchEditLecture_GUI extends JFrame {
 				panel.add(lblNewLabel);
 				lblNewLabel.setFont(new Font("Tahoma", Font.BOLD, 18));
 			}
-			
+
 			JTextPane txtpnBitteWhlenSie = new JTextPane();
 			txtpnBitteWhlenSie.setEditable(false);
 			txtpnBitteWhlenSie.setBackground(SystemColor.menu);
-			txtpnBitteWhlenSie.setText("Hier k\u00F6nnen Sie nach Ihrem gew\u00FCnschten VL-Image suchen und dieses f\u00FCr weitere Schritte ausw\u00E4hlen");
+			txtpnBitteWhlenSie
+					.setText("Hier k\u00F6nnen Sie nach Ihrem gew\u00FCnschten VL-Image suchen und dieses f\u00FCr weitere Schritte ausw\u00E4hlen");
 			txtpnBitteWhlenSie.setBounds(10, 36, 509, 32);
 			panel.add(txtpnBitteWhlenSie);
 		}
@@ -151,113 +152,114 @@ public class SearchEditLecture_GUI extends JFrame {
 		contentPanel.setBorder(new EmptyBorder(5, 5, 5, 5));
 		getContentPane().add(contentPanel);
 		contentPanel.setLayout(null);
-		
+
 		JPanel panel_1 = new JPanel();
 		panel_1.setBackground(SystemColor.menu);
-		panel_1.setBorder(new TitledBorder(null, "Filterfunktionen", TitledBorder.LEADING, TitledBorder.TOP, null, null));
+		panel_1.setBorder(new TitledBorder(null, "Filterfunktionen",
+				TitledBorder.LEADING, TitledBorder.TOP, null, null));
 		panel_1.setBounds(10, 49, 557, 131);
 		contentPanel.add(panel_1);
 		panel_1.setLayout(null);
-		
+
 		JLabel lblNewLabel_2 = new JLabel("Anzeigename:");
 		lblNewLabel_2.setBounds(10, 30, 250, 20);
 		panel_1.add(lblNewLabel_2);
-		
+
 		textFieldName = new JTextField();
-		//Key Listener der Tastatureingabe registriert
+		// Key Listener der Tastatureingabe registriert
 		textFieldName.addKeyListener(new KeyAdapter() {
 			@Override
 			public void keyReleased(KeyEvent e) {
-				//Textfield eingabe auslesen
-				String stext=textFieldName.getText();
-
-				//Wenn Textfield nicht leer
-				if(stext!="")
-				{
-					//Filtere nach der Eingabe
-					rowSorterAll.setRowFilter(RowFilter.regexFilter(textFieldName.getText(), 0));
-					rowSorterMyLectures.setRowFilter(RowFilter.regexFilter(textFieldName.getText(), 0));
-					
-				}
-		}});
+				// Textfield eingabe auslesen
+				String stext = textFieldName.getText();
 
+				// Wenn Textfield nicht leer
+				if (stext != "") {
+					// Filtere nach der Eingabe
+					rowSorterAll.setRowFilter(RowFilter.regexFilter(
+							textFieldName.getText(), 0));
+					rowSorterMyLectures.setRowFilter(RowFilter.regexFilter(
+							textFieldName.getText(), 0));
+
+				}
+			}
+		});
 
 		textFieldName.setBounds(270, 30, 250, 20);
 		panel_1.add(textFieldName);
 		textFieldName.setColumns(10);
-		
-		JLabel lblErweiterteSuche = new JLabel("<html><u>Erweiterte Suche</u></html>");
+
+		JLabel lblErweiterteSuche = new JLabel(
+				"<html><u>Erweiterte Suche</u></html>");
 		lblErweiterteSuche.addMouseListener(new MouseAdapter() {
 			@Override
 			public void mouseClicked(MouseEvent arg0) {
-				//Öffnet das Fenster Extended GUI
+				// Öffnet das Fenster Extended GUI
 				con.closeThriftConnection();
-				ExtendedSearch_GUI es=new ExtendedSearch_GUI();
+				ExtendedSearchForImages_GUI es = new ExtendedSearchForImages_GUI();
 				es.setVisible(true);
 			}
 		});
 		lblErweiterteSuche.setForeground(Color.BLUE);
-		
+
 		lblErweiterteSuche.setBounds(431, 106, 89, 14);
 		panel_1.add(lblErweiterteSuche);
-		
+
 		JLabel lblHauptmen = new JLabel("Hauptmen\u00FC");
 		lblHauptmen.addMouseListener(new MouseAdapter() {
 			@Override
 			public void mouseClicked(MouseEvent arg0) {
-				//Öffnet das Hauptmenü
+				// Öffnet das Hauptmenü
 				con.closeThriftConnection();
-				SearchEditLecture_GUI.this.setVisible(false);
-				MainMenue_GUI main=new MainMenue_GUI();
+				EditLectureSearch_GUI.this.setVisible(false);
+				MainMenue_GUI main = new MainMenue_GUI();
 				main.setVisible(true);
 			}
 		});
 		lblHauptmen.setForeground(Color.BLUE);
 		lblHauptmen.setBounds(10, 11, 61, 14);
 		contentPanel.add(lblHauptmen);
-		
+
 		JLabel label_1 = new JLabel(">");
 		label_1.setBounds(69, 11, 13, 14);
 		contentPanel.add(label_1);
-		
+
 		JLabel lblVlimage = new JLabel("Veranstaltung");
 		lblVlimage.setForeground(Color.BLUE);
 		lblVlimage.setBounds(81, 11, 75, 14);
 		contentPanel.add(lblVlimage);
-		
+
 		JLabel label_2 = new JLabel(">");
 		label_2.setBounds(152, 11, 13, 14);
 		contentPanel.add(label_2);
-		
+
 		JLabel lblNewLabel_1 = new JLabel("Veranstaltungsauswahl");
 		lblNewLabel_1.setBounds(166, 11, 128, 14);
 		contentPanel.add(lblNewLabel_1);
-		
+
 		tabbedPane = new JTabbedPane(JTabbedPane.TOP);
 		tabbedPane.addChangeListener(new ChangeListener() {
 			public void stateChanged(ChangeEvent arg0) {
 				System.out.println(tabbedPane.getSelectedIndex());
-				if(tabbedPane.getSelectedIndex()==0){
-					
-					String username= person.verantwortlicher.getName()+" "+person.verantwortlicher.getVorname();
-					rowSorterMyLectures.setRowFilter(RowFilter.regexFilter(username, 5));
-				}
-				else if(tabbedPane.getSelectedIndex()==1){
+				if (tabbedPane.getSelectedIndex() == 0) {
+
+					String username = person.verantwortlicher.getName() + " "
+							+ person.verantwortlicher.getVorname();
+					rowSorterMyLectures.setRowFilter(RowFilter.regexFilter(
+							username, 5));
+				} else if (tabbedPane.getSelectedIndex() == 1) {
 
-					
-					
 				}
-				
+
 			}
 		});
 
 		tabbedPane.setBounds(10, 197, 557, 323);
 		contentPanel.add(tabbedPane);
-		System.out.println("haaaaaaaaaaa");
 		initTableModel(modelMyLectures);
-		
+
 		JScrollPane scrollPaneAllImages = new JScrollPane();
-		tableAllLectures=new JTable();
+		tableAllLectures = new JTable();
 		tableAllLectures.setModel(modelAll);
 		tableAllLectures.getColumnModel().getColumn(1).sizeWidthToFit();
 		tableAllLectures.getColumnModel().getColumn(2).sizeWidthToFit();
@@ -265,27 +267,28 @@ public class SearchEditLecture_GUI extends JFrame {
 		tableAllLectures.getColumnModel().getColumn(4).sizeWidthToFit();
 		tableAllLectures.getColumnModel().getColumn(5).sizeWidthToFit();
 		initTableModel(modelAll);
-		
+
 		JScrollPane scrollPaneMyImage = new JScrollPane();
-		tablemyLectures=new JTable();
+		tablemyLectures = new JTable();
 		tablemyLectures.setModel(modelMyLectures);
-		
+
 		tablemyLectures.getColumnModel().getColumn(1).sizeWidthToFit();
 		tablemyLectures.getColumnModel().getColumn(2).sizeWidthToFit();
 		tablemyLectures.getColumnModel().getColumn(3).sizeWidthToFit();
 		tablemyLectures.getColumnModel().getColumn(4).sizeWidthToFit();
 		tablemyLectures.getColumnModel().getColumn(5).sizeWidthToFit();
 		tablemyLectures.setRowSorter(rowSorterMyLectures);
-		
-				scrollPaneMyImage.setViewportView(tablemyLectures);
-				tabbedPane.addTab("Meine Veranstaltungen", null, scrollPaneMyImage, null);
+
+		scrollPaneMyImage.setViewportView(tablemyLectures);
+		tabbedPane.addTab("Meine Veranstaltungen", null, scrollPaneMyImage,
+				null);
 		tableAllLectures.setRowSorter(rowSorterAll);
-		
-				scrollPaneAllImages.setViewportView(tableAllLectures);
-				tabbedPane.addTab("Alle", null, scrollPaneAllImages, null);
-		
+
+		scrollPaneAllImages.setViewportView(tableAllLectures);
+		tabbedPane.addTab("Alle", null, scrollPaneAllImages, null);
+
 		JScrollPane scrollPaneCoopImages = new JScrollPane();
-		JTable tableCoopImages=new JTable();
+		tableCoopImages = new JTable();
 		tableCoopImages.setModel(model);
 		tableCoopImages.getColumnModel().getColumn(1).sizeWidthToFit();
 		tableCoopImages.getColumnModel().getColumn(2).sizeWidthToFit();
@@ -294,11 +297,12 @@ public class SearchEditLecture_GUI extends JFrame {
 		tableCoopImages.getColumnModel().getColumn(5).sizeWidthToFit();
 
 		scrollPaneCoopImages.setViewportView(tableCoopImages);
-		tabbedPane.addTab("Kooperative Veranstaltungen", null, scrollPaneCoopImages, null);
+		tabbedPane.addTab("Kooperative Veranstaltungen", null,
+				scrollPaneCoopImages, null);
 		tabbedPane.setEnabledAt(2, false);
-		
+
 		JScrollPane scrollPanePublicImages = new JScrollPane();
-		JTable tablePublicImages=new JTable();
+		tablePublicImages = new JTable();
 		tablePublicImages.setModel(model);
 		tablePublicImages.getColumnModel().getColumn(1).sizeWidthToFit();
 		tablePublicImages.getColumnModel().getColumn(2).sizeWidthToFit();
@@ -307,11 +311,12 @@ public class SearchEditLecture_GUI extends JFrame {
 		tablePublicImages.getColumnModel().getColumn(5).sizeWidthToFit();
 
 		scrollPanePublicImages.setViewportView(tablePublicImages);
-		tabbedPane.addTab("\u00D6ffentliche Images", null, scrollPanePublicImages, null);
+		tabbedPane.addTab("\u00D6ffentliche Images", null,
+				scrollPanePublicImages, null);
 		tabbedPane.setEnabledAt(3, false);
-		
+
 		JScrollPane scrollPanePublicVorlagen = new JScrollPane();
-		JTable tablePublicVorlagen=new JTable();
+		tablePublicVorlagen = new JTable();
 		tablePublicVorlagen.setModel(model);
 		tablePublicVorlagen.getColumnModel().getColumn(1).sizeWidthToFit();
 		tablePublicVorlagen.getColumnModel().getColumn(2).sizeWidthToFit();
@@ -320,7 +325,8 @@ public class SearchEditLecture_GUI extends JFrame {
 		tablePublicVorlagen.getColumnModel().getColumn(5).sizeWidthToFit();
 
 		scrollPanePublicVorlagen.setViewportView(tablePublicVorlagen);
-		tabbedPane.addTab("\u00D6ffentliche Vorlagen", null, scrollPanePublicVorlagen, null);
+		tabbedPane.addTab("\u00D6ffentliche Vorlagen", null,
+				scrollPanePublicVorlagen, null);
 		tabbedPane.setEnabledAt(4, false);
 		{
 			JPanel buttonPane = new JPanel();
@@ -329,112 +335,189 @@ public class SearchEditLecture_GUI extends JFrame {
 			buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT));
 			getContentPane().add(buttonPane);
 			{
-				JButton okButton = new JButton("Zur\u00FCck");
-				okButton.addActionListener(new ActionListener() {
+				JButton btnBack = new JButton("Zur\u00FCck");
+				btnBack.addActionListener(new ActionListener() {
 					public void actionPerformed(ActionEvent e) {
-						//Öffnet das Hauptmenü
+						// Öffnet das Hauptmenü
 						con.closeThriftConnection();
-						MainMenue_GUI main=new MainMenue_GUI();
+						MainMenue_GUI main = new MainMenue_GUI();
 						main.setVisible(true);
 						dispose();
 					}
 				});
-				okButton.setActionCommand("OK");
-				buttonPane.add(okButton);
-				getRootPane().setDefaultButton(okButton);
+				btnBack.setActionCommand("OK");
+				buttonPane.add(btnBack);
+				getRootPane().setDefaultButton(btnBack);
 			}
 			{
-				JButton cancelButton = new JButton("Weiter");
-				cancelButton.addActionListener(new ActionListener() {
+				JButton btnContinue = new JButton("Weiter");
+				btnContinue.addActionListener(new ActionListener() {
 					public void actionPerformed(ActionEvent e) {
-						
-						
-						//Image.image.setImageId(imageid);
-						if(tabbedPane.getSelectedIndex()==0){
-
-						
-						Lecture.lecture.setid(modelMyLectures.getValueAt(tablemyLectures.convertRowIndexToModel(tablemyLectures.getSelectedRow()), 8).toString());
-						Lecture.lecture.setName(modelMyLectures.getValueAt(tablemyLectures.convertRowIndexToModel(tablemyLectures.getSelectedRow()), 0).toString());
-						Lecture.lecture.setDesc(modelMyLectures.getValueAt(tablemyLectures.convertRowIndexToModel(tablemyLectures.getSelectedRow()), 1).toString());
-						String date=modelMyLectures.getValueAt(tablemyLectures.convertRowIndexToModel(tablemyLectures.getSelectedRow()), 2).toString();
-						Lecture.lecture.setLinkedImagename(modelMyLectures.getValueAt(tablemyLectures.convertRowIndexToModel(tablemyLectures.getSelectedRow()), 6).toString());
-						String startdate=date.substring(0,date.indexOf(" "));
-						String enddate=date.substring(date.indexOf(" "));
-						DateFormat df=new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
-						
-						try {
-							Lecture.lecture.setEnddate(df.parse(enddate));
-							Lecture.lecture.setStartdate(df.parse(startdate));
-						} catch (ParseException e1) {
-							// TODO Auto-generated catch block
-							e1.printStackTrace();
-						}
-						if(modelMyLectures.getValueAt(tablemyLectures.convertRowIndexToModel(tablemyLectures.getSelectedRow()), 3).toString().equals("1")){
-							Lecture.lecture.setActive(true);
-						}
-						else
-						{
-							Lecture.lecture.setActive(false);
-						}
-						
-						con.closeThriftConnection();
-						EditImageAllgemein_GUI ea=new EditImageAllgemein_GUI();
-						ea.setVisible(true);
-						dispose();		
-						}
-						else{
-							JOptionPane.showMessageDialog(null, "Bitte wählen Sie ein eigenes Image aus", "Message",
+
+						System.out
+								.println("\ntableAllImages.getSelectedRow() = "
+										+ tableAllLectures.getSelectedRow()
+										+ "\ntablemyImages.getSelectedRow() = "
+										+ tablemyLectures.getSelectedRow()
+										+ "\ntableCoopImages.getSelectedRow() = "
+										+ tableCoopImages.getSelectedRow()
+										+ "\ntablePublicImages.getSelectedRow() = "
+										+ tablePublicImages.getSelectedRow()
+										+ "\ntablePublicVorlagen.getSelectedRow() = "
+										+ tablePublicVorlagen.getSelectedRow());
+
+						// check if a row is selected
+						if ((tableAllLectures.getSelectedRow() != -1)
+								|| (tablemyLectures.getSelectedRow() != -1)
+								|| (tableCoopImages.getSelectedRow() != -1)
+								|| (tablePublicImages.getSelectedRow() != -1)
+								|| (tablePublicVorlagen.getSelectedRow() != -1)) {
+
+							// a row is selected, do operations
+
+							if (tabbedPane.getSelectedIndex() == 0) {
+
+								Lecture.lecture.setid(modelMyLectures
+										.getValueAt(
+												tablemyLectures
+														.convertRowIndexToModel(tablemyLectures
+																.getSelectedRow()),
+												8).toString());
+								Lecture.lecture.setName(modelMyLectures
+										.getValueAt(
+												tablemyLectures
+														.convertRowIndexToModel(tablemyLectures
+																.getSelectedRow()),
+												0).toString());
+								Lecture.lecture.setDesc(modelMyLectures
+										.getValueAt(
+												tablemyLectures
+														.convertRowIndexToModel(tablemyLectures
+																.getSelectedRow()),
+												1).toString());
+								String date = modelMyLectures
+										.getValueAt(
+												tablemyLectures
+														.convertRowIndexToModel(tablemyLectures
+																.getSelectedRow()),
+												2).toString();
+								
+								Lecture.lecture.setLinkedImagename(modelMyLectures
+										.getValueAt(
+												tablemyLectures
+														.convertRowIndexToModel(tablemyLectures
+																.getSelectedRow()),
+												6).toString());
+
+								int zweitesLeerzeichen = date.indexOf(" ",
+										date.indexOf(" ") + 1);
+
+								String startdate = date.substring(0,
+										zweitesLeerzeichen);
+								String enddate = date
+										.substring(zweitesLeerzeichen);
+								DateFormat df = new SimpleDateFormat(
+										"yyyy-MM-dd hh:mm:ss");
+
+								try {
+									// Format has to be "yyyy-MM-dd hh:mm:ss"
+									Lecture.lecture.setEnddate(df
+											.parse(enddate));
+									Lecture.lecture.setStartdate(df
+											.parse(startdate));
+								} catch (ParseException e1) {
+									// TODO Auto-generated catch block
+									e1.printStackTrace();
+								}
+								if (modelMyLectures
+										.getValueAt(
+												tablemyLectures
+														.convertRowIndexToModel(tablemyLectures
+																.getSelectedRow()),
+												3).toString().equals("1")) {
+									Lecture.lecture.setActive(true);
+								} else {
+									Lecture.lecture.setActive(false);
+								}
+
+								con.closeThriftConnection();
+								// EditImageAllgemein_GUI ea=new
+								// EditImageAllgemein_GUI();
+								EditLectureAllgemein_GUI el = new EditLectureAllgemein_GUI();
+								el.setVisible(true);
+								dispose();
+							} else {
+								JOptionPane
+										.showMessageDialog(
+												null,
+												"Bitte wählen Sie ein eigenes Image aus",
+												"Message",
+												JOptionPane.INFORMATION_MESSAGE);
+							}
+						} else {
+							// nothing selected
+							JOptionPane.showMessageDialog(null,
+									"Bitte wählen Sie ein Image aus.",
+									"Image Auswahl",
 									JOptionPane.INFORMATION_MESSAGE);
-						}
+						}// end check if a row is selected
+
 					}
 				});
-				cancelButton.setActionCommand("Cancel");
-				buttonPane.add(cancelButton);
+				btnContinue.setActionCommand("Cancel");
+				buttonPane.add(btnContinue);
 			}
 		}
-		
+
 		JSeparator separator = new JSeparator();
 		separator.setBounds(0, 78, 597, 2);
 		getContentPane().add(separator);
-		
+
 		JSeparator separator_1 = new JSeparator();
 		separator_1.setBounds(0, 627, 597, 2);
 		getContentPane().add(separator_1);
-		
+
 		JMenuBar menuBar = new JMenuBar();
 		setJMenuBar(menuBar);
-		
+
 		JMenu mnNewMenu_1 = new JMenu("Hilfe");
 		menuBar.add(mnNewMenu_1);
-		
+
 		JMenuItem mntmFaq = new JMenuItem("FAQ");
 		mnNewMenu_1.add(mntmFaq);
-		
+
 		JMenuItem mntmOtrs = new JMenuItem("OTRS");
 		mnNewMenu_1.add(mntmOtrs);
-		
+
 	}
-	//Initiale Beffülung eines Table models
-	public DefaultTableModel initTableModel(DefaultTableModel model){
+
+	// Initiale Beffülung eines Table models
+	public DefaultTableModel initTableModel(DefaultTableModel model) {
 		List<server.Lecture> lectures;
 		try {
-			//Hole eine Liste der Images
+			// Hole eine Liste der Images
 			lectures = client.getLectureList();
-			Iterator<server.Lecture> i=lectures.iterator();
-			
-			int x=0;
-			
-			while(i.hasNext())
-			{
-				//erzeuge Objekte für die Tabelle
-				Object [] obj={lectures.get(x).lecturename,lectures.get(x).desc,lectures.get(x).starttime+" "+lectures.get(x).endtime,lectures.get(x).isActive,lectures.get(x).lastused,lectures.get(x).username," ",lectures.get(x).imagename,lectures.get(x).id};
-				//Füge diese Objekte der Tabelle hinzu
+			Iterator<server.Lecture> i = lectures.iterator();
+
+			int x = 0;
+
+			while (i.hasNext()) {
+				// erzeuge Objekte für die Tabelle
+				Object[] obj = {
+						lectures.get(x).lecturename,
+						lectures.get(x).desc,
+						lectures.get(x).starttime + " "
+								+ lectures.get(x).endtime,
+						lectures.get(x).isActive, lectures.get(x).lastused,
+						lectures.get(x).username, " ",
+						lectures.get(x).imagename, lectures.get(x).id };
+				// Füge diese Objekte der Tabelle hinzu
 				model.addRow(obj);
 				x++;
 				i.next();
-				
+
 			}
-			
+
 			return model;
 		} catch (TException e1) {
 			// TODO Auto-generated catch block
@@ -442,7 +525,5 @@ public class SearchEditLecture_GUI extends JFrame {
 		}
 		return model;
 	}
-	
-	}
-
 
+}
diff --git a/Dozentenmodul/src/GUI/ExtendedSearch_GUI.java b/Dozentenmodul/src/gui/lecture/ExtendedSearchForImages_GUI.java
index 7f042cae..3fc4b7f6 100644
--- a/Dozentenmodul/src/GUI/ExtendedSearch_GUI.java
+++ b/Dozentenmodul/src/gui/lecture/ExtendedSearchForImages_GUI.java
@@ -1,6 +1,9 @@
-package gui;
+package gui.lecture;
 
 
+import gui.image.CreateImageAllgemein_GUI;
+import gui.image.FTPCreateUploader_GUI;
+
 import java.awt.Dimension;
 import java.awt.FlowLayout;
 import java.awt.Font;
@@ -30,7 +33,7 @@ import javax.swing.border.EmptyBorder;
 import javax.swing.border.TitledBorder;
 
 @SuppressWarnings("serial")
-public class ExtendedSearch_GUI extends JFrame {
+public class ExtendedSearchForImages_GUI extends JFrame {
 
 	private final JPanel contentPanel = new JPanel();
 	String[] result;
@@ -41,7 +44,7 @@ public class ExtendedSearch_GUI extends JFrame {
 	 */
 	public static void main(String[] args) {
 		try {
-			ExtendedSearch_GUI dialog = new ExtendedSearch_GUI();
+			ExtendedSearchForImages_GUI dialog = new ExtendedSearchForImages_GUI();
 			dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
 			dialog.setVisible(true);
 			
@@ -53,7 +56,7 @@ public class ExtendedSearch_GUI extends JFrame {
 	/**
 	 * Create the dialog.
 	 */
-	public ExtendedSearch_GUI() {
+	public ExtendedSearchForImages_GUI() {
 		addWindowListener(new WindowAdapter() {
 			@Override
 			public void windowClosing(WindowEvent arg0) {
@@ -178,7 +181,7 @@ public class ExtendedSearch_GUI extends JFrame {
 					public void actionPerformed(ActionEvent e) {
 
 						
-						EingabeImageAllgemein_GUI sr=new EingabeImageAllgemein_GUI();
+						CreateImageAllgemein_GUI sr=new CreateImageAllgemein_GUI();
 						sr.setVisible(true);
 						dispose();
 					}
@@ -193,7 +196,7 @@ public class ExtendedSearch_GUI extends JFrame {
 					public void actionPerformed(ActionEvent e) {
 						
 
-						FTPUploader_GUI ea=new FTPUploader_GUI();
+						FTPCreateUploader_GUI ea=new FTPCreateUploader_GUI();
 						ea.setVisible(true);
 						dispose();
 						
diff --git a/Dozentenmodul/src/GUI/SearchMethod_GUI.java b/Dozentenmodul/src/gui/lecture/SearchMethodLecture_GUI.java
index 24a12959..ae31236a 100644
--- a/Dozentenmodul/src/GUI/SearchMethod_GUI.java
+++ b/Dozentenmodul/src/gui/lecture/SearchMethodLecture_GUI.java
@@ -1,6 +1,9 @@
-package gui;
+package gui.lecture;
 
 
+import gui.image.SearchImage_GUI;
+import gui.intro.MainMenue_GUI;
+
 import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.FlowLayout;
@@ -33,7 +36,7 @@ import javax.swing.border.EmptyBorder;
 import javax.swing.border.TitledBorder;
 
 @SuppressWarnings("serial")
-public class SearchMethod_GUI extends JFrame {
+public class SearchMethodLecture_GUI extends JFrame {
 
 	private final JPanel contentPanel = new JPanel();
 	String[] result;
@@ -45,7 +48,7 @@ public class SearchMethod_GUI extends JFrame {
 	 */
 	public static void main(String[] args) {
 		try {
-			SearchMethod_GUI dialog = new SearchMethod_GUI();
+			SearchMethodLecture_GUI dialog = new SearchMethodLecture_GUI();
 			dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
 			dialog.setVisible(true);
 		} catch (Exception e) {
@@ -56,7 +59,7 @@ public class SearchMethod_GUI extends JFrame {
 	/**
 	 * Create the dialog.
 	 */
-	public SearchMethod_GUI() {
+	public SearchMethodLecture_GUI() {
 		addWindowListener(new WindowAdapter() {
 			@Override
 			public void windowClosing(WindowEvent arg0) {
@@ -150,7 +153,7 @@ public class SearchMethod_GUI extends JFrame {
 			@Override
 			public void mouseClicked(MouseEvent arg0) {
 				
-				SearchMethod_GUI.this.setVisible(false);
+				SearchMethodLecture_GUI.this.setVisible(false);
 				MainMenue_GUI main=new MainMenue_GUI();
 				main.setVisible(true);
 			}
diff --git a/Dozentenmodul/src/thrift/SessionData.java b/Dozentenmodul/src/thrift/SessionData.java
index 98ef43b4..51f0f80b 100644
--- a/Dozentenmodul/src/thrift/SessionData.java
+++ b/Dozentenmodul/src/thrift/SessionData.java
@@ -37,6 +37,7 @@ public class SessionData implements org.apache.thrift.TBase<SessionData, Session
 
   private static final org.apache.thrift.protocol.TField SESSION_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("sessionId", org.apache.thrift.protocol.TType.STRING, (short)1);
   private static final org.apache.thrift.protocol.TField AUTH_TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("authToken", org.apache.thrift.protocol.TType.STRING, (short)2);
+  private static final org.apache.thrift.protocol.TField SERVER_ADDRESS_FIELD_DESC = new org.apache.thrift.protocol.TField("serverAddress", org.apache.thrift.protocol.TType.STRING, (short)3);
 
   private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
   static {
@@ -46,11 +47,13 @@ public class SessionData implements org.apache.thrift.TBase<SessionData, Session
 
   public String sessionId; // required
   public String authToken; // required
+  public String serverAddress; // required
 
   /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
   public enum _Fields implements org.apache.thrift.TFieldIdEnum {
     SESSION_ID((short)1, "sessionId"),
-    AUTH_TOKEN((short)2, "authToken");
+    AUTH_TOKEN((short)2, "authToken"),
+    SERVER_ADDRESS((short)3, "serverAddress");
 
     private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
 
@@ -69,6 +72,8 @@ public class SessionData implements org.apache.thrift.TBase<SessionData, Session
           return SESSION_ID;
         case 2: // AUTH_TOKEN
           return AUTH_TOKEN;
+        case 3: // SERVER_ADDRESS
+          return SERVER_ADDRESS;
         default:
           return null;
       }
@@ -116,6 +121,8 @@ public class SessionData implements org.apache.thrift.TBase<SessionData, Session
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING        , "ID")));
     tmpMap.put(_Fields.AUTH_TOKEN, new org.apache.thrift.meta_data.FieldMetaData("authToken", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING        , "Token")));
+    tmpMap.put(_Fields.SERVER_ADDRESS, new org.apache.thrift.meta_data.FieldMetaData("serverAddress", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
     metaDataMap = Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(SessionData.class, metaDataMap);
   }
@@ -125,11 +132,13 @@ public class SessionData implements org.apache.thrift.TBase<SessionData, Session
 
   public SessionData(
     String sessionId,
-    String authToken)
+    String authToken,
+    String serverAddress)
   {
     this();
     this.sessionId = sessionId;
     this.authToken = authToken;
+    this.serverAddress = serverAddress;
   }
 
   /**
@@ -142,6 +151,9 @@ public class SessionData implements org.apache.thrift.TBase<SessionData, Session
     if (other.isSetAuthToken()) {
       this.authToken = other.authToken;
     }
+    if (other.isSetServerAddress()) {
+      this.serverAddress = other.serverAddress;
+    }
   }
 
   public SessionData deepCopy() {
@@ -152,6 +164,7 @@ public class SessionData implements org.apache.thrift.TBase<SessionData, Session
   public void clear() {
     this.sessionId = null;
     this.authToken = null;
+    this.serverAddress = null;
   }
 
   public String getSessionId() {
@@ -202,6 +215,30 @@ public class SessionData implements org.apache.thrift.TBase<SessionData, Session
     }
   }
 
+  public String getServerAddress() {
+    return this.serverAddress;
+  }
+
+  public SessionData setServerAddress(String serverAddress) {
+    this.serverAddress = serverAddress;
+    return this;
+  }
+
+  public void unsetServerAddress() {
+    this.serverAddress = null;
+  }
+
+  /** Returns true if field serverAddress is set (has been assigned a value) and false otherwise */
+  public boolean isSetServerAddress() {
+    return this.serverAddress != null;
+  }
+
+  public void setServerAddressIsSet(boolean value) {
+    if (!value) {
+      this.serverAddress = null;
+    }
+  }
+
   public void setFieldValue(_Fields field, Object value) {
     switch (field) {
     case SESSION_ID:
@@ -220,6 +257,14 @@ public class SessionData implements org.apache.thrift.TBase<SessionData, Session
       }
       break;
 
+    case SERVER_ADDRESS:
+      if (value == null) {
+        unsetServerAddress();
+      } else {
+        setServerAddress((String)value);
+      }
+      break;
+
     }
   }
 
@@ -231,6 +276,9 @@ public class SessionData implements org.apache.thrift.TBase<SessionData, Session
     case AUTH_TOKEN:
       return getAuthToken();
 
+    case SERVER_ADDRESS:
+      return getServerAddress();
+
     }
     throw new IllegalStateException();
   }
@@ -246,6 +294,8 @@ public class SessionData implements org.apache.thrift.TBase<SessionData, Session
       return isSetSessionId();
     case AUTH_TOKEN:
       return isSetAuthToken();
+    case SERVER_ADDRESS:
+      return isSetServerAddress();
     }
     throw new IllegalStateException();
   }
@@ -281,6 +331,15 @@ public class SessionData implements org.apache.thrift.TBase<SessionData, Session
         return false;
     }
 
+    boolean this_present_serverAddress = true && this.isSetServerAddress();
+    boolean that_present_serverAddress = true && that.isSetServerAddress();
+    if (this_present_serverAddress || that_present_serverAddress) {
+      if (!(this_present_serverAddress && that_present_serverAddress))
+        return false;
+      if (!this.serverAddress.equals(that.serverAddress))
+        return false;
+    }
+
     return true;
   }
 
@@ -317,6 +376,16 @@ public class SessionData implements org.apache.thrift.TBase<SessionData, Session
         return lastComparison;
       }
     }
+    lastComparison = Boolean.valueOf(isSetServerAddress()).compareTo(other.isSetServerAddress());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetServerAddress()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.serverAddress, other.serverAddress);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
     return 0;
   }
 
@@ -352,6 +421,14 @@ public class SessionData implements org.apache.thrift.TBase<SessionData, Session
       sb.append(this.authToken);
     }
     first = false;
+    if (!first) sb.append(", ");
+    sb.append("serverAddress:");
+    if (this.serverAddress == null) {
+      sb.append("null");
+    } else {
+      sb.append(this.serverAddress);
+    }
+    first = false;
     sb.append(")");
     return sb.toString();
   }
@@ -411,6 +488,14 @@ public class SessionData implements org.apache.thrift.TBase<SessionData, Session
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
+          case 3: // SERVER_ADDRESS
+            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+              struct.serverAddress = iprot.readString();
+              struct.setServerAddressIsSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            break;
           default:
             org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
         }
@@ -436,6 +521,11 @@ public class SessionData implements org.apache.thrift.TBase<SessionData, Session
         oprot.writeString(struct.authToken);
         oprot.writeFieldEnd();
       }
+      if (struct.serverAddress != null) {
+        oprot.writeFieldBegin(SERVER_ADDRESS_FIELD_DESC);
+        oprot.writeString(struct.serverAddress);
+        oprot.writeFieldEnd();
+      }
       oprot.writeFieldStop();
       oprot.writeStructEnd();
     }
@@ -460,19 +550,25 @@ public class SessionData implements org.apache.thrift.TBase<SessionData, Session
       if (struct.isSetAuthToken()) {
         optionals.set(1);
       }
-      oprot.writeBitSet(optionals, 2);
+      if (struct.isSetServerAddress()) {
+        optionals.set(2);
+      }
+      oprot.writeBitSet(optionals, 3);
       if (struct.isSetSessionId()) {
         oprot.writeString(struct.sessionId);
       }
       if (struct.isSetAuthToken()) {
         oprot.writeString(struct.authToken);
       }
+      if (struct.isSetServerAddress()) {
+        oprot.writeString(struct.serverAddress);
+      }
     }
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, SessionData struct) throws org.apache.thrift.TException {
       TTupleProtocol iprot = (TTupleProtocol) prot;
-      BitSet incoming = iprot.readBitSet(2);
+      BitSet incoming = iprot.readBitSet(3);
       if (incoming.get(0)) {
         struct.sessionId = iprot.readString();
         struct.setSessionIdIsSet(true);
@@ -481,6 +577,10 @@ public class SessionData implements org.apache.thrift.TBase<SessionData, Session
         struct.authToken = iprot.readString();
         struct.setAuthTokenIsSet(true);
       }
+      if (incoming.get(2)) {
+        struct.serverAddress = iprot.readString();
+        struct.setServerAddressIsSet(true);
+      }
     }
   }
 
diff --git a/Dozentenmodul/src/thrift/ThriftConnection.java b/Dozentenmodul/src/thrift/ThriftConnection.java
index 79f4a123..311125f5 100644
--- a/Dozentenmodul/src/thrift/ThriftConnection.java
+++ b/Dozentenmodul/src/thrift/ThriftConnection.java
@@ -10,7 +10,8 @@ import server.Server;
 import server.Server.Client;
 
 public class ThriftConnection {
-	final TTransport transport = new TSocket("141.79.128.121", 9090);
+	//final TTransport transport = new TSocket("141.79.128.121", 9090);
+	final TTransport transport = new TSocket("141.79.128.102", 9090);
 	public Client getThriftConnection()
 	{