Anwenudng schließt jetzt beim schließen des fensters

1 files changed, 38 insertions, 38 deletions

diff --git a/Dozentenmodul/src/gui/image/FTPUploader_GUI.java b/Dozentenmodul/src/gui/image/FTPUploader_GUI.java
index bb686382..2af54b17 100644
--- a/Dozentenmodul/src/gui/image/FTPUploader_GUI.java
+++ b/Dozentenmodul/src/gui/image/FTPUploader_GUI.java
@@ -47,7 +47,7 @@ public class FTPUploader_GUI extends JFrame implements PropertyChangeListener {
 	@SuppressWarnings("unused")
 	private JPanel contentPane;
 	private final JPanel contentPanel = new JPanel();
-	JLabel lblNewLabel;
+	JLabel lblPath;
 	JProgressBar progressBar;
 	String host = "141.79.128.121";
 	int port = 21;
@@ -97,7 +97,6 @@ public class FTPUploader_GUI extends JFrame implements PropertyChangeListener {
 			public void windowClosing(WindowEvent arg0) {
 				if (taskrun == true) {
 					try {
-
 						client.DeleteFtpUser(user.userName);
 					} catch (TException e1) {
 						// TODO Auto-generated catch block
@@ -105,7 +104,8 @@ public class FTPUploader_GUI extends JFrame implements PropertyChangeListener {
 					}
 					task.cancel(true);
 				}
-			}
+				System.exit(0);
+			}//end window closing
 		});
 		setResizable(false);
 
@@ -144,10 +144,10 @@ public class FTPUploader_GUI extends JFrame implements PropertyChangeListener {
 						System.out.println("File to upload exists");
 						uploadFile = file;
 						filename = uploadFile.getName();
-						lblNewLabel.setText(file.getAbsolutePath());
+						lblPath.setText(file.getAbsolutePath());
 					} else {
 						System.out.println("No file selected");
-						lblNewLabel.setText("");
+						lblPath.setText("");
 					}// end if
 				}
 			});
@@ -157,10 +157,10 @@ public class FTPUploader_GUI extends JFrame implements PropertyChangeListener {
 			contentPanel.add(btnSpeicherortAuswhlen);
 		}
 
-		lblNewLabel = new JLabel("");
-		lblNewLabel.addPropertyChangeListener(new PropertyChangeListener() {
+		lblPath = new JLabel("");
+		lblPath.addPropertyChangeListener(new PropertyChangeListener() {
 			public void propertyChange(PropertyChangeEvent arg0) {
-				if (lblNewLabel.getText().isEmpty()) {
+				if (lblPath.getText().isEmpty()) {
 					// wenn leer, dann upload button nicht freigeben
 					btnUploadStarten.setEnabled(false);
 					btnUploadStarten.setText("Bitte warten");
@@ -171,9 +171,9 @@ public class FTPUploader_GUI extends JFrame implements PropertyChangeListener {
 				}
 			}
 		});
-		lblNewLabel.setHorizontalAlignment(SwingConstants.LEFT);
-		lblNewLabel.setBounds(285, 124, 302, 23);
-		contentPanel.add(lblNewLabel);
+		lblPath.setHorizontalAlignment(SwingConstants.LEFT);
+		lblPath.setBounds(102, 158, 485, 23);
+		contentPanel.add(lblPath);
 
 		btnUploadStarten.setEnabled(false);
 		btnUploadStarten.addActionListener(new ActionListener() {
@@ -183,58 +183,58 @@ public class FTPUploader_GUI extends JFrame implements PropertyChangeListener {
 			}
 		});
 
-		btnUploadStarten.setBounds(102, 168, 173, 23);
+		btnUploadStarten.setBounds(102, 200, 173, 23);
 		contentPanel.add(btnUploadStarten);
 
 		progressBar = new JProgressBar(0, 100);
 		progressBar.setStringPainted(true);
 
-		progressBar.setBounds(102, 202, 485, 30);
+		progressBar.setBounds(102, 234, 485, 30);
 		contentPanel.add(progressBar);
 
 		JLabel lblUploadgeschwindigkeit = new JLabel("Uploadgeschwindigkeit:");
-		lblUploadgeschwindigkeit.setBounds(102, 243, 141, 14);
+		lblUploadgeschwindigkeit.setBounds(102, 275, 141, 14);
 		contentPanel.add(lblUploadgeschwindigkeit);
 
 		JLabel label_1 = new JLabel("Fertig:");
-		label_1.setBounds(102, 293, 46, 14);
+		label_1.setBounds(102, 325, 46, 14);
 		contentPanel.add(label_1);
 
 		labelfertig = new JLabel("0");
 		labelfertig.setHorizontalAlignment(SwingConstants.LEFT);
-		labelfertig.setBounds(183, 293, 108, 14);
+		labelfertig.setBounds(183, 325, 108, 14);
 		contentPanel.add(labelfertig);
 
 		UpSpeed = new JLabel("0");
 		UpSpeed.setHorizontalAlignment(SwingConstants.LEFT);
-		UpSpeed.setBounds(374, 243, 117, 14);
+		UpSpeed.setBounds(374, 275, 117, 14);
 		contentPanel.add(UpSpeed);
 
 		JLabel label_4 = new JLabel("von:");
-		label_4.setBounds(318, 293, 46, 14);
+		label_4.setBounds(318, 325, 46, 14);
 		contentPanel.add(label_4);
 
 		labelfilesize = new JLabel("0");
 		labelfilesize.setHorizontalAlignment(SwingConstants.LEFT);
-		labelfilesize.setBounds(374, 293, 117, 14);
+		labelfilesize.setBounds(374, 325, 117, 14);
 		contentPanel.add(labelfilesize);
 
 		JLabel label_6 = new JLabel("Verbleibend:");
-		label_6.setBounds(102, 318, 71, 14);
+		label_6.setBounds(102, 350, 71, 14);
 		contentPanel.add(label_6);
 
 		JLabel label_7 = new JLabel("Gesch\u00E4tzte Verbleibende Zeit:");
-		label_7.setBounds(102, 268, 150, 14);
+		label_7.setBounds(102, 300, 150, 14);
 		contentPanel.add(label_7);
 
 		labelZeit = new JLabel("0");
 		labelZeit.setHorizontalAlignment(SwingConstants.LEFT);
-		labelZeit.setBounds(374, 268, 117, 14);
+		labelZeit.setBounds(374, 300, 117, 14);
 		contentPanel.add(labelZeit);
 
 		labelverbleibend = new JLabel("0");
 		labelverbleibend.setHorizontalAlignment(SwingConstants.LEFT);
-		labelverbleibend.setBounds(183, 318, 108, 14);
+		labelverbleibend.setBounds(183, 350, 108, 14);
 		contentPanel.add(labelverbleibend);
 
 		JPanel panel = new JPanel();
@@ -300,24 +300,24 @@ public class FTPUploader_GUI extends JFrame implements PropertyChangeListener {
 				}
 			}
 		});
-		btnCopyFileTo.setBounds(102, 343, 173, 23);
+		btnCopyFileTo.setBounds(102, 375, 173, 23);
 		contentPanel.add(btnCopyFileTo);
 
-		JLabel lblShritt = new JLabel("Schritt 1:");
-		lblShritt.setBounds(24, 128, 57, 14);
-		contentPanel.add(lblShritt);
+		JLabel lblSchritt_1 = new JLabel("Schritt 1:");
+		lblSchritt_1.setBounds(24, 128, 57, 14);
+		contentPanel.add(lblSchritt_1);
 
-		JLabel lblSchritt = new JLabel("Schritt 2:");
-		lblSchritt.setBounds(24, 172, 57, 14);
-		contentPanel.add(lblSchritt);
+		JLabel lblSchritt_2 = new JLabel("Schritt 2:");
+		lblSchritt_2.setBounds(24, 204, 57, 14);
+		contentPanel.add(lblSchritt_2);
 
-		JLabel lblSchritt_1 = new JLabel("Schritt 3:");
-		lblSchritt_1.setBounds(20, 391, 57, 14);
-		contentPanel.add(lblSchritt_1);
+		JLabel lblSchritt_3 = new JLabel("Schritt 3:");
+		lblSchritt_3.setBounds(20, 423, 57, 14);
+		contentPanel.add(lblSchritt_3);
 
 		JLabel lblKlickenSieAuf = new JLabel(
 				"Klicken Sie auf \"Fertigstellen\".");
-		lblKlickenSieAuf.setBounds(98, 391, 241, 14);
+		lblKlickenSieAuf.setBounds(98, 423, 241, 14);
 		contentPanel.add(lblKlickenSieAuf);
 		{
 			JPanel buttonPane = new JPanel();
@@ -409,11 +409,11 @@ public class FTPUploader_GUI extends JFrame implements PropertyChangeListener {
 			progress = (Integer) arg0.getNewValue();
 			progressBar.setValue(progress);
 
+			
+			//if (progress == 100) {
+			//	finishButton.setEnabled(true);
+			//}
 			// Button zum Fertigstellen freischalten, wenn 100% erreicht sind
-			if (progress == 100) {
-				finishButton.setEnabled(true);
-
-			}
 			if (progress == 0 || progress == 100) {
 				// not uploading currently
 				btnZurck.setEnabled(true);