Bugfixes:

-Buttons funktionieren jetzt korrekt

1 files changed, 21 insertions, 17 deletions

diff --git a/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java b/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java
index d34db8f0..b585fa50 100644
--- a/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java
+++ b/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java
@@ -42,7 +42,8 @@ import ftp.UploadTask;
 import gui.intro.MainMenue_GUI;
 
 @SuppressWarnings("serial")
-public class FTPCreateUploader_GUI extends JFrame implements PropertyChangeListener {
+public class FTPCreateUploader_GUI extends JFrame implements
+		PropertyChangeListener {
 
 	@SuppressWarnings("unused")
 	private JPanel contentPane;
@@ -105,7 +106,7 @@ public class FTPCreateUploader_GUI extends JFrame implements PropertyChangeListe
 					task.cancel(true);
 				}
 				System.exit(0);
-			}//end window closing
+			}// end window closing
 		});
 		setResizable(false);
 
@@ -278,7 +279,7 @@ public class FTPCreateUploader_GUI extends JFrame implements PropertyChangeListe
 		label_5.setBounds(139, 91, 14, 14);
 		contentPanel.add(label_5);
 
-		JLabel lblNeubearbeiten = new JLabel("Neu/Bearbeiten");
+		JLabel lblNeubearbeiten = new JLabel("Neu");
 		lblNeubearbeiten.setBounds(149, 91, 108, 14);
 		contentPanel.add(lblNeubearbeiten);
 
@@ -370,9 +371,9 @@ public class FTPCreateUploader_GUI extends JFrame implements PropertyChangeListe
 	}
 
 	private void buttonUploadActionPerformed(ActionEvent event) {
-		
+
 		progressBar.setValue(0);
-		btnUploadStarten.setEnabled(false); //verhindert einen weiteren klick
+		btnUploadStarten.setEnabled(false); // verhindert einen weiteren klick
 		btnUploadStarten.setText("Bitte warten");
 
 		try {
@@ -409,19 +410,22 @@ public class FTPCreateUploader_GUI extends JFrame implements PropertyChangeListe
 			progress = (Integer) arg0.getNewValue();
 			progressBar.setValue(progress);
 
-			
-			//if (progress == 100) {
-			//	finishButton.setEnabled(true);
-			//}
-			// Button zum Fertigstellen freischalten, wenn 100% erreicht sind
-			if (progress == 0 || progress == 100) {
-				// not uploading currently
-				btnZurck.setEnabled(true);
-			} else {
-				// currently uploading, don't let user interact
-				btnZurck.setEnabled(false);
-			}
+		}
+
+		// Button zum Fertigstellen freischalten, wenn 100% erreicht sind
+		if (progress == 0 || progress == 100) {
+			// not uploading currently
+			btnZurck.setEnabled(true);
+		} else {
+			// currently uploading, don't let user interact
+			btnZurck.setEnabled(false);
+		}
 
+		// Fertigstellen erlauben wenn upload abgeschlossen
+		if (progress == 100) {
+			finishButton.setEnabled(true);
+		} else {
+			finishButton.setEnabled(false);
 		}
 
 		if ("speed" == arg0.getPropertyName()) {