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

1 files changed, 13 insertions, 12 deletions

diff --git a/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java b/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java
index d6f78ebe..d0a42e4b 100644
--- a/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java
@@ -112,6 +112,13 @@ public class FTPEditUploader_GUI extends JFrame implements
 	 * Create the frame.
 	 */
 	public FTPEditUploader_GUI(Component formerGUI) {
+		
+		try {
+			client.setTokenForSession(SessionData.session.getAuthToken());
+		} catch (TException e1) {
+			// TODO Auto-generated catch block
+			e1.printStackTrace();
+		}
 
 		final Object[] options = { "Beenden", "Abbrechen" };
 
@@ -204,11 +211,11 @@ public class FTPEditUploader_GUI extends JFrame implements
 
 		lblPath.addPropertyChangeListener(new PropertyChangeListener() {
 			public void propertyChange(PropertyChangeEvent arg0) {
-				if (lblPath.getText().isEmpty()) {
+				if (lblPath.getText().trim().isEmpty()) {
 					// wenn leer, dann upload button nicht freigeben
 					btnUploadStarten.setEnabled(false);
 					btnUploadStarten.setText("Bitte warten");
-				} else if (lblPath.getText().endsWith(".vmdk")) {
+				} else if (lblPath.getText().trim().endsWith(".vmdk")) {
 					// wenn leer, dann upload button freigeben
 					btnUploadStarten.setEnabled(true);
 					btnUploadStarten.setText("Upload auf Server starten");
@@ -391,8 +398,8 @@ public class FTPEditUploader_GUI extends JFrame implements
 											"Fehler", JOptionPane.ERROR_MESSAGE);
 						}
 
-						if (lblPath.getText().length() > 0) {
-							File f = new File(lblPath.getText());
+						if (lblPath.getText().trim().length() > 0) {
+							File f = new File(lblPath.getText().trim());
 
 							if (f.isDirectory()) {
 								Config.setLastUploadPath(f.toString());
@@ -540,12 +547,6 @@ public class FTPEditUploader_GUI extends JFrame implements
 		});
 		menuBar.add(mnNewMenu_Info);
 
-		try {
-			client.setTokenForSession(SessionData.session.getAuthToken());
-		} catch (TException e1) {
-			// TODO Auto-generated catch block
-			e1.printStackTrace();
-		}
 		setVisible(true);
 
 	}
@@ -751,8 +752,8 @@ public class FTPEditUploader_GUI extends JFrame implements
 	public boolean isCurrentlyLoading() {
 		isCurrentlyLoading = false;
 
-		if (lblVerbleibend.getText().equals("0 MB")
-				|| lblVerbleibend.getText().equals("0")) {
+		if (lblVerbleibend.getText().trim().equals("0 MB")
+				|| lblVerbleibend.getText().trim().equals("0")) {
 			isCurrentlyLoading = false;
 		} else {
 			isCurrentlyLoading = true;