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

Conflicts:
	Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI.class
fsad

1 files changed, 15 insertions, 0 deletions

diff --git a/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java b/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java
index b73e0723..12a5d6bb 100644
--- a/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java
+++ b/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java
@@ -88,6 +88,7 @@ public class FTPEditUploader_GUI extends JFrame implements
 	JButton btnSpeicherortAuswhlen = new JButton("Image ausw\u00E4hlen");
 	JButton finishButton = new JButton("Fertigstellen");
 	JButton btnZurck = new JButton("Zur\u00FCck");
+	private boolean isCurrentlyLoading = false; // currently up or downloading file
 
 	/**
 	 * Create the frame.
@@ -398,6 +399,8 @@ public class FTPEditUploader_GUI extends JFrame implements
 				});
 				btnZurck.addActionListener(new ActionListener() {
 					public void actionPerformed(ActionEvent arg0) {
+						
+						//
 						dispose();
 						PermissionEditImage_GUI ei = new PermissionEditImage_GUI();
 						ei.setVisible(true);
@@ -608,4 +611,16 @@ public class FTPEditUploader_GUI extends JFrame implements
 		return true;
 
 	}
+	
+	public boolean isCurrentlyLoading() {
+		isCurrentlyLoading = false;
+
+		if (labelverbleibend.getText().equals("0")) {
+			isCurrentlyLoading = false;
+		} else {
+			isCurrentlyLoading = true;
+		}
+		System.out.println("isCurrentlyLoading"+isCurrentlyLoading);
+		return isCurrentlyLoading;
+	}// end isCurrentlyLoading()
 }
\ No newline at end of file