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

3 files changed, 38 insertions, 32 deletions

diff --git a/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java b/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java
index 81e34dcc..1bf8cc3a 100644
--- a/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java
+++ b/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java
@@ -50,7 +50,8 @@ public class FTPCreateUploader_GUI extends JFrame implements
 	private final JPanel contentPanel = new JPanel();
 	JLabel lblPath;
 	JProgressBar progressBar;
-	String host = "141.79.128.121";
+	//String host = "141.79.128.121";
+	String host = "141.79.128.102";
 	int port = 21;
 	server.User user;
 	String filename = "";
@@ -410,24 +411,26 @@ public class FTPCreateUploader_GUI extends JFrame implements
 		if ("progress" == arg0.getPropertyName()) {
 			progress = (Integer) arg0.getNewValue();
 			progressBar.setValue(progress);
+			
+			// 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);
+			}
 
-		// 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()) {
 			speed = (double) arg0.getNewValue();
diff --git a/Dozentenmodul/src/gui/image/FTPDownloader_GUI.java b/Dozentenmodul/src/gui/image/FTPDownloader_GUI.java
index dd8782f3..d0f789f4 100644
--- a/Dozentenmodul/src/gui/image/FTPDownloader_GUI.java
+++ b/Dozentenmodul/src/gui/image/FTPDownloader_GUI.java
@@ -45,7 +45,8 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener
 	JLabel downspeed;
 	User user;
 	JProgressBar progressBar;
-	String host = "141.79.128.121";
+	//String host = "141.79.128.121";
+	String host = "141.79.128.102";
 	int port = 21;
 	String downloadFile = "";
 	static String arg = "";
diff --git a/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java b/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java
index 9863c1c6..b184c96c 100644
--- a/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java
+++ b/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java
@@ -49,7 +49,8 @@ public class FTPEditUploader_GUI extends JFrame implements
 	private final JPanel contentPanel = new JPanel();
 	JLabel lblPath;
 	JProgressBar progressBar;
-	String host = "141.79.128.121";
+	//String host = "141.79.128.121";
+	String host = "141.79.128.102";
 	int port = 21;
 	server.User user;
 	String filename = "";
@@ -399,24 +400,25 @@ public class FTPEditUploader_GUI extends JFrame implements
 		if ("progress" == arg0.getPropertyName()) {
 			progress = (Integer) arg0.getNewValue();
 			progressBar.setValue(progress);
+			
+			// 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);
+			}
 		}
 
-		// 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()) {
 			speed = (double) arg0.getNewValue();