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

1 files changed, 14 insertions, 14 deletions

diff --git a/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java b/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java
index 6cca928f..80c88c98 100644
--- a/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java
@@ -118,6 +118,15 @@ public class FTPCreateUploader_GUI extends JFrame implements
 	public FTPCreateUploader_GUI(Component formerGUI) {
 
 		final Object[] options = { "Beenden", "Abbrechen" };
+		
+		try 
+		{
+			client.setTokenForSession(SessionData.session.getAuthToken());
+			uuid = client.createRandomUUID(); 
+		} catch (TException e1) {
+			// TODO Auto-generated catch block
+			e1.printStackTrace();
+		}
 
 		addWindowListener(new WindowAdapter() {
 
@@ -215,8 +224,8 @@ public class FTPCreateUploader_GUI extends JFrame implements
 
 		lblPath.addPropertyChangeListener(new PropertyChangeListener() {
 			public void propertyChange(PropertyChangeEvent arg0) {
-				if (lblPath.getText() == null
-						|| !lblPath.getText().endsWith(".vmdk")) {
+				if (lblPath.getText().trim() == null
+						|| !lblPath.getText().trim().endsWith(".vmdk")) {
 					// Keine Auswahl oder Auswahl ist keine vmdk
 					btnUploadStarten.setEnabled(false);
 					btnUploadStarten.setText("Kein Image!");
@@ -418,7 +427,7 @@ public class FTPCreateUploader_GUI extends JFrame implements
 									JOptionPane.ERROR_MESSAGE);
 						}
 
-						File f = new File(lblPath.getText());
+						File f = new File(lblPath.getText().trim());
 						if (f.isDirectory()) {
 							// shouldn't be a directory, but let's check that
 							// case anyway
@@ -573,15 +582,6 @@ public class FTPCreateUploader_GUI extends JFrame implements
 		});
 		menuBar.add(mnNewMenu_Info);
 		
-		try 
-		{
-			client.setTokenForSession(SessionData.session.getAuthToken());
-			uuid = client.createRandomUUID(); 
-		} catch (TException e1) {
-			// TODO Auto-generated catch block
-			e1.printStackTrace();
-		}
-		
 		c = this;
 	}
 
@@ -760,8 +760,8 @@ public class FTPCreateUploader_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;