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
author: unknown 2014-04-10 09:45:29 +0200
committer: unknown 2014-04-10 09:45:29 +0200
commit: 851e1be0f5fac264cec8a120f2f02d8dcdb9ee7f (patch)
tree: 5b86607ee60544e60089f34e8f4ca51ef2f05300 /Dozentenmodul/src/gui
parent: rgethgdfb (diff)
parent: Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-module (diff)
download: tutor-module-851e1be0f5fac264cec8a120f2f02d8dcdb9ee7f.tar.gz
tutor-module-851e1be0f5fac264cec8a120f2f02d8dcdb9ee7f.tar.xz
tutor-module-851e1be0f5fac264cec8a120f2f02d8dcdb9ee7f.zip
22 files changed, 1578 insertions, 1373 deletions
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/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/image/FTPEditUploader_GUI.java b/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java
new file mode 100644
index 00000000..b184c96c
--- /dev/null
+++ b/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java
@@ -0,0 +1,475 @@
+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/SearchEditImage_GUI.java b/Dozentenmodul/src/gui/image/SearchEditImage_GUI.java
index dbc2562c..e6bb055e 100644
--- a/Dozentenmodul/src/gui/SearchEditImage_GUI.java
+++ b/Dozentenmodul/src/gui/image/SearchEditImage_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;
@@ -19,7 +21,6 @@ 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;
@@ -53,7 +54,6 @@ import org.apache.thrift.TException;
 import server.Server.Client;
 import thrift.ThriftConnection;
 
-
 @SuppressWarnings("serial")
 public class SearchEditImage_GUI extends JFrame {
 
@@ -66,26 +66,25 @@ public class SearchEditImage_GUI extends JFrame {
 	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 );
-    
+	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(); } }
 	 */
-	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.
@@ -94,35 +93,37 @@ public class SearchEditImage_GUI extends JFrame {
 		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);
 			}
+
+			@Override
+			public void windowOpened(WindowEvent arg0) {
+				textFieldName.requestFocusInWindow();
+			}
 		});
-		//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();
@@ -136,11 +137,12 @@ public class SearchEditImage_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);
 		}
@@ -149,148 +151,150 @@ public class SearchEditImage_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);
-		
+
 		JLabel lblInternetIstInnerhalb = new JLabel("Betriebssystem:");
 		lblInternetIstInnerhalb.setBounds(10, 58, 250, 20);
 		panel_1.add(lblInternetIstInnerhalb);
-		
+
 		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));
-					rowSorterMyImages.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));
+					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>");
+
+		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);
-		
+
 		comboBox = new JComboBox<String>();
 		try {
-			//Holt sich eine Liste aller verf�gbaren Betriebssysteme vom Server
-			List<String> list=client.getAllOS();
-			//Leeres Item hinzuf�gen
+			// 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
+			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
+		// 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));
-				}							
+				// 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�
+				// �ffnet das Hau�tmen�
 				con.closeThriftConnection();
 				SearchEditImage_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("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){
+				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 = new JTable();
 		tableAllImages.setModel(modelAll);
 		tableAllImages.getColumnModel().getColumn(1).sizeWidthToFit();
 		tableAllImages.getColumnModel().getColumn(2).sizeWidthToFit();
@@ -298,9 +302,9 @@ public class SearchEditImage_GUI extends JFrame {
 		tableAllImages.getColumnModel().getColumn(4).sizeWidthToFit();
 		tableAllImages.getColumnModel().getColumn(5).sizeWidthToFit();
 		initTableModel(modelAll);
-		
+
 		JScrollPane scrollPaneMyImage = new JScrollPane();
-		tablemyImages=new JTable();
+		tablemyImages = new JTable();
 		tablemyImages.setModel(modelMyImages);
 		tablemyImages.getColumnModel().getColumn(1).sizeWidthToFit();
 		tablemyImages.getColumnModel().getColumn(2).sizeWidthToFit();
@@ -308,16 +312,16 @@ public class SearchEditImage_GUI extends JFrame {
 		tablemyImages.getColumnModel().getColumn(4).sizeWidthToFit();
 		tablemyImages.getColumnModel().getColumn(5).sizeWidthToFit();
 		tablemyImages.setRowSorter(rowSorterMyImages);
-		
-				scrollPaneMyImage.setViewportView(tablemyImages);
-				tabbedPane.addTab("Meine Images", null, scrollPaneMyImage, null);
+
+		scrollPaneMyImage.setViewportView(tablemyImages);
+		tabbedPane.addTab("Meine Images", null, scrollPaneMyImage, null);
 		tableAllImages.setRowSorter(rowSorterAll);
-		
-				scrollPaneAllImages.setViewportView(tableAllImages);
-				tabbedPane.addTab("Alle", null, scrollPaneAllImages, null);
-		
+
+		scrollPaneAllImages.setViewportView(tableAllImages);
+		tabbedPane.addTab("Alle", null, scrollPaneAllImages, null);
+
 		JScrollPane scrollPaneCoopImages = new JScrollPane();
-		JTable tableCoopImages=new JTable();
+		JTable tableCoopImages = new JTable();
 		tableCoopImages.setModel(model);
 		tableCoopImages.getColumnModel().getColumn(1).sizeWidthToFit();
 		tableCoopImages.getColumnModel().getColumn(2).sizeWidthToFit();
@@ -326,11 +330,12 @@ public class SearchEditImage_GUI extends JFrame {
 		tableCoopImages.getColumnModel().getColumn(5).sizeWidthToFit();
 
 		scrollPaneCoopImages.setViewportView(tableCoopImages);
-		tabbedPane.addTab("Kooperative Images", null, scrollPaneCoopImages, null);
+		tabbedPane.addTab("Kooperative Images", null, scrollPaneCoopImages,
+				null);
 		tabbedPane.setEnabledAt(2, false);
-		
+
 		JScrollPane scrollPanePublicImages = new JScrollPane();
-		JTable tablePublicImages=new JTable();
+		JTable tablePublicImages = new JTable();
 		tablePublicImages.setModel(model);
 		tablePublicImages.getColumnModel().getColumn(1).sizeWidthToFit();
 		tablePublicImages.getColumnModel().getColumn(2).sizeWidthToFit();
@@ -339,11 +344,12 @@ public class SearchEditImage_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();
+		JTable tablePublicVorlagen = new JTable();
 		tablePublicVorlagen.setModel(model);
 		tablePublicVorlagen.getColumnModel().getColumn(1).sizeWidthToFit();
 		tablePublicVorlagen.getColumnModel().getColumn(2).sizeWidthToFit();
@@ -352,36 +358,35 @@ public class SearchEditImage_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);
-		
-		
-		
 
 		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();
-					
+				// �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();
-					
+					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();
+					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);
+
+				} else {
+					JOptionPane.showMessageDialog(null,
+							"Bitte w�hlen Sie ein Image f�r den Download aus",
+							"Message", JOptionPane.INFORMATION_MESSAGE);
 				}
 			}
 		});
@@ -397,9 +402,9 @@ public class SearchEditImage_GUI extends JFrame {
 				JButton okButton = new JButton("Zur\u00FCck");
 				okButton.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();
 					}
@@ -413,75 +418,97 @@ public class SearchEditImage_GUI extends JFrame {
 				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);
-						}
+
+						// 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
 					}
 				});
 				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){
+
+	// Initiale Beff�lung eines Table models
+	public DefaultTableModel initTableModel(DefaultTableModel model) {
 		List<server.Image> images;
 		try {
-			//Hole eine Liste der Images
+			// 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
+
+			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() };
+				// F�ge diese Objekte der Tabelle hinzu
 				model.addRow(obj);
 				x++;
 				i.next();
-				
+
 			}
-			
+
 			return model;
 		} catch (TException e1) {
 			// TODO Auto-generated catch block
@@ -489,7 +516,5 @@ public class SearchEditImage_GUI extends JFrame {
 		}
 		return model;
 	}
-	
-	}
-
 
+}
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/EditLinkImage_GUI.java b/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java
index 8de896c3..c245ce79 100644
--- a/Dozentenmodul/src/gui/EditLinkImage_GUI.java
+++ b/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java
@@ -1,6 +1,6 @@
-package gui;
-
+package gui.lecture;
 
+import gui.intro.MainMenue_GUI;
 import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.FlowLayout;
@@ -20,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;
@@ -29,6 +28,7 @@ import javax.swing.JLabel;
 import javax.swing.JMenu;
 import javax.swing.JMenuBar;
 import javax.swing.JMenuItem;
+import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 import javax.swing.JRadioButton;
 import javax.swing.JScrollPane;
@@ -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 EditLinkImage_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 thrift=new ThriftConnection();
-	Client client=thrift.getThriftConnection();
+	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();
+			EditLectureLink_GUI dialog = new EditLectureLink_GUI();
 			dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
 			dialog.setVisible(true);
 		} catch (Exception e) {
@@ -82,7 +83,7 @@ public class EditLinkImage_GUI extends JFrame {
 	/**
 	 * Create the dialog.
 	 */
-	public EditLinkImage_GUI() {
+	public EditLectureLink_GUI() {
 		addWindowListener(new WindowAdapter() {
 			@Override
 			public void windowClosing(WindowEvent arg0) {
@@ -90,7 +91,7 @@ public class EditLinkImage_GUI extends JFrame {
 			}
 		});
 		setResizable(false);
-		
+
 		try {
 			UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
 		} catch (ClassNotFoundException | InstantiationException
@@ -100,15 +101,13 @@ public class EditLinkImage_GUI extends JFrame {
 		}
 		setTitle("bwLehrpool Suite *Prototyp*");
 		Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
-		int top=(screenSize.height - 603) / 2;
-		int left=(screenSize.width - 722) / 2;
+		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 );
-		
-		
+		final DefaultTableModel modelAll = new DefaultTableModel(titles, 0);
+		final DefaultTableModel model = new DefaultTableModel(titles, 0);
+
 		getContentPane().setLayout(null);
 		{
 			JPanel panel = new JPanel();
@@ -117,16 +116,18 @@ public class EditLinkImage_GUI extends JFrame {
 			getContentPane().add(panel);
 			panel.setLayout(null);
 			{
-				JLabel lblNewLabel = new JLabel("Veanstaltung verlinken");
+				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));
 			}
-			
+
 			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("W\u00E4hlen Sie bitte ein Image aus, auf dem Ihre Versanstaltung basiert.");
 			txtpnBitteWhlenSie.setBounds(10, 36, 509, 32);
 			panel.add(txtpnBitteWhlenSie);
 		}
@@ -135,72 +136,70 @@ public class EditLinkImage_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);
-		
+
 		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();
+				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);
+
+				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>");
+
+		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();
+				ExtendedSearchForImages_GUI es = new ExtendedSearchForImages_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();
+			List<String> list = client.getAllOS();
 			comboBox.addItem("");
-			for(int i=0;i<list.size();i++)
-			{
-			comboBox.addItem(list.get(i));
+			for (int i = 0; i < list.size(); i++) {
+				comboBox.addItem(list.get(i));
 			}
 		} catch (TException e2) {
 			// TODO Auto-generated catch block
@@ -210,91 +209,84 @@ public class EditLinkImage_GUI extends JFrame {
 			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);
+				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();
+
+				EditLectureLink_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);
+
+		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();
@@ -303,10 +295,12 @@ public class EditLinkImage_GUI extends JFrame {
 		tableCoopImages.getColumnModel().getColumn(5).sizeWidthToFit();
 
 		scrollPaneCoopImages.setViewportView(tableCoopImages);
-		tabbedPane.addTab("Kooperative Images", null, scrollPaneCoopImages, null);
-		
+		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();
@@ -315,10 +309,12 @@ public class EditLinkImage_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.setModel(model);
 		tablePublicVorlagen.getColumnModel().getColumn(1).sizeWidthToFit();
 		tablePublicVorlagen.getColumnModel().getColumn(2).sizeWidthToFit();
@@ -327,13 +323,16 @@ public class EditLinkImage_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);
+
 		JButton btnLinkLschen = new JButton("Link l\u00F6schen");
+		btnLinkLschen.setEnabled(false);
 		btnLinkLschen.setBounds(478, 508, 89, 23);
 		contentPanel.add(btnLinkLschen);
-		
-		initTableModel(modelAll);		
+
+		initTableModel(modelAll);
 		{
 			JPanel buttonPane = new JPanel();
 			buttonPane.setBounds(0, 640, 597, 33);
@@ -344,9 +343,9 @@ public class EditLinkImage_GUI extends JFrame {
 				JButton okButton = new JButton("Zur\u00FCck");
 				okButton.addActionListener(new ActionListener() {
 					public void actionPerformed(ActionEvent e) {
-		
-						MainMenue_GUI main=new MainMenue_GUI();
-						main.setVisible(true);
+
+						EditLectureAllgemein_GUI el = new EditLectureAllgemein_GUI();
+						el.setVisible(true);
 						dispose();
 					}
 				});
@@ -355,75 +354,119 @@ public class EditLinkImage_GUI extends JFrame {
 				getRootPane().setDefaultButton(okButton);
 			}
 			{
-				JButton cancelButton = new JButton("Veranstaltung erzeugen und abschlie\u00DFen");
+				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();
+
+						// 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);
+
 						}
 						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){
+
+	public DefaultTableModel initTableModel(DefaultTableModel model) {
 		List<server.Image> images;
 		try {
 			images = client.getImageList();
-			Iterator<server.Image> i=images.iterator();
+			Iterator<server.Image> i = images.iterator();
 			List<Object[]> ListObj = new ArrayList<Object[]>();
-			int x=0;
-			
-			while(i.hasNext())
-			{
-				
+			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()};
+				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
@@ -431,6 +474,4 @@ public class EditLinkImage_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);
 			}
author	unknown	2014-04-10 09:45:29 +0200
committer	unknown	2014-04-10 09:45:29 +0200
commit	851e1be0f5fac264cec8a120f2f02d8dcdb9ee7f (patch)
tree	5b86607ee60544e60089f34e8f4ca51ef2f05300 /Dozentenmodul/src/gui
parent	rgethgdfb (diff)
parent	Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-module (diff)
download	tutor-module-851e1be0f5fac264cec8a120f2f02d8dcdb9ee7f.tar.gz tutor-module-851e1be0f5fac264cec8a120f2f02d8dcdb9ee7f.tar.xz tutor-module-851e1be0f5fac264cec8a120f2f02d8dcdb9ee7f.zip