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, 500 deletions

diff --git a/Dozentenmodul/src/GUI/FTPUploader_GUI.java b/Dozentenmodul/src/GUI/FTPUploader_GUI.java
deleted file mode 100644
index eaaf9544..00000000
--- a/Dozentenmodul/src/GUI/FTPUploader_GUI.java
+++ /dev/null
@@ -1,500 +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 org.apache.thrift.TException;

-import server.Server.Client;

-import thrift.ThriftConnection;

-//import util.XMLCreator;

-import ftp.UploadTask;

-

-@SuppressWarnings("serial")

-public class FTPUploader_GUI extends JFrame implements PropertyChangeListener {

-

-	@SuppressWarnings("unused")

-	private JPanel contentPane;

-	private final JPanel contentPanel = new JPanel();

-	JLabel lblNewLabel;

-	JProgressBar progressBar;

-	String host = "141.79.128.121";

-	int port = 21;

-	server.User user;

-	String filename = "";

-	File uploadFile;

-	static String arg = "";

-	UploadTask task;

-	JLabel UpSpeed;

-	JLabel labelfertig;

-	JLabel labelfilesize;

-	JLabel labelZeit;

-	JLabel labelverbleibend;

-	long filesize;

-	double speed;

-	long bytesread;

-	boolean taskrun = false;

-	ThriftConnection thrift = new ThriftConnection();

-	Client client = thrift.getThriftConnection();

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

-

-	/**

-	 * Launch the application.

-	 */

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

-		EventQueue.invokeLater(new Runnable() {

-			public void run() {

-				try {

-					FTPUploader_GUI frame = new FTPUploader_GUI();

-					frame.setVisible(true);

-				} catch (Exception e) {

-					e.printStackTrace();

-				}

-			}

-		});

-	}

-

-	/**

-	 * Create the frame.

-	 */

-	public FTPUploader_GUI() {

-		addWindowListener(new WindowAdapter() {

-			@Override

-			public void windowClosing(WindowEvent arg0) {

-				if (taskrun == true) {

-					try {

-

-						client.DeleteFtpUser(user.userName);

-					} catch (TException e1) {

-						// TODO Auto-generated catch block

-						e1.printStackTrace();

-					}

-					task.cancel(true);

-				}

-			}

-		});

-		setResizable(false);

-		// setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);

-

-		try {

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

-		} catch (ClassNotFoundException | InstantiationException

-				| IllegalAccessException | UnsupportedLookAndFeelException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		}

-

-		// filename=name;

-		setBackground(Color.WHITE);

-		setTitle("Dozentenmodul *Prototyp*");

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

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

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

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

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

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

-		contentPanel.setBackground(SystemColor.menu);

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

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

-		contentPanel.setLayout(null);

-		{

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

-			btnSpeicherortAuswhlen.addActionListener(new ActionListener() {

-				public void actionPerformed(ActionEvent arg0) {

-					JFileChooser fc = new JFileChooser();

-					fc.setFileSelectionMode(JFileChooser.FILES_ONLY);

-

-					fc.showOpenDialog(getParent());

-					File file = fc.getSelectedFile();

-					//check if a file is selected and exists

-					if (file != null) {

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

-						uploadFile = file;

-						filename = uploadFile.getName();

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

-					} else {

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

-						lblNewLabel.setText("");

-					}//end if

-				}

-			});

-

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

-			btnSpeicherortAuswhlen.setVerticalAlignment(SwingConstants.TOP);

-			contentPanel.add(btnSpeicherortAuswhlen);

-		}

-

-		lblNewLabel = new JLabel("");

-		lblNewLabel.setHorizontalAlignment(SwingConstants.LEFT);

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

-		contentPanel.add(lblNewLabel);

-

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

-		btnUploadStarten.addActionListener(new ActionListener() {

-			public void actionPerformed(ActionEvent arg0) {

-				buttonUploadActionPerformed(arg0);

-

-			}

-		});

-

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

-		contentPanel.add(btnUploadStarten);

-

-		progressBar = new JProgressBar(0, 100);

-		progressBar.setStringPainted(true);

-

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

-		contentPanel.add(progressBar);

-

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

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

-		contentPanel.add(lblUploadgeschwindigkeit);

-

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

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

-		contentPanel.add(label_1);

-

-		labelfertig = new JLabel("0");

-		labelfertig.setHorizontalAlignment(SwingConstants.LEFT);

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

-		contentPanel.add(labelfertig);

-

-		UpSpeed = new JLabel("0");

-		UpSpeed.setHorizontalAlignment(SwingConstants.LEFT);

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

-		contentPanel.add(UpSpeed);

-

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

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

-		contentPanel.add(label_4);

-

-		labelfilesize = new JLabel("0");

-		labelfilesize.setHorizontalAlignment(SwingConstants.LEFT);

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

-		contentPanel.add(labelfilesize);

-

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

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

-		contentPanel.add(label_6);

-

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

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

-		contentPanel.add(label_7);

-

-		labelZeit = new JLabel("0");

-		labelZeit.setHorizontalAlignment(SwingConstants.LEFT);

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

-		contentPanel.add(labelZeit);

-

-		labelverbleibend = new JLabel("0");

-		labelverbleibend.setHorizontalAlignment(SwingConstants.LEFT);

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

-		contentPanel.add(labelverbleibend);

-

-		JPanel panel = new JPanel();

-		panel.setLayout(null);

-		panel.setBackground(SystemColor.menu);

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

-		contentPanel.add(panel);

-

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

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

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

-		panel.add(lblUploadIhresImage);

-

-		JTextPane txtpnFhreSieBitte = new JTextPane();

-		txtpnFhreSieBitte

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

-		txtpnFhreSieBitte.setEditable(false);

-		txtpnFhreSieBitte.setBackground(SystemColor.menu);

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

-		panel.add(txtpnFhreSieBitte);

-

-		JSeparator separator = new JSeparator();

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

-		contentPanel.add(separator);

-

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

-		lblNewLabel_1.setForeground(Color.BLUE);

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

-		contentPanel.add(lblNewLabel_1);

-

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

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

-		contentPanel.add(label_3);

-

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

-		lblVlimage.setForeground(Color.BLUE);

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

-		contentPanel.add(lblVlimage);

-

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

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

-		contentPanel.add(label_5);

-

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

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

-		contentPanel.add(lblNeubearbeiten);

-

-		JSeparator separator_1 = new JSeparator();

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

-		contentPanel.add(separator_1);

-

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

-		btnCopyFileTo.addActionListener(new ActionListener() {

-			public void actionPerformed(ActionEvent e) {

-				try {

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

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

-				} catch (TException e1) {

-					// TODO Auto-generated catch block

-					e1.printStackTrace();

-				}

-			}

-		});

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

-		contentPanel.add(btnCopyFileTo);

-

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

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

-		contentPanel.add(lblShritt);

-

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

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

-		contentPanel.add(lblSchritt);

-

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

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

-		contentPanel.add(lblSchritt_1);

-

-		JLabel lblKlickenSieAuf = new JLabel(

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

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

-		contentPanel.add(lblKlickenSieAuf);

-		{

-			JPanel buttonPane = new JPanel();

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

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

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

-			{

-				// Button for starting upload

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

-				finishButton.setEnabled(false);

-				finishButton.addActionListener(new ActionListener() {

-					public void actionPerformed(ActionEvent e) {

-						writeData();

-						dispose();

-						MainMenue_GUI m = new MainMenue_GUI();

-						m.setVisible(true);

-						if (taskrun == true) {

-							try {

-								client.DeleteFtpUser(user.userName);

-								thrift.closeThriftConnection();

-							} catch (TException e1) {

-								// TODO Auto-generated catch block

-								e1.printStackTrace();

-							}

-							task.cancel(true);

-						}

-

-					}

-				});

-

-				// Button for going back to Main Menu

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

-				cancelButton.addActionListener(new ActionListener() {

-					public void actionPerformed(ActionEvent arg0) {

-						dispose();

-						MainMenue_GUI m = new MainMenue_GUI();

-						m.setVisible(true);

-					}

-				});

-

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

-				btnZurck.addActionListener(new ActionListener() {

-					public void actionPerformed(ActionEvent e) {

-						dispose();

-						EingabeImageTechnisch_GUI m = new EingabeImageTechnisch_GUI();

-						m.setVisible(true);

-					}

-				});

-				btnZurck.setActionCommand("Cancel");

-				buttonPane.add(btnZurck);

-

-				cancelButton.setActionCommand("Cancel");

-				buttonPane.add(cancelButton);

-				finishButton.setActionCommand("Cancel");

-				buttonPane.add(finishButton);

-			}

-		}

-

-		JMenuBar menuBar = new JMenuBar();

-		setJMenuBar(menuBar);

-

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

-		menuBar.add(mnHillfe);

-		setVisible(true);

-

-	}

-

-	private void buttonUploadActionPerformed(ActionEvent event) {

-		// File (or directory) with old name

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

-

-		// File (or directory) with new name

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

-		// File file2 = new

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

-

-		// Rename file (or directory)

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

-		// if (!success) {

-		// File was not successfully renamed

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

-		// }

-		// else

-		// {

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

-		// }

-		progressBar.setValue(0);

-

-		try {

-			user = client.getFtpUser();

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

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

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

-		} catch (TException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		}

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

-

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

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

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

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

-		Image.image.setNewName(formatter.format(new Date()) + "_"

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

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

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

-		task = new UploadTask(host, port, user.userName, user.password,

-				user.path, uploadFile);

-

-		task.addPropertyChangeListener(this);

-		task.execute();

-		taskrun = true;

-

-		// createXML();

-		// TransferToSatellit();

-

-	}

-

-	public void propertyChange(PropertyChangeEvent arg0) {

-		int progress = 0;

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

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

-			progressBar.setValue(progress);

-

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

-			if (progress == 100) {

-				finishButton.setEnabled(true);

-			}

-

-		}

-

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

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

-			// if(speed<=1){

-

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

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

-					+ " MB/s");

-

-			// }else

-			// {

-			// double MBSpeed=speed/1024;

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

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

-			// }

-

-		}

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

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

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

-			labelverbleibend

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

-							+ " MB");

-

-			labelZeit

-					.setText(String

-							.valueOf(

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

-							.substring(

-									0,

-									String.valueOf(

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

-											.lastIndexOf("."))

-							+ " Minuten");

-

-		}

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

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

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

-

-		}

-

-	}

-

-	public boolean writeData() {

-

-		try {

-

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

-					person.verantwortlicher.getVorname(),

-					person.verantwortlicher.getName(),

-					person.verantwortlicher.getHochschule(),

-					person.verantwortlicher.getEMail(),

-					person.verantwortlicher.getTel(),

-					person.verantwortlicher.getFakultät(),

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

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

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

-		} catch (TException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-			return false;

-		}

-		return true;

-

-	}

-}
\ No newline at end of file