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

1 files changed, 0 insertions, 427 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