Die Anwendung wird nun korrekt beendet.

Bei Schließen der Upload- und Downloadfenster wird der jeweilige Vorgang
nun abgebrochen.

13 files changed, 126 insertions, 5 deletions

diff --git a/Dozentenmodul/src/GUI/ActionChooser.java b/Dozentenmodul/src/GUI/ActionChooser.java
index 71f1be92..7e65b673 100644
--- a/Dozentenmodul/src/GUI/ActionChooser.java
+++ b/Dozentenmodul/src/GUI/ActionChooser.java
@@ -21,6 +21,8 @@ import javax.swing.ButtonGroup;
 import javax.swing.JMenuBar;

 import javax.swing.JMenu;

 import javax.swing.JMenuItem;

+import java.awt.event.WindowAdapter;

+import java.awt.event.WindowEvent;

 

 @SuppressWarnings("serial")

 public class ActionChooser extends JDialog {

@@ -36,7 +38,7 @@ public class ActionChooser extends JDialog {
 	public static void main(String[] args) {

 		try {

 			ActionChooser dialog = new ActionChooser();

-			dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);

+			dialog.setDefaultCloseOperation(JDialog.HIDE_ON_CLOSE);

 			dialog.setVisible(true);

 		} catch (Exception e) {

 			e.printStackTrace();

@@ -47,6 +49,12 @@ public class ActionChooser extends JDialog {
 	 * Create the dialog.

 	 */

 	public ActionChooser() {

+		addWindowListener(new WindowAdapter() {

+			@Override

+			public void windowClosing(WindowEvent arg0) {

+				System.exit(0);

+			}

+		});

 		try {

 			UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());

 		} catch (ClassNotFoundException | InstantiationException

diff --git a/Dozentenmodul/src/GUI/AddOS.java b/Dozentenmodul/src/GUI/AddOS.java
index 045031bd..0572b18c 100644
--- a/Dozentenmodul/src/GUI/AddOS.java
+++ b/Dozentenmodul/src/GUI/AddOS.java
@@ -46,6 +46,7 @@ public class AddOS extends JDialog {
 	 */

 	@SuppressWarnings({ "rawtypes", "unchecked" })

 	public AddOS() {

+		setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);

 		setTitle("Dozentenmodul");

 		setBounds(100, 100, 288, 300);

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

diff --git a/Dozentenmodul/src/GUI/AddSoftware.java b/Dozentenmodul/src/GUI/AddSoftware.java
index c04c5012..4f9f2334 100644
--- a/Dozentenmodul/src/GUI/AddSoftware.java
+++ b/Dozentenmodul/src/GUI/AddSoftware.java
@@ -46,6 +46,7 @@ public class AddSoftware extends JDialog {
 	 */

 	@SuppressWarnings({ "rawtypes", "unchecked" })

 	public AddSoftware() {

+		setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);

 		setTitle("Dozentenmodul");

 		setBounds(100, 100, 288, 300);

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

diff --git a/Dozentenmodul/src/GUI/EingabeAllgemein.java b/Dozentenmodul/src/GUI/EingabeAllgemein.java
index 4643332e..e1811e95 100644
--- a/Dozentenmodul/src/GUI/EingabeAllgemein.java
+++ b/Dozentenmodul/src/GUI/EingabeAllgemein.java
@@ -26,6 +26,8 @@ import javax.swing.JMenu;
 import javax.swing.JMenuItem;

 

 import Models.person;

+import java.awt.event.WindowAdapter;

+import java.awt.event.WindowEvent;

 

 @SuppressWarnings("serial")

 public class EingabeAllgemein extends JDialog {

@@ -62,6 +64,12 @@ public class EingabeAllgemein extends JDialog {
 	 * Create the dialog.

 	 */

 	public EingabeAllgemein() {

+		addWindowListener(new WindowAdapter() {

+			@Override

+			public void windowClosing(WindowEvent arg0) {

+				System.exit(0);

+			}

+		});

 		setResizable(false);

 		

 		try {

diff --git a/Dozentenmodul/src/GUI/EingabeSoftwareDaten.java b/Dozentenmodul/src/GUI/EingabeSoftwareDaten.java
index 90b6fb6f..2b2d988d 100644
--- a/Dozentenmodul/src/GUI/EingabeSoftwareDaten.java
+++ b/Dozentenmodul/src/GUI/EingabeSoftwareDaten.java
@@ -29,6 +29,8 @@ import javax.swing.JMenuBar;
 import javax.swing.JMenu;

 import javax.swing.JMenuItem;

 import Models.vm;

+import java.awt.event.WindowAdapter;

+import java.awt.event.WindowEvent;

 

 

 @SuppressWarnings("serial")

@@ -59,6 +61,12 @@ public class EingabeSoftwareDaten extends JDialog {
 	 */

 	@SuppressWarnings({ })

 	public EingabeSoftwareDaten() {

+		addWindowListener(new WindowAdapter() {

+			@Override

+			public void windowClosing(WindowEvent e) {

+				System.exit(0);

+			}

+		});

 		try {

 			UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());

 		} catch (ClassNotFoundException | InstantiationException

diff --git a/Dozentenmodul/src/GUI/EingabeSystemDaten.java b/Dozentenmodul/src/GUI/EingabeSystemDaten.java
index 4a70d4b3..81071323 100644
--- a/Dozentenmodul/src/GUI/EingabeSystemDaten.java
+++ b/Dozentenmodul/src/GUI/EingabeSystemDaten.java
@@ -31,6 +31,12 @@ import javax.swing.JMenuBar;
 import javax.swing.JMenu;

 import javax.swing.JMenuItem;

 import javax.swing.JScrollPane;

+import java.awt.event.FocusAdapter;

+import java.awt.event.FocusEvent;

+import java.awt.event.MouseAdapter;

+import java.awt.event.MouseEvent;

+import java.awt.event.WindowAdapter;

+import java.awt.event.WindowEvent;

 

 @SuppressWarnings("serial")

 public class EingabeSystemDaten extends JDialog {

@@ -62,6 +68,12 @@ public class EingabeSystemDaten extends JDialog {
 	 * Create the dialog.

 	 */

 	public EingabeSystemDaten() {

+		addWindowListener(new WindowAdapter() {

+			@Override

+			public void windowClosing(WindowEvent e) {

+				System.exit(0);

+			}

+		});

 		try {

 			UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());

 		} catch (ClassNotFoundException | InstantiationException

@@ -129,6 +141,10 @@ public class EingabeSystemDaten extends JDialog {
 		contentPanel.add(lblBetriebssystem);

 		

 		choiceOS = new Choice();

+

+

+

+

 		

 		choiceOS.setBounds(170, 373, 150, 20);

 		

@@ -183,16 +199,19 @@ public class EingabeSystemDaten extends JDialog {
 		btnHinzufgen.setBounds(326, 372, 118, 23);

 		contentPanel.add(btnHinzufgen);

 		shortDesc=new JTextArea();

+		shortDesc.setFont(new Font("Tahoma", Font.PLAIN, 11));

 		shortDesc.setText(vm.vl.getShortDesc());

 		JScrollPane scrollPane = new JScrollPane(shortDesc);

 		scrollPane.setBounds(170, 67, 274, 63);

 		contentPanel.add(scrollPane);

 		longDesc=new JTextArea();

+		longDesc.setFont(new Font("Tahoma", Font.PLAIN, 11));

 		longDesc.setText(vm.vl.getLongDesc());

 		JScrollPane scrollPane_1 = new JScrollPane(longDesc);

 		scrollPane_1.setBounds(170, 139, 274, 158);

 		contentPanel.add(scrollPane_1);

 		comment=new JTextArea();

+		comment.setFont(new Font("Tahoma", Font.PLAIN, 11));

 		comment.setText(vm.vl.getComment());

 		JScrollPane scrollPane_2 = new JScrollPane(comment);

 		scrollPane_2.setBounds(170, 308, 274, 59);

diff --git a/Dozentenmodul/src/GUI/FTPDownloader.java b/Dozentenmodul/src/GUI/FTPDownloader.java
index 5f062ff0..4e676ace 100644
--- a/Dozentenmodul/src/GUI/FTPDownloader.java
+++ b/Dozentenmodul/src/GUI/FTPDownloader.java
@@ -34,6 +34,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 FTPDownloader extends JFrame implements PropertyChangeListener {

@@ -51,6 +53,7 @@ public class FTPDownloader extends JFrame implements PropertyChangeListener {
 	String downloadPath="";

 	String filename="";

 	static String arg="";

+	DownloadTask task;

 	/**

 	 * Launch the application.

 	 */

@@ -71,6 +74,15 @@ public class FTPDownloader extends JFrame implements PropertyChangeListener {
 	 * Create the frame.

 	 */

 	public FTPDownloader(String name) {

+		addWindowListener(new WindowAdapter() {

+			@Override

+			public void windowClosing(WindowEvent e) {

+				

+				task.cancel(true);

+				dispose();

+			}

+		});

+		setResizable(false);

 		//setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);

 		

 		filename=name;

@@ -141,17 +153,29 @@ public class FTPDownloader extends JFrame implements PropertyChangeListener {
 		contentPanel.add(downspeed);

 		{

 			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);

 			{

 				JButton okButton = new JButton("OK");

+				okButton.addActionListener(new ActionListener() {

+					public void actionPerformed(ActionEvent arg0) {

+						dispose();

+					}

+				});

 				okButton.setActionCommand("OK");

 				buttonPane.add(okButton);

 				getRootPane().setDefaultButton(okButton);

 			}

 			{

 				JButton cancelButton = new JButton("Zur\u00FCck");

+				cancelButton.addActionListener(new ActionListener() {

+					public void actionPerformed(ActionEvent e) {

+						

+						task.cancel(true);

+						dispose();

+					}

+				});

 				cancelButton.setActionCommand("Cancel");

 				buttonPane.add(cancelButton);

 			}

@@ -163,9 +187,10 @@ public class FTPDownloader extends JFrame implements PropertyChangeListener {
     private void buttonDownloadActionPerformed(ActionEvent event) {

  

         progressBar.setValue(0);

-        DownloadTask task = new DownloadTask(host, port, username, password,downloadPath+filename, lblNewLabel.getText(), this);

+        task = new DownloadTask(host, port, username, password,downloadPath+filename, lblNewLabel.getText(), this);

         task.addPropertyChangeListener(this);

         task.execute();

+        

 

     }

 

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();

         

diff --git a/Dozentenmodul/src/GUI/FertigStellen.java b/Dozentenmodul/src/GUI/FertigStellen.java
index 1d9734c4..4dfc92cf 100644
--- a/Dozentenmodul/src/GUI/FertigStellen.java
+++ b/Dozentenmodul/src/GUI/FertigStellen.java
@@ -23,6 +23,8 @@ import Models.person;
 import Models.vm;

 import javax.swing.JTextArea;

 import javax.swing.JScrollPane;

+import java.awt.event.WindowAdapter;

+import java.awt.event.WindowEvent;

 

 @SuppressWarnings("serial")

 public class FertigStellen extends JDialog {

@@ -48,6 +50,12 @@ public class FertigStellen extends JDialog {
 	 */

 	@SuppressWarnings("deprecation")

 	public FertigStellen() {

+		addWindowListener(new WindowAdapter() {

+			@Override

+			public void windowClosing(WindowEvent e) {

+				System.exit(0);

+			}

+		});

 		try {

 			UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());

 		} catch (ClassNotFoundException | InstantiationException

diff --git a/Dozentenmodul/src/GUI/LoginWindow.java b/Dozentenmodul/src/GUI/LoginWindow.java
index 3b292e42..19691eb2 100644
--- a/Dozentenmodul/src/GUI/LoginWindow.java
+++ b/Dozentenmodul/src/GUI/LoginWindow.java
@@ -17,6 +17,8 @@ import java.awt.event.ActionListener;
 import java.awt.event.ActionEvent;

 import javax.swing.JPasswordField;

 import java.awt.Color;

+import java.awt.event.WindowAdapter;

+import java.awt.event.WindowEvent;

 

 @SuppressWarnings("serial")

 public class LoginWindow extends JFrame {

@@ -46,6 +48,12 @@ public class LoginWindow extends JFrame {
 	 * Create the frame.

 	 */

 	public LoginWindow() {

+		addWindowListener(new WindowAdapter() {

+			@Override

+			public void windowClosing(WindowEvent e) {

+				System.exit(0);

+			}

+		});

 		

 		//Fenster darf nicht vergrößert werden

 		setResizable(false);

diff --git a/Dozentenmodul/src/GUI/Summary.java b/Dozentenmodul/src/GUI/Summary.java
index 471f32f9..db3772cf 100644
--- a/Dozentenmodul/src/GUI/Summary.java
+++ b/Dozentenmodul/src/GUI/Summary.java
@@ -25,6 +25,8 @@ import javax.swing.JScrollPane;
 import javax.swing.JTabbedPane;

 import java.awt.Panel;

 import java.text.SimpleDateFormat;

+import java.awt.event.WindowAdapter;

+import java.awt.event.WindowEvent;

 

 

 @SuppressWarnings("serial")

@@ -48,6 +50,12 @@ public class Summary extends JDialog {
 	 * Create the dialog.

 	 */

 	public Summary() {

+		addWindowListener(new WindowAdapter() {

+			@Override

+			public void windowClosing(WindowEvent e) {

+				System.exit(0);

+			}

+		});

 		try {

 			UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());

 		} catch (ClassNotFoundException | InstantiationException

diff --git a/Dozentenmodul/src/GUI/getVMwarePlayer.java b/Dozentenmodul/src/GUI/getVMwarePlayer.java
index 919df825..5709639d 100644
--- a/Dozentenmodul/src/GUI/getVMwarePlayer.java
+++ b/Dozentenmodul/src/GUI/getVMwarePlayer.java
@@ -24,6 +24,8 @@ import java.awt.event.MouseEvent;
 import java.io.IOException;

 import java.net.URI;

 import java.net.URISyntaxException;

+import java.awt.event.WindowAdapter;

+import java.awt.event.WindowEvent;

 

 

 @SuppressWarnings("serial")

@@ -48,6 +50,12 @@ public class getVMwarePlayer extends JDialog {
 	 * Create the dialog.

 	 */

 	public getVMwarePlayer() {

+		addWindowListener(new WindowAdapter() {

+			@Override

+			public void windowClosing(WindowEvent e) {

+				System.exit(0);

+			}

+		});

 		try {

 			UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());

 		} catch (ClassNotFoundException | InstantiationException

diff --git a/Dozentenmodul/src/GUI/searchRohling.java b/Dozentenmodul/src/GUI/searchRohling.java
index d4bc1c47..979bc5d2 100644
--- a/Dozentenmodul/src/GUI/searchRohling.java
+++ b/Dozentenmodul/src/GUI/searchRohling.java
@@ -26,6 +26,8 @@ import javax.swing.JMenuItem;
 

 import downloader.FTPException;

 import downloader.FTPUtility;

+import java.awt.event.WindowAdapter;

+import java.awt.event.WindowEvent;

 

 @SuppressWarnings("serial")

 public class searchRohling extends JDialog {

@@ -56,6 +58,12 @@ public class searchRohling extends JDialog {
 	 * Create the dialog.

 	 */

 	public searchRohling() {

+		addWindowListener(new WindowAdapter() {

+			@Override

+			public void windowClosing(WindowEvent e) {

+				System.exit(0);

+			}

+		});

 		try {

 			UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());

 		} catch (ClassNotFoundException | InstantiationException