1 files changed, 13 insertions, 2 deletions

diff --git a/Dozentenmodul/src/GUI/FTPUploader.java b/Dozentenmodul/src/GUI/FTPUploader.java
index 97a6eccb..ee72e7f7 100644
--- a/Dozentenmodul/src/GUI/FTPUploader.java
+++ b/Dozentenmodul/src/GUI/FTPUploader.java
@@ -31,6 +31,8 @@ import java.awt.event.ActionListener;
 import java.awt.event.ActionEvent;

 import java.beans.PropertyChangeEvent;

 import java.beans.PropertyChangeListener;

+import java.awt.event.WindowAdapter;

+import java.awt.event.WindowEvent;

 

 @SuppressWarnings("serial")

 public class FTPUploader extends JFrame implements PropertyChangeListener {

@@ -49,6 +51,7 @@ public class FTPUploader extends JFrame implements PropertyChangeListener {
 	String filename="";

 	File uploadFile;

 	static String arg="";

+	 UploadTask task;

 	/**

 	 * Launch the application.

 	 */

@@ -69,6 +72,13 @@ public class FTPUploader extends JFrame implements PropertyChangeListener {
 	 * Create the frame.

 	 */

 	public FTPUploader() {

+		addWindowListener(new WindowAdapter() {

+			@Override

+			public void windowClosing(WindowEvent arg0) {

+				task.cancel(true);

+			}

+		});

+		setResizable(false);

 		//setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);

 		

 		

@@ -143,7 +153,7 @@ public class FTPUploader extends JFrame implements PropertyChangeListener {
 		contentPanel.add(UpSpeed);

 		{

 			JPanel buttonPane = new JPanel();

-			buttonPane.setBackground(Color.WHITE);

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

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

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

 			{

@@ -161,6 +171,7 @@ public class FTPUploader extends JFrame implements PropertyChangeListener {
 				JButton cancelButton = new JButton("Zur\u00FCck");

 				cancelButton.addActionListener(new ActionListener() {

 					public void actionPerformed(ActionEvent e) {

+						task.cancel(true);

 						dispose();

 					}

 				});

@@ -178,7 +189,7 @@ public class FTPUploader extends JFrame implements PropertyChangeListener {
     	//if(nextStep==true)

     	//{

         progressBar.setValue(0);

-        UploadTask task=new UploadTask(host,port,username,password,uploadPath, uploadFile);

+        task=new UploadTask(host,port,username,password,uploadPath, uploadFile);

         task.addPropertyChangeListener(this);

         task.execute();