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

4 files changed, 515 insertions, 304 deletions

diff --git a/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java b/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java
index a2825d54..754a5d63 100644
--- a/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java
@@ -66,11 +66,13 @@ public class FTPCreateUploader_GUI extends JFrame implements
 	/**
 	 * Logger instance for this class.
 	 */
-	private final static Logger LOGGER = Logger.getLogger(FTPCreateUploader_GUI.class);
-	
+	private final static Logger LOGGER = Logger
+			.getLogger(FTPCreateUploader_GUI.class);
+
 	@SuppressWarnings("unused")
 	private JPanel contentPane;
 	private final JPanel contentPanel = new JPanel();
+	
 	JLabel lblPath;
 	JProgressBar progressBar;
 	String host = SessionData.session.getServerAdress();
@@ -80,11 +82,11 @@ public class FTPCreateUploader_GUI extends JFrame implements
 	File uploadFile;
 	static String arg = "";
 	UploadTask task;
-	JLabel UpSpeed;
-	JLabel labelfertig;
-	JLabel labelfilesize;
-	JLabel labelZeit;
-	JLabel labelverbleibend;
+	JLabel lblUpSpeed;
+	JLabel lblFertig;
+	JLabel lblFilesize;
+	JLabel lblZeit;
+	JLabel lblVerbleibend;
 	JFileChooser fc;
 	long filesize;
 	double speed;
@@ -92,12 +94,14 @@ public class FTPCreateUploader_GUI extends JFrame implements
 	boolean taskrun = false;
 	ThriftConnection con = new ThriftConnection();
 	Client client = models.Client.clientcon.getClient();
-	JButton finishButton = new JButton("Fertigstellen");
+	JButton btnFinish = new JButton("Fertigstellen");
 	JButton btnUploadStarten = new JButton("Upload auf Server starten");
 	JButton btnZurck = new JButton("Zurück");
+	JButton btnUploadStoppen = new JButton("Upload abbrechen");
 	int progress = 0; // progress of upload
 	private boolean isCurrentlyLoading = false; // currently up or downloading
 												// file
+	private boolean isAborted = false; //down- or upload was manually aborted 
 
 	/**
 	 * Create the frame.
@@ -170,9 +174,10 @@ public class FTPCreateUploader_GUI extends JFrame implements
 			JButton btnSpeicherortAuswhlen = new JButton("Image auswählen");
 			btnSpeicherortAuswhlen.addActionListener(new ActionListener() {
 				public void actionPerformed(ActionEvent arg0) {
-					
+
 					fc = new JFileChooser(Config.getLastUploadPath());
-					FileNameExtensionFilter filter = new FileNameExtensionFilter("VMDK-Container", "vmdk");
+					FileNameExtensionFilter filter = new FileNameExtensionFilter(
+							"VMDK-Container", "vmdk");
 					fc.setFileFilter(filter);
 					fc.setFileSelectionMode(JFileChooser.FILES_ONLY);
 
@@ -200,7 +205,8 @@ public class FTPCreateUploader_GUI extends JFrame implements
 
 		lblPath.addPropertyChangeListener(new PropertyChangeListener() {
 			public void propertyChange(PropertyChangeEvent arg0) {
-				if (lblPath.getText() == null || !lblPath.getText().endsWith(".vmdk")) {
+				if (lblPath.getText() == null
+						|| !lblPath.getText().endsWith(".vmdk")) {
 					// Keine Auswahl oder Auswahl ist keine vmdk
 					btnUploadStarten.setEnabled(false);
 					btnUploadStarten.setText("Kein Image!");
@@ -241,42 +247,43 @@ public class FTPCreateUploader_GUI extends JFrame implements
 		label_1.setBounds(102, 325, 46, 14);
 		contentPanel.add(label_1);
 
-		labelfertig = new JLabel("0");
-		labelfertig.setHorizontalAlignment(SwingConstants.LEFT);
-		labelfertig.setBounds(183, 325, 108, 14);
-		contentPanel.add(labelfertig);
+		lblFertig = new JLabel("0");
+		lblFertig.setHorizontalAlignment(SwingConstants.LEFT);
+		lblFertig.setBounds(183, 325, 108, 14);
+		contentPanel.add(lblFertig);
 
-		UpSpeed = new JLabel("0");
-		UpSpeed.setHorizontalAlignment(SwingConstants.LEFT);
-		UpSpeed.setBounds(374, 275, 117, 14);
-		contentPanel.add(UpSpeed);
+		lblUpSpeed = new JLabel("0");
+		lblUpSpeed.setHorizontalAlignment(SwingConstants.LEFT);
+		lblUpSpeed.setBounds(374, 275, 117, 14);
+		contentPanel.add(lblUpSpeed);
 
 		JLabel label_4 = new JLabel("von:");
 		label_4.setBounds(318, 325, 46, 14);
 		contentPanel.add(label_4);
 
-		labelfilesize = new JLabel("0");
-		labelfilesize.setHorizontalAlignment(SwingConstants.LEFT);
-		labelfilesize.setBounds(374, 325, 117, 14);
-		contentPanel.add(labelfilesize);
+		lblFilesize = new JLabel("0");
+		lblFilesize.setHorizontalAlignment(SwingConstants.LEFT);
+		lblFilesize.setBounds(374, 325, 117, 14);
+		contentPanel.add(lblFilesize);
 
 		JLabel label_6 = new JLabel("Verbleibend:");
 		label_6.setBounds(102, 350, 71, 14);
 		contentPanel.add(label_6);
 
-		JLabel lblGeschtzteVerbleibendeZeit = new JLabel("Geschätzte verbleibende Zeit:");
+		JLabel lblGeschtzteVerbleibendeZeit = new JLabel(
+				"Geschätzte verbleibende Zeit:");
 		lblGeschtzteVerbleibendeZeit.setBounds(102, 300, 150, 14);
 		contentPanel.add(lblGeschtzteVerbleibendeZeit);
 
-		labelZeit = new JLabel("0");
-		labelZeit.setHorizontalAlignment(SwingConstants.LEFT);
-		labelZeit.setBounds(374, 300, 117, 14);
-		contentPanel.add(labelZeit);
+		lblZeit = new JLabel("0");
+		lblZeit.setHorizontalAlignment(SwingConstants.LEFT);
+		lblZeit.setBounds(374, 300, 117, 14);
+		contentPanel.add(lblZeit);
 
-		labelverbleibend = new JLabel("0");
-		labelverbleibend.setHorizontalAlignment(SwingConstants.LEFT);
-		labelverbleibend.setBounds(183, 350, 108, 14);
-		contentPanel.add(labelverbleibend);
+		lblVerbleibend = new JLabel("0");
+		lblVerbleibend.setHorizontalAlignment(SwingConstants.LEFT);
+		lblVerbleibend.setBounds(183, 350, 108, 14);
+		contentPanel.add(lblVerbleibend);
 
 		JPanel panel = new JPanel();
 		panel.setLayout(null);
@@ -343,27 +350,53 @@ public class FTPCreateUploader_GUI extends JFrame implements
 				"Klicken Sie auf \"Fertigstellen\".");
 		lblKlickenSieAuf.setBounds(98, 423, 241, 14);
 		contentPanel.add(lblKlickenSieAuf);
+
+		btnUploadStoppen = new JButton("Upload abbrechen");
+		btnUploadStoppen.addActionListener(new ActionListener() {
+			public void actionPerformed(ActionEvent e) {
+				
+				isAborted = true; //set flag
+				try {
+					client.DeleteFtpUser(user.userName);
+					LOGGER.info("Deleted FTP user.");
+				} catch (TException e1) {
+					// TODO Auto-generated catch block
+					e1.printStackTrace();
+				}
+				task.cancel(true);
+				resetValues();
+				
+				//reset buttons
+				resetButtons();
+
+			}
+		});
+		btnUploadStoppen.setEnabled(false);
+		btnUploadStoppen.setBounds(318, 200, 173, 23);
+		contentPanel.add(btnUploadStoppen);
 		{
 			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() {
+				btnFinish.setEnabled(false);
+				btnFinish.addActionListener(new ActionListener() {
 					public void actionPerformed(ActionEvent e) {
 						writeData();
 
 						File f = new File(lblPath.getText());
 						if (f.isDirectory()) {
-							// shouldn't be a directory, but let's check that case anyway
+							// shouldn't be a directory, but let's check that
+							// case anyway
 							Config.setLastUploadPath(f.toString());
 						} else if (f.getParentFile().isDirectory()) {
-							Config.setLastUploadPath(f.getParentFile().toString());
+							Config.setLastUploadPath(f.getParentFile()
+									.toString());
 						}
 						// save configuration
 						Config.store();
-						
+
 						dispose();
 						MainMenue_GUI m = new MainMenue_GUI();
 						m.setVisible(true);
@@ -423,8 +456,8 @@ public class FTPCreateUploader_GUI extends JFrame implements
 				});
 				btnZurck.setActionCommand("Cancel");
 				buttonPane.add(btnZurck);
-				finishButton.setActionCommand("Cancel");
-				buttonPane.add(finishButton);
+				btnFinish.setActionCommand("Cancel");
+				buttonPane.add(btnFinish);
 			}
 		}
 
@@ -438,7 +471,7 @@ public class FTPCreateUploader_GUI extends JFrame implements
 		menuItem.addMouseListener(new MouseAdapter() {
 			@Override
 			public void mousePressed(MouseEvent arg0) {
-				//OpenLinks open = new OpenLinks();
+				// OpenLinks open = new OpenLinks();
 				URI windows;
 				try {
 					windows = new URI(Links.getFAQ());
@@ -483,6 +516,7 @@ public class FTPCreateUploader_GUI extends JFrame implements
 
 	private void buttonUploadActionPerformed(ActionEvent event) {
 
+		isAborted = false;
 		progressBar.setValue(0);
 		btnUploadStarten.setEnabled(false); // verhindert einen weiteren klick
 		btnUploadStarten.setText("Bitte warten");
@@ -498,13 +532,13 @@ public class FTPCreateUploader_GUI extends JFrame implements
 			LOGGER.error("Konnte vom Satellit keinen FTP-User erhalten!");
 			e.printStackTrace();
 			JOptionPane.showMessageDialog(null,
-					"Konnte vom Satellit keinen FTP-User erhalten!", "Debug-Message",
-					JOptionPane.ERROR_MESSAGE);
+					"Konnte vom Satellit keinen FTP-User erhalten!",
+					"Debug-Message", JOptionPane.ERROR_MESSAGE);
 		}
 		DateFormat formatter = new SimpleDateFormat("yyyMMddhhmmss");
 
-		LOGGER.info("Setting new name: " + formatter.format(new Date())
-				+ "_" + person.verantwortlicher.getHochschule() + "_"
+		LOGGER.info("Setting new name: " + formatter.format(new Date()) + "_"
+				+ person.verantwortlicher.getHochschule() + "_"
 				+ person.verantwortlicher.getUsername() + "_"
 				+ Image.image.getImagename() + ".vmdk");
 		Image.image.setNewName(formatter.format(new Date()) + "_"
@@ -523,56 +557,61 @@ public class FTPCreateUploader_GUI extends JFrame implements
 	}
 
 	public void propertyChange(PropertyChangeEvent arg0) {
-		progress = 0;
-		if ("progress" == arg0.getPropertyName()) {
-			progress = (Integer) arg0.getNewValue();
-			progressBar.setValue(progress);
 
-		}
+		if (isAborted == false) {
+			progress = 0;
+			if ("progress" == arg0.getPropertyName()) {
+				progress = (Integer) arg0.getNewValue();
+				progressBar.setValue(progress);
 
-		// Fertigstellen erlauben wenn upload abgeschlossen
-		if (isCurrentlyLoading() == false) {
-			// isCurrentlyLoading();
-			finishButton.setEnabled(true);
-		} else {
-			finishButton.setEnabled(false);
-		}
+			}
 
-		if ("speed" == arg0.getPropertyName()) {
-			speed = (double) arg0.getNewValue();
-			// if(speed<=1){
+			// Fertigstellen erlauben wenn upload abgeschlossen und abbrechen
+			// erlauben wenn kein load aktiv ist
+			if (isCurrentlyLoading() == false) {
+				// no upload
+				btnUploadStoppen.setEnabled(false);
+				btnFinish.setEnabled(true);
+			} else {
+				// upload
+				btnUploadStoppen.setEnabled(true);
+				btnFinish.setEnabled(false);
+			}
 
-			UpSpeed.setText(String.valueOf(speed).substring(0,
-					String.valueOf(speed).lastIndexOf(".") + 3)
-					+ " MB/s");
+			if ("speed" == arg0.getPropertyName()) {
+				speed = (double) arg0.getNewValue();
+				// if(speed<=1){
 
-		}
-		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");
+				lblUpSpeed.setText(String.valueOf(speed).substring(0,
+						String.valueOf(speed).lastIndexOf(".") + 3)
+						+ " MB/s");
 
-		}
-		if ("filesize" == arg0.getPropertyName()) {
-			filesize = (long) arg0.getNewValue();
-			labelfilesize.setText((filesize / 1024 / 1024) + " MB");
+			}
+			if ("bytesread" == arg0.getPropertyName()) {
+				bytesread = (long) arg0.getNewValue();
+				lblFertig.setText((bytesread / 1024 / 1024) + " MB");
+				lblVerbleibend
+						.setText(((filesize / 1024 / 1024) - (bytesread / 1024 / 1024))
+								+ " MB");
+
+				lblZeit.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();
+				lblFilesize.setText((filesize / 1024 / 1024) + " MB");
 
-	}
+			}
+		} //end if(isAborted==false)
+	}//end propertyChange
 
 	public boolean writeData() {
 
@@ -617,8 +656,8 @@ public class FTPCreateUploader_GUI extends JFrame implements
 	public boolean isCurrentlyLoading() {
 		isCurrentlyLoading = false;
 
-		if (labelverbleibend.getText().equals("0 MB")
-				|| labelverbleibend.getText().equals("0")) {
+		if (lblVerbleibend.getText().equals("0 MB")
+				|| lblVerbleibend.getText().equals("0")) {
 			isCurrentlyLoading = false;
 		} else {
 			isCurrentlyLoading = true;
@@ -627,4 +666,21 @@ public class FTPCreateUploader_GUI extends JFrame implements
 		return isCurrentlyLoading;
 	}// end isCurrentlyLoading()
 
+	public void resetValues() {
+		lblUpSpeed.setText("0");
+		lblZeit.setText("0");
+		lblFertig.setText("0");
+		lblFilesize.setText("0");
+		lblVerbleibend.setText("0");
+		progressBar.setValue(0);
+	}// end resetValues
+	
+	
+	public void resetButtons(){
+		btnFinish.setEnabled(false);
+		btnUploadStarten.setEnabled(true);
+		btnUploadStarten.setText("Upload starten");
+		btnUploadStoppen.setEnabled(false);
+		
+	}//end resetButtons
 }// end class
\ No newline at end of file
diff --git a/dozentenmodul/src/main/java/gui/image/FTPEditDownloader_GUI.java b/dozentenmodul/src/main/java/gui/image/FTPEditDownloader_GUI.java
index 42a2c20c..295c3bcc 100644
--- a/dozentenmodul/src/main/java/gui/image/FTPEditDownloader_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/FTPEditDownloader_GUI.java
@@ -62,13 +62,14 @@ public class FTPEditDownloader_GUI extends JFrame implements
 	/**
 	 * Logger instance for this class.
 	 */
-	private final static Logger LOGGER = Logger.getLogger(FTPEditDownloader_GUI.class);
-	
+	private final static Logger LOGGER = Logger
+			.getLogger(FTPEditDownloader_GUI.class);
+
 	@SuppressWarnings("unused")
 	private JPanel contentPane;
 	private final JPanel contentPanel = new JPanel();
 	JLabel lblPath;
-	JLabel downspeed;
+	JLabel lblDownSpeed;
 	User user;
 	JProgressBar progressBar;
 	String host = SessionData.session.getServerAdress();
@@ -76,23 +77,25 @@ public class FTPEditDownloader_GUI extends JFrame implements
 	String downloadFile = "";
 	static String arg = "";
 	DownloadTask task;
-	JLabel lblBytesread;
-	JLabel lblNewLabel_3;
-	JLabel labelVerbleibend;
+	JLabel lblFertig;
+	JLabel lblFilesize;
+	JLabel lblVerbleibend;
 	JFileChooser fc;
 	long filesize;
 	double speed;
 	int progress = 0; // progress of download
 	long bytesread;
-	JLabel labelZeit;
+	JLabel lblZeit;
 	boolean taskrun = false;
 	ThriftConnection con = new ThriftConnection();
 	Client client = models.Client.clientcon.getClient();
 	JButton btnZurck = new JButton("Zurück");
 	JButton btnDownloadStarten = new JButton("Download starten");
+	JButton btnDownloadStoppen = new JButton("Download abbrechen");
 	private JLabel lblAnleitung;
 	private boolean isCurrentlyLoading = false; // currently up or downloading
 												// file
+	private boolean isAborted = false; // down- or upload was manually aborted
 
 	/**
 	 * Create the frame.
@@ -169,7 +172,8 @@ public class FTPEditDownloader_GUI extends JFrame implements
 					if (dir != null) {
 						// is selected
 						// create dir if it does not exists.
-						if (!dir.exists()) dir.mkdirs();
+						if (!dir.exists())
+							dir.mkdirs();
 						lblPath.setText(dir.getAbsolutePath());
 					} else {
 						// no directory selected
@@ -223,42 +227,42 @@ public class FTPEditDownloader_GUI extends JFrame implements
 		lblDownloadgeschwindigkeit.setBounds(102, 275, 141, 14);
 		contentPanel.add(lblDownloadgeschwindigkeit);
 
-		downspeed = new JLabel("0");
-		downspeed.setBounds(374, 275, 117, 14);
-		contentPanel.add(downspeed);
+		lblDownSpeed = new JLabel("0");
+		lblDownSpeed.setBounds(374, 275, 117, 14);
+		contentPanel.add(lblDownSpeed);
 
-		JLabel lblFertig = new JLabel("Fertig:");
-		lblFertig.setBounds(102, 325, 46, 14);
-		contentPanel.add(lblFertig);
+		JLabel lblFertig_1 = new JLabel("Fertig:");
+		lblFertig_1.setBounds(102, 325, 46, 14);
+		contentPanel.add(lblFertig_1);
 
-		lblBytesread = new JLabel("0");
-		lblBytesread.setBounds(183, 325, 108, 14);
-		contentPanel.add(lblBytesread);
+		lblFertig = new JLabel("0");
+		lblFertig.setBounds(183, 325, 108, 14);
+		contentPanel.add(lblFertig);
 
 		JLabel lblVon = new JLabel("von:");
 		lblVon.setBounds(318, 325, 46, 14);
 		contentPanel.add(lblVon);
 
-		lblNewLabel_3 = new JLabel("0");
-		lblNewLabel_3.setBounds(374, 325, 117, 14);
-		contentPanel.add(lblNewLabel_3);
+		lblFilesize = new JLabel("0");
+		lblFilesize.setBounds(374, 325, 117, 14);
+		contentPanel.add(lblFilesize);
 
 		JLabel lblMbVerbleibend = new JLabel("Verbleibend:");
 		lblMbVerbleibend.setBounds(102, 350, 71, 14);
 		contentPanel.add(lblMbVerbleibend);
 
-		labelVerbleibend = new JLabel("0");
-		labelVerbleibend.setBounds(183, 350, 108, 14);
-		contentPanel.add(labelVerbleibend);
+		lblVerbleibend = new JLabel("0");
+		lblVerbleibend.setBounds(183, 350, 108, 14);
+		contentPanel.add(lblVerbleibend);
 
 		JLabel lblGeschtzteVerbleibendeZeit = new JLabel(
 				"Geschätzte Verbleibende Zeit:");
 		lblGeschtzteVerbleibendeZeit.setBounds(102, 300, 150, 14);
 		contentPanel.add(lblGeschtzteVerbleibendeZeit);
 
-		labelZeit = new JLabel("0");
-		labelZeit.setBounds(374, 300, 117, 14);
-		contentPanel.add(labelZeit);
+		lblZeit = new JLabel("0");
+		lblZeit.setBounds(374, 300, 117, 14);
+		contentPanel.add(lblZeit);
 
 		JPanel panel = new JPanel();
 		panel.setLayout(null);
@@ -398,6 +402,28 @@ public class FTPEditDownloader_GUI extends JFrame implements
 		});
 		lblAnleitung.setBounds(102, 448, 311, 14);
 		contentPanel.add(lblAnleitung);
+		btnDownloadStoppen.addActionListener(new ActionListener() {
+			public void actionPerformed(ActionEvent e) {
+
+				isAborted = true; // set flag
+				try {
+					client.DeleteFtpUser(user.userName);
+					LOGGER.info("Deleted FTP user.");
+				} catch (TException e1) {
+					// TODO Auto-generated catch block
+					e1.printStackTrace();
+				}
+				task.cancel(true);
+				resetValues();
+
+				// reset buttons
+				resetButtons();
+			}
+		});
+
+		btnDownloadStoppen.setEnabled(false);
+		btnDownloadStoppen.setBounds(305, 200, 173, 23);
+		contentPanel.add(btnDownloadStoppen);
 		{
 			JPanel buttonPane = new JPanel();
 			buttonPane.setBackground(UIManager.getColor("Button.background"));
@@ -440,12 +466,13 @@ public class FTPEditDownloader_GUI extends JFrame implements
 							dispose();
 
 						}// end else
-						// always save download path
+							// always save download path
 						File f = new File(lblPath.getText());
 						if (f.isDirectory()) {
 							Config.setLastDownloadPath(f.toString());
 						} else if (f.getParentFile().isDirectory()) {
-							Config.setLastDownloadPath(f.getParentFile().toString());
+							Config.setLastDownloadPath(f.getParentFile()
+									.toString());
 						}
 						Config.store();
 
@@ -461,6 +488,7 @@ public class FTPEditDownloader_GUI extends JFrame implements
 
 	private void buttonDownloadActionPerformed(ActionEvent event) {
 
+		isAborted = false;
 		progressBar.setValue(0);
 		btnDownloadStarten.setEnabled(false); // verhindert schnellen zweiten
 												// Klick
@@ -491,51 +519,62 @@ public class FTPEditDownloader_GUI extends JFrame implements
 
 	public void propertyChange(PropertyChangeEvent arg0) {
 
-		progress = 0;
-		if ("progress" == arg0.getPropertyName()) {
-			progress = (Integer) arg0.getNewValue();
-			progressBar.setValue(progress);
-		}
+		if (isAborted == false) {
+			progress = 0;
+			if ("progress" == arg0.getPropertyName()) {
+				progress = (Integer) arg0.getNewValue();
+				progressBar.setValue(progress);
+			}
 
-		if ("speed" == arg0.getPropertyName()) {
-			speed = (double) arg0.getNewValue();
+			if ("speed" == arg0.getPropertyName()) {
+				speed = (double) arg0.getNewValue();
 
-			downspeed.setText(String.valueOf(speed).substring(0,
-					String.valueOf(speed).lastIndexOf(".") + 3)
-					+ " MB/s");
+				lblDownSpeed.setText(String.valueOf(speed).substring(0,
+						String.valueOf(speed).lastIndexOf(".") + 3)
+						+ " MB/s");
+			}
 
-		}
-		if ("bytesread" == arg0.getPropertyName()) {
-			bytesread = (long) arg0.getNewValue();
-			lblBytesread.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");
+			// Button zum Fertigstellen freischalten, wenn 100% erreicht sind
+			if (isCurrentlyLoading() == false) {
+				// not uploading currently
+				btnDownloadStoppen.setEnabled(false);
+			} else {
+				// currently uploading, don't let user interact
+				btnDownloadStoppen.setEnabled(true);
+			}
 
-		}
-		if ("filesize" == arg0.getPropertyName()) {
-			filesize = (long) arg0.getNewValue();
-			lblNewLabel_3.setText((filesize / 1024 / 1024) + " MB");
+			if ("bytesread" == arg0.getPropertyName()) {
+				bytesread = (long) arg0.getNewValue();
+				lblFertig.setText((bytesread / 1024 / 1024) + " MB");
+				lblVerbleibend
+						.setText(((filesize / 1024 / 1024) - (bytesread / 1024 / 1024))
+								+ " MB");
+
+				lblZeit.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();
+				lblFilesize.setText((filesize / 1024 / 1024) + " MB");
+
+			}
+		}// end if
 
 	}// end PropertyChange()
 
 	public boolean isCurrentlyLoading() {
 		isCurrentlyLoading = false;
 
-		if (labelVerbleibend.getText().equals("0 MB") || labelVerbleibend.getText().equals("0")) {
+		if (lblVerbleibend.getText().equals("0 MB")
+				|| lblVerbleibend.getText().equals("0")) {
 			isCurrentlyLoading = false;
 		} else {
 			isCurrentlyLoading = true;
@@ -543,4 +582,21 @@ public class FTPEditDownloader_GUI extends JFrame implements
 		return isCurrentlyLoading;
 	}// end isCurrentlyLoading()
 
+	public void resetValues() {
+		lblDownSpeed.setText("0");
+		lblZeit.setText("0");
+		lblFertig.setText("0");
+		lblFilesize.setText("0");
+		lblVerbleibend.setText("0");
+		progressBar.setValue(0);
+	}// end resetValues
+
+	public void resetButtons() {
+		// btnFinish.setEnabled(false);
+		btnDownloadStarten.setEnabled(true);
+		btnDownloadStarten.setText("Download starten");
+		btnDownloadStoppen.setEnabled(false);
+
+	}// end resetButtons
+
 }// end class
diff --git a/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java b/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java
index ca7c1d48..ec97287f 100644
--- a/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java
@@ -65,8 +65,9 @@ public class FTPEditUploader_GUI extends JFrame implements
 	/**
 	 * Logger instance for this class.
 	 */
-	private final static Logger LOGGER = Logger.getLogger(FTPEditUploader_GUI.class);
-	
+	private final static Logger LOGGER = Logger
+			.getLogger(FTPEditUploader_GUI.class);
+
 	@SuppressWarnings("unused")
 	private JPanel contentPane;
 	private final JPanel contentPanel = new JPanel();
@@ -79,11 +80,11 @@ public class FTPEditUploader_GUI extends JFrame implements
 	File uploadFile;
 	static String arg = "";
 	UploadTask task;
-	JLabel UpSpeed;
-	JLabel labelfertig;
-	JLabel labelfilesize;
-	JLabel labelZeit;
-	JLabel labelverbleibend;
+	JLabel lblUpSpeed;
+	JLabel lblFertig;
+	JLabel lblFilesize;
+	JLabel lblZeit;
+	JLabel lblVerbleibend;
 	JFileChooser fc;
 	long filesize;
 	double speed;
@@ -95,10 +96,12 @@ public class FTPEditUploader_GUI extends JFrame implements
 	Client client = models.Client.clientcon.getClient();
 	JButton btnUploadStarten = new JButton("Upload auf Server starten");
 	JButton btnSpeicherortAuswhlen = new JButton("Image auswählen");
-	JButton finishButton = new JButton("Fertigstellen");
+	JButton btnFinish = new JButton("Fertigstellen");
 	JButton btnZurck = new JButton("Zurück");
+	JButton btnUploadStoppen = new JButton("Upload abbrechen");
 	private boolean isCurrentlyLoading = false; // currently up or downloading
 												// file
+	private boolean isAborted = false; // down- or upload was manually aborted
 
 	/**
 	 * Create the frame.
@@ -192,7 +195,7 @@ public class FTPEditUploader_GUI extends JFrame implements
 
 		lblPath = new JLabel("");
 		lblPath.setText(Config.getLastUploadPath());
-		
+
 		lblPath.addPropertyChangeListener(new PropertyChangeListener() {
 			public void propertyChange(PropertyChangeEvent arg0) {
 				if (lblPath.getText().isEmpty()) {
@@ -234,21 +237,21 @@ public class FTPEditUploader_GUI extends JFrame implements
 		label_1.setBounds(102, 325, 46, 14);
 		contentPanel.add(label_1);
 
-		labelfertig = new JLabel("0");
-		labelfertig.setBounds(183, 325, 108, 14);
-		contentPanel.add(labelfertig);
+		lblFertig = new JLabel("0");
+		lblFertig.setBounds(183, 325, 108, 14);
+		contentPanel.add(lblFertig);
 
-		UpSpeed = new JLabel("0");
-		UpSpeed.setBounds(374, 275, 117, 14);
-		contentPanel.add(UpSpeed);
+		lblUpSpeed = new JLabel("0");
+		lblUpSpeed.setBounds(374, 275, 117, 14);
+		contentPanel.add(lblUpSpeed);
 
 		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);
+		lblFilesize = new JLabel("0");
+		lblFilesize.setBounds(374, 325, 117, 14);
+		contentPanel.add(lblFilesize);
 
 		JLabel label_6 = new JLabel("Verbleibend:");
 		label_6.setBounds(102, 350, 71, 14);
@@ -258,13 +261,13 @@ public class FTPEditUploader_GUI extends JFrame implements
 		label_7.setBounds(102, 300, 150, 14);
 		contentPanel.add(label_7);
 
-		labelZeit = new JLabel("0");
-		labelZeit.setBounds(374, 300, 117, 14);
-		contentPanel.add(labelZeit);
+		lblZeit = new JLabel("0");
+		lblZeit.setBounds(374, 300, 117, 14);
+		contentPanel.add(lblZeit);
 
-		labelverbleibend = new JLabel("0");
-		labelverbleibend.setBounds(183, 350, 108, 14);
-		contentPanel.add(labelverbleibend);
+		lblVerbleibend = new JLabel("0");
+		lblVerbleibend.setBounds(183, 350, 108, 14);
+		contentPanel.add(lblVerbleibend);
 
 		JPanel panel = new JPanel();
 		panel.setLayout(null);
@@ -330,6 +333,29 @@ public class FTPEditUploader_GUI extends JFrame implements
 		JLabel label_2 = new JLabel("Klicken Sie auf \"Fertigstellen\".");
 		label_2.setBounds(98, 423, 241, 14);
 		contentPanel.add(label_2);
+		btnUploadStoppen.addActionListener(new ActionListener() {
+			public void actionPerformed(ActionEvent e) {
+
+				isAborted = true; // set flag
+				try {
+					client.DeleteFtpUser(user.userName);
+					LOGGER.info("Deleted FTP user.");
+				} catch (TException e1) {
+					// TODO Auto-generated catch block
+					e1.printStackTrace();
+				}
+				task.cancel(true);
+				resetValues();
+
+				// reset buttons
+				resetButtons();
+
+			}
+		});
+
+		btnUploadStoppen.setEnabled(false);
+		btnUploadStoppen.setBounds(301, 200, 173, 23);
+		contentPanel.add(btnUploadStoppen);
 		{
 			JPanel buttonPane = new JPanel();
 			buttonPane.setBackground(UIManager.getColor("Button.background"));
@@ -338,7 +364,7 @@ public class FTPEditUploader_GUI extends JFrame implements
 			{
 
 				// finishButton.setEnabled(false);
-				finishButton.addActionListener(new ActionListener() {
+				btnFinish.addActionListener(new ActionListener() {
 					public void actionPerformed(ActionEvent e) {
 
 						updateData();
@@ -346,7 +372,8 @@ public class FTPEditUploader_GUI extends JFrame implements
 						if (f.isDirectory()) {
 							Config.setLastUploadPath(f.toString());
 						} else if (f.getParentFile().isDirectory()) {
-							Config.setLastUploadPath(f.getParentFile().toString());
+							Config.setLastUploadPath(f.getParentFile()
+									.toString());
 						}
 						Config.store();
 
@@ -411,8 +438,8 @@ public class FTPEditUploader_GUI extends JFrame implements
 
 				btnZurck.setActionCommand("Cancel");
 				buttonPane.add(btnZurck);
-				finishButton.setActionCommand("Cancel");
-				buttonPane.add(finishButton);
+				btnFinish.setActionCommand("Cancel");
+				buttonPane.add(btnFinish);
 			}
 		}
 
@@ -432,9 +459,7 @@ public class FTPEditUploader_GUI extends JFrame implements
 				URI windows;
 				try {
 					windows = new URI(Links.getFAQ());
-
 					open.openWebpage(windows);
-
 				} catch (URISyntaxException e) {
 					// TODO Auto-generated catch block
 					e.printStackTrace();
@@ -455,9 +480,7 @@ public class FTPEditUploader_GUI extends JFrame implements
 				URI windows;
 				try {
 					windows = new URI(Links.getOTRS());
-
 					open.openWebpage(windows);
-
 				} catch (URISyntaxException e) {
 					// TODO Auto-generated catch block
 					e.printStackTrace();
@@ -481,6 +504,8 @@ public class FTPEditUploader_GUI extends JFrame implements
 	}
 
 	private void buttonUploadActionPerformed(ActionEvent event) {
+
+		isAborted = false;
 		fileupload = true;
 		progressBar.setValue(0);
 		btnUploadStarten.setEnabled(false); // verhindert einen weiteren klick
@@ -496,13 +521,13 @@ public class FTPEditUploader_GUI extends JFrame implements
 			// TODO Auto-generated catch block
 			e.printStackTrace();
 			JOptionPane.showMessageDialog(null,
-					"Konnte vom Satelliten keine FTP-User erhalten!", "Debug-Message",
-					JOptionPane.ERROR_MESSAGE);
+					"Konnte vom Satelliten keine FTP-User erhalten!",
+					"Debug-Message", JOptionPane.ERROR_MESSAGE);
 		}
 		DateFormat formatter = new SimpleDateFormat("yyyMMddhhmmss");
 
-		LOGGER.info("Setting new Name: " + formatter.format(new Date())
-				+ "_" + person.verantwortlicher.getHochschule() + "_"
+		LOGGER.info("Setting new Name: " + formatter.format(new Date()) + "_"
+				+ person.verantwortlicher.getHochschule() + "_"
 				+ person.verantwortlicher.getUsername() + "_"
 				+ Image.image.getImagename() + ".vmdk");
 		Image.image.setNewName(formatter.format(new Date()) + "_"
@@ -519,54 +544,59 @@ public class FTPEditUploader_GUI extends JFrame implements
 	}
 
 	public void propertyChange(PropertyChangeEvent arg0) {
-		// set progressbar
-		if ("progress" == arg0.getPropertyName()) {
-			progress = (Integer) arg0.getNewValue();
-			progressBar.setValue(progress);
-		}
 
-		// Fertigstellen erlauben wenn upload abgeschlossen
-		if (isCurrentlyLoading() == true) {
-			finishButton.setEnabled(false);
-		} else {
-			finishButton.setEnabled(true);
-		}
+		if (isAborted == false) {
+			// set progressbar
+			if ("progress" == arg0.getPropertyName()) {
+				progress = (Integer) arg0.getNewValue();
+				progressBar.setValue(progress);
+			}
 
-		if ("speed" == arg0.getPropertyName()) {
-			speed = (double) arg0.getNewValue();
-			// if(speed<=1){
+			// Fertigstellen erlauben wenn upload abgeschlossen
+			if (isCurrentlyLoading() == false) {
+				// no upload
+				btnUploadStoppen.setEnabled(false);
+				btnFinish.setEnabled(true);
+			} else {
+				// upload
+				btnUploadStoppen.setEnabled(true);
+				btnFinish.setEnabled(false);
+			}
 
-			UpSpeed.setText(String.valueOf(speed).substring(0,
-					String.valueOf(speed).lastIndexOf(".") + 3)
-					+ " MB/s");
+			if ("speed" == arg0.getPropertyName()) {
+				speed = (double) arg0.getNewValue();
+				// if(speed<=1){
 
-		}
-		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");
+				lblUpSpeed.setText(String.valueOf(speed).substring(0,
+						String.valueOf(speed).lastIndexOf(".") + 3)
+						+ " MB/s");
 
-		}
-		if ("filesize" == arg0.getPropertyName()) {
-			filesize = (long) arg0.getNewValue();
-			labelfilesize.setText((filesize / 1024 / 1024) + " MB");
+			}
+			if ("bytesread" == arg0.getPropertyName()) {
+				bytesread = (long) arg0.getNewValue();
+				lblFertig.setText((bytesread / 1024 / 1024) + " MB");
+				lblVerbleibend
+						.setText(((filesize / 1024 / 1024) - (bytesread / 1024 / 1024))
+								+ " MB");
+
+				lblZeit.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();
+				lblFilesize.setText((filesize / 1024 / 1024) + " MB");
 
-	}
+			}
+		}// end if
+	}// end propertyChange
 
 	public boolean updateData() {
 
@@ -604,9 +634,11 @@ public class FTPEditUploader_GUI extends JFrame implements
 		} catch (TException e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
-			JOptionPane.showMessageDialog(null,
-					"Konnte die Metadaten des Images nicht in die Datenbank speichern!", "Debug-Message",
-					JOptionPane.ERROR_MESSAGE);
+			JOptionPane
+					.showMessageDialog(
+							null,
+							"Konnte die Metadaten des Images nicht in die Datenbank speichern!",
+							"Debug-Message", JOptionPane.ERROR_MESSAGE);
 			return false;
 		}
 		return true;
@@ -616,8 +648,8 @@ public class FTPEditUploader_GUI extends JFrame implements
 	public boolean isCurrentlyLoading() {
 		isCurrentlyLoading = false;
 
-		if (labelverbleibend.getText().equals("0 MB")
-				|| labelverbleibend.getText().equals("0")) {
+		if (lblVerbleibend.getText().equals("0 MB")
+				|| lblVerbleibend.getText().equals("0")) {
 			isCurrentlyLoading = false;
 		} else {
 			isCurrentlyLoading = true;
@@ -625,4 +657,21 @@ public class FTPEditUploader_GUI extends JFrame implements
 		return isCurrentlyLoading;
 	}// end isCurrentlyLoading()
 
+	public void resetValues() {
+		lblUpSpeed.setText("0");
+		lblZeit.setText("0");
+		lblFertig.setText("0");
+		lblFilesize.setText("0");
+		lblVerbleibend.setText("0");
+		progressBar.setValue(0);
+	}// end resetValues
+
+	public void resetButtons() {
+		btnFinish.setEnabled(false);
+		btnUploadStarten.setEnabled(true);
+		btnUploadStarten.setText("Upload starten");
+		btnUploadStoppen.setEnabled(false);
+
+	}// end resetButtons
+
 }// end class
\ No newline at end of file
diff --git a/dozentenmodul/src/main/java/gui/image/FTPSearchDownloader_GUI.java b/dozentenmodul/src/main/java/gui/image/FTPSearchDownloader_GUI.java
index 7bc00fd8..dc5de7b0 100644
--- a/dozentenmodul/src/main/java/gui/image/FTPSearchDownloader_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/FTPSearchDownloader_GUI.java
@@ -39,6 +39,7 @@ import models.Image;
 import models.Links;
 import models.SessionData;
 
+import org.apache.log4j.Logger;
 import org.apache.thrift.TException;
 import org.ini4j.InvalidFileFormatException;
 import org.ini4j.Wini;
@@ -57,11 +58,14 @@ import config.Config;
 public class FTPSearchDownloader_GUI extends JFrame implements
 		PropertyChangeListener {
 
+	private final static Logger LOGGER = Logger
+			.getLogger(FTPEditDownloader_GUI.class);
+
 	@SuppressWarnings("unused")
 	private JPanel contentPane;
 	private final JPanel contentPanel = new JPanel();
 	JLabel lblPath;
-	JLabel downspeed;
+	JLabel lblDownSpeed;
 	User user;
 	JProgressBar progressBar;
 	String host = SessionData.session.getServerAdress();
@@ -69,24 +73,26 @@ public class FTPSearchDownloader_GUI extends JFrame implements
 	String downloadFile = "";
 	static String arg = "";
 	DownloadTask task;
-	JLabel lblBytesread;
-	JLabel lblNewLabel_3;
-	JLabel labelVerbleibend;
+	JLabel lblFertig;
+	JLabel lblFilesize;
+	JLabel lblVerbleibend;
 	JFileChooser fc;
 	long filesize;
 	double speed;
 	int progress = 0; // progress of download
 	long bytesread;
-	JLabel labelZeit;
+	JLabel lblZeit;
 	boolean taskrun = false;
 	ThriftConnection con = new ThriftConnection();
 	Client client = models.Client.clientcon.getClient();
 	JButton btnZurck = new JButton("Zurück");
 	JButton btnDownloadStarten = new JButton("Download starten");
 	JButton btnMainMenu = new JButton("Hauptmenü");
+	JButton btnDownloadStoppen = new JButton("Download abbrechen");
 	private JLabel lblAnleitung;
 	private boolean isCurrentlyLoading = false; // currently up or downloading
 												// file
+	private boolean isAborted = false; // down- or upload was manually aborted
 
 	/**
 	 * Create the frame.
@@ -164,7 +170,8 @@ public class FTPSearchDownloader_GUI extends JFrame implements
 					if (dir != null) {
 						// is selected
 						// create dir if it does not exists.
-						if (!dir.exists()) dir.mkdirs();
+						if (!dir.exists())
+							dir.mkdirs();
 						lblPath.setText(dir.getAbsolutePath());
 					} else {
 						// no directory selected
@@ -219,42 +226,42 @@ public class FTPSearchDownloader_GUI extends JFrame implements
 		lblDownloadgeschwindigkeit.setBounds(102, 275, 141, 14);
 		contentPanel.add(lblDownloadgeschwindigkeit);
 
-		downspeed = new JLabel("0");
-		downspeed.setBounds(374, 275, 117, 14);
-		contentPanel.add(downspeed);
+		lblDownSpeed = new JLabel("0");
+		lblDownSpeed.setBounds(374, 275, 117, 14);
+		contentPanel.add(lblDownSpeed);
 
-		JLabel lblFertig = new JLabel("Fertig:");
-		lblFertig.setBounds(102, 325, 46, 14);
-		contentPanel.add(lblFertig);
+		JLabel lblFertig_1 = new JLabel("Fertig:");
+		lblFertig_1.setBounds(102, 325, 46, 14);
+		contentPanel.add(lblFertig_1);
 
-		lblBytesread = new JLabel("0");
-		lblBytesread.setBounds(183, 325, 108, 14);
-		contentPanel.add(lblBytesread);
+		lblFertig = new JLabel("0");
+		lblFertig.setBounds(183, 325, 108, 14);
+		contentPanel.add(lblFertig);
 
 		JLabel lblVon = new JLabel("von:");
 		lblVon.setBounds(318, 325, 46, 14);
 		contentPanel.add(lblVon);
 
-		lblNewLabel_3 = new JLabel("0");
-		lblNewLabel_3.setBounds(374, 325, 117, 14);
-		contentPanel.add(lblNewLabel_3);
+		lblFilesize = new JLabel("0");
+		lblFilesize.setBounds(374, 325, 117, 14);
+		contentPanel.add(lblFilesize);
 
 		JLabel lblMbVerbleibend = new JLabel("Verbleibend:");
 		lblMbVerbleibend.setBounds(102, 350, 71, 14);
 		contentPanel.add(lblMbVerbleibend);
 
-		labelVerbleibend = new JLabel("0");
-		labelVerbleibend.setBounds(183, 350, 108, 14);
-		contentPanel.add(labelVerbleibend);
+		lblVerbleibend = new JLabel("0");
+		lblVerbleibend.setBounds(183, 350, 108, 14);
+		contentPanel.add(lblVerbleibend);
 
 		JLabel lblGeschtzteVerbleibendeZeit = new JLabel(
 				"Geschätzte Verbleibende Zeit:");
 		lblGeschtzteVerbleibendeZeit.setBounds(102, 300, 150, 14);
 		contentPanel.add(lblGeschtzteVerbleibendeZeit);
 
-		labelZeit = new JLabel("0");
-		labelZeit.setBounds(374, 300, 117, 14);
-		contentPanel.add(labelZeit);
+		lblZeit = new JLabel("0");
+		lblZeit.setBounds(374, 300, 117, 14);
+		contentPanel.add(lblZeit);
 
 		JPanel panel = new JPanel();
 		panel.setLayout(null);
@@ -404,6 +411,28 @@ public class FTPSearchDownloader_GUI extends JFrame implements
 		});
 		lblAnleitung.setBounds(102, 448, 311, 14);
 		contentPanel.add(lblAnleitung);
+		btnDownloadStoppen.addActionListener(new ActionListener() {
+			public void actionPerformed(ActionEvent e) {
+
+				isAborted = true; // set flag
+				try {
+					client.DeleteFtpUser(user.userName);
+					LOGGER.info("Deleted FTP user.");
+				} catch (TException e1) {
+					// TODO Auto-generated catch block
+					e1.printStackTrace();
+				}
+				task.cancel(true);
+				resetValues();
+
+				// reset buttons
+				resetButtons();
+			}
+		});
+
+		btnDownloadStoppen.setEnabled(false);
+		btnDownloadStoppen.setBounds(306, 200, 173, 23);
+		contentPanel.add(btnDownloadStoppen);
 
 		{
 			JPanel buttonPane = new JPanel();
@@ -444,10 +473,10 @@ public class FTPSearchDownloader_GUI extends JFrame implements
 							si.setVisible(true);
 							dispose();
 						}// end else
-						// save config in any case
+							// save config in any case
 						Config.setLastDownloadPath(lblPath.getText());
 						Config.store();
-					}//end action
+					}// end action
 				});
 				btnZurck.setActionCommand("Cancel");
 				buttonPane.add(btnZurck);
@@ -457,7 +486,7 @@ public class FTPSearchDownloader_GUI extends JFrame implements
 				public void actionPerformed(ActionEvent arg0) {
 					Config.setLastDownloadPath(lblPath.getText());
 					Config.store();
-					
+
 					MainMenue_GUI mm = new MainMenue_GUI();
 					mm.setVisible(true);
 					dispose();
@@ -472,6 +501,7 @@ public class FTPSearchDownloader_GUI extends JFrame implements
 
 	private void buttonDownloadActionPerformed(ActionEvent event) {
 
+		isAborted = false;
 		progressBar.setValue(0);
 		btnDownloadStarten.setEnabled(false); // verhindert schnellen zweiten
 												// Klick
@@ -502,61 +532,64 @@ public class FTPSearchDownloader_GUI extends JFrame implements
 
 	public void propertyChange(PropertyChangeEvent arg0) {
 
-		progress = 0;
-		if ("progress" == arg0.getPropertyName()) {
-			progress = (Integer) arg0.getNewValue();
-			progressBar.setValue(progress);
-		}
-
-		// Button zum Fertigstellen freischalten, wenn 100% erreicht sind
-		if (isCurrentlyLoading() == true) {
-			// not uploading currently
-			btnMainMenu.setEnabled(false);
-		} else {
-			// currently uploading, don't let user interact
-			btnMainMenu.setEnabled(true);
-		}
+		if (isAborted == false) {
+			progress = 0;
+			if ("progress" == arg0.getPropertyName()) {
+				progress = (Integer) arg0.getNewValue();
+				progressBar.setValue(progress);
+			}
 
-		if ("speed" == arg0.getPropertyName()) {
-			speed = (double) arg0.getNewValue();
-			// if(speed<=1){
+			// Button zum Fertigstellen freischalten, wenn 100% erreicht sind
+			if (isCurrentlyLoading() == false) {
+				// not uploading currently
+				btnDownloadStoppen.setEnabled(false);
+				btnMainMenu.setEnabled(true);
+			} else {
+				// currently uploading, don't let user interact
+				btnDownloadStoppen.setEnabled(true);
+				btnMainMenu.setEnabled(false);
+			}
 
-			downspeed.setText(String.valueOf(speed).substring(0,
-					String.valueOf(speed).lastIndexOf(".") + 3)
-					+ " MB/s");
+			if ("speed" == arg0.getPropertyName()) {
+				speed = (double) arg0.getNewValue();
+				// if(speed<=1){
 
-		}
-		if ("bytesread" == arg0.getPropertyName()) {
-			bytesread = (long) arg0.getNewValue();
-			lblBytesread.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");
+				lblDownSpeed.setText(String.valueOf(speed).substring(0,
+						String.valueOf(speed).lastIndexOf(".") + 3)
+						+ " MB/s");
 
-		}
-		if ("filesize" == arg0.getPropertyName()) {
-			filesize = (long) arg0.getNewValue();
-			lblNewLabel_3.setText((filesize / 1024 / 1024) + " MB");
+			}
+			if ("bytesread" == arg0.getPropertyName()) {
+				bytesread = (long) arg0.getNewValue();
+				lblFertig.setText((bytesread / 1024 / 1024) + " MB");
+				lblVerbleibend
+						.setText(((filesize / 1024 / 1024) - (bytesread / 1024 / 1024))
+								+ " MB");
+
+				lblZeit.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();
+				lblFilesize.setText((filesize / 1024 / 1024) + " MB");
 
-	}
+			}
+		}// end if
+	}// end propertyChange
 
 	public boolean isCurrentlyLoading() {
 		isCurrentlyLoading = false;
 
-		if (labelVerbleibend.getText().equals("0 MB") || labelVerbleibend.getText().equals("0")) {
+		if (lblVerbleibend.getText().equals("0 MB")
+				|| lblVerbleibend.getText().equals("0")) {
 			isCurrentlyLoading = false;
 		} else {
 			isCurrentlyLoading = true;
@@ -564,4 +597,21 @@ public class FTPSearchDownloader_GUI extends JFrame implements
 		return isCurrentlyLoading;
 	}// end isCurrentlyLoading()
 
+	public void resetValues() {
+		lblDownSpeed.setText("0");
+		lblZeit.setText("0");
+		lblFertig.setText("0");
+		lblFilesize.setText("0");
+		lblVerbleibend.setText("0");
+		progressBar.setValue(0);
+	}// end resetValues
+
+	public void resetButtons() {
+		// btnFinish.setEnabled(false);
+		btnDownloadStarten.setEnabled(true);
+		btnDownloadStarten.setText("Download starten");
+		btnDownloadStoppen.setEnabled(false);
+
+	}// end resetButtons
+
 }// end class
\ No newline at end of file