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

20 files changed, 202 insertions, 181 deletions

diff --git a/dozentenmodul/src/main/java/gui/image/CreateImageAllgemein_GUI.java b/dozentenmodul/src/main/java/gui/image/CreateImageAllgemein_GUI.java
index e40a2a1e..5d72fc36 100644
--- a/dozentenmodul/src/main/java/gui/image/CreateImageAllgemein_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/CreateImageAllgemein_GUI.java
@@ -312,8 +312,8 @@ public class CreateImageAllgemein_GUI extends JFrame {
 				JButton backButton = new JButton("Zurück");
 				backButton.addActionListener(new ActionListener() {
 					public void actionPerformed(ActionEvent e) {
-						Image.image.setImagename(imagename.getText());
-						Image.image.setDesc(textAreadesc.getText());
+						Image.image.setImagename(imagename.getText().trim());
+						Image.image.setDesc(textAreadesc.getText().trim());
 						MainMenue_GUI sr = new MainMenue_GUI(c);
 						sr.setVisible(true);
 						dispose();
@@ -329,8 +329,8 @@ public class CreateImageAllgemein_GUI extends JFrame {
 						// Prüfe Eingabe
 						if (validateContent()) {
 							// Schreibt die Daten in das Model
-							Image.image.setImagename(imagename.getText());
-							Image.image.setDesc(textAreadesc.getText());
+							Image.image.setImagename(imagename.getText().trim());
+							Image.image.setDesc(textAreadesc.getText().trim());
 
 							//LOGGER.info("Alle Eingaben in Ordnung. Imagename= \""
 							//		+ Image.image.getImagename()
@@ -432,12 +432,12 @@ public class CreateImageAllgemein_GUI extends JFrame {
 	 */
 	private boolean validateContent() {
 		// check if any text field is empty
-		if (imagename.getText().isEmpty()
-				|| textAreadesc.getText().isEmpty()
-				|| Vorname.getText().isEmpty()
-				|| Nachname.getText().isEmpty()
-				|| Hochschule.getText().isEmpty()
-				|| EMail.getText().isEmpty()) {
+		if (imagename.getText().trim().isEmpty()
+				|| textAreadesc.getText().trim().isEmpty()
+				|| Vorname.getText().trim().isEmpty()
+				|| Nachname.getText().trim().isEmpty()
+				|| Hochschule.getText().trim().isEmpty()
+				|| EMail.getText().trim().isEmpty()) {
 			// missing some fields
 			//LOGGER.info("Form has missing fields, warning user.");
 			JOptionPane.showMessageDialog(c,
@@ -450,7 +450,7 @@ public class CreateImageAllgemein_GUI extends JFrame {
 		// only allow letter from alphabet and numbers for the image name and certain special chars
 		// x2B= "+"   x2C="-"   x3A=":"   x5F="_"    
 		// 
-		if (!imagename.getText().trim().matches("[a-zA-Z0-9\\x2B\\x2D\\x3A\\x5F]+")) {
+		if (!imagename.getText().trim().trim().matches("[a-zA-Z0-9\\x2B\\x2D\\x3A\\x5F]+")) {
 			//LOGGER.info("Image name not alpha-numerical, warn user.");
 			JOptionPane.showMessageDialog(
 							c,
@@ -461,9 +461,9 @@ public class CreateImageAllgemein_GUI extends JFrame {
 		}
 
 		// max length for image description is 254 chars
-		if (textAreadesc.getText().length() >= MAX_DESCRIPTION_LENGTH) {
+		if (textAreadesc.getText().trim().length() >= MAX_DESCRIPTION_LENGTH) {
 			JOptionPane.showMessageDialog(c,
-					"Die Beschreibung darf max 254 Zeichen enthalten. Aktuell enthält sie "+textAreadesc.getText().length()+".",
+					"Die Beschreibung darf max 254 Zeichen enthalten. Aktuell enthält sie "+textAreadesc.getText().trim().length()+".",
 					"Beschreibung zu umfangreich",
 					JOptionPane.ERROR_MESSAGE);
 			return false;
diff --git a/dozentenmodul/src/main/java/gui/image/DeleteImage_GUI.java b/dozentenmodul/src/main/java/gui/image/DeleteImage_GUI.java
index 75703924..fe956f8f 100644
--- a/dozentenmodul/src/main/java/gui/image/DeleteImage_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/DeleteImage_GUI.java
@@ -166,6 +166,7 @@ public class DeleteImage_GUI extends JFrame {
 			e1.printStackTrace();
 		}
 		
+		
 		filters.add(RowFilter.regexFilter(".", 0));
 		rf = RowFilter.orFilter(filters);
 
@@ -288,7 +289,7 @@ public class DeleteImage_GUI extends JFrame {
 			public void keyReleased(KeyEvent e) 
 			{
 				// Textfield eingabe auslesen
-				String stext = textFieldName.getText();
+				String stext = textFieldName.getText().trim();
 
 				// Wenn Textfield nicht leer
 				if (stext != "") 
@@ -769,12 +770,7 @@ public class DeleteImage_GUI extends JFrame {
 			}
 		});
 		menuBar.add(mnNewMenu_Info);
-		try {
-			client.setTokenForSession(SessionData.session.getAuthToken());
-		} catch (TException e1) {
-			// TODO Auto-generated catch block
-			e1.printStackTrace();
-		}
+
 		c = this;
 	}
 
diff --git a/dozentenmodul/src/main/java/gui/image/EditImageAllgemein_GUI.java b/dozentenmodul/src/main/java/gui/image/EditImageAllgemein_GUI.java
index 89548a9b..a848c805 100644
--- a/dozentenmodul/src/main/java/gui/image/EditImageAllgemein_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/EditImageAllgemein_GUI.java
@@ -317,7 +317,7 @@ public class EditImageAllgemein_GUI extends JFrame {
 
 						// Setzen der Eingabe im Model, dadurch bleiben die
 						// Daten bei einem erneuten Aufruf verfuegbar
-						// Image.image.setImagename(imagename.getText());
+						// Image.image.setImagename(imagename.getText().trim());
 						
 						SearchEditImage_GUI se = new SearchEditImage_GUI(c);
 						se.setVisible(true);
@@ -337,8 +337,8 @@ public class EditImageAllgemein_GUI extends JFrame {
 						if (checkContent() == true && checkNameIsLettersOrNumbers() == true && descriptionLenghtOK()== true) {
 
 							// setze Namen, egal ob alt oder nicht
-							Image.image.setImagename(imagename.getText());
-							Image.image.setDesc(textAreadesc.getText());
+							Image.image.setImagename(imagename.getText().trim());
+							Image.image.setDesc(textAreadesc.getText().trim());
 							// Info
 							//LOGGER.info("Alle Eingaben in Ordnung. Imagename= \""
 							//				+ Image.image.getImagename()
@@ -485,7 +485,7 @@ public class EditImageAllgemein_GUI extends JFrame {
 		nameIsOK = false;
 
 		//only allow letter from alphabet and nothing else
-		if (imagename.getText().matches("[a-zA-Z0-9\\x2B\\x2D\\x3A\\x5F]+")) {
+		if (imagename.getText().trim().matches("[a-zA-Z0-9\\x2B\\x2D\\x3A\\x5F]+")) {
 			nameIsOK = true;
 		} else {
 			JOptionPane
@@ -503,12 +503,12 @@ public class EditImageAllgemein_GUI extends JFrame {
 		textfieldsHaveContent=false;
 		
 		//check if any textfield is empty
-		if(imagename.getText().isEmpty() == false
-				&& textAreadesc.getText().isEmpty() == false
-				&& Vorname.getText().isEmpty() == false
-				&& Nachname.getText().isEmpty() == false
-				&& Hochschule.getText().isEmpty() == false
-				&& EMail.getText().isEmpty() == false) {
+		if(imagename.getText().trim().isEmpty() == false
+				&& textAreadesc.getText().trim().isEmpty() == false
+				&& Vorname.getText().trim().isEmpty() == false
+				&& Nachname.getText().trim().isEmpty() == false
+				&& Hochschule.getText().trim().isEmpty() == false
+				&& EMail.getText().trim().isEmpty() == false) {
 			//all textfields have content
 			textfieldsHaveContent = true;
 		} else {
@@ -527,11 +527,11 @@ public class EditImageAllgemein_GUI extends JFrame {
 		descriptionLengthOK=false;
 		
 		//max length is 254 chars
-		if (textAreadesc.getText().length() >= MAX_DESCRIPTION_LENGTH) {
+		if (textAreadesc.getText().trim().length() >= MAX_DESCRIPTION_LENGTH) {
 			descriptionLengthOK=false;
 			JOptionPane
 			.showMessageDialog(c,
-					"Die Beschreibung darf max 254 Zeichen enthalten. Aktuell enthält sie "+textAreadesc.getText().length()+".",
+					"Die Beschreibung darf max 254 Zeichen enthalten. Aktuell enthält sie "+textAreadesc.getText().trim().length()+".",
 					"Beschreibung zu umfangreich",
 					JOptionPane.ERROR_MESSAGE);
 		}else {
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;
diff --git a/dozentenmodul/src/main/java/gui/image/FTPEditDownloader_GUI.java b/dozentenmodul/src/main/java/gui/image/FTPEditDownloader_GUI.java
index b80ba12f..a3e4c6cf 100644
--- a/dozentenmodul/src/main/java/gui/image/FTPEditDownloader_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/FTPEditDownloader_GUI.java
@@ -107,6 +107,13 @@ public class FTPEditDownloader_GUI extends JFrame implements
 	 * Create the frame.
 	 */
 	public FTPEditDownloader_GUI(Component formerGUI) {
+		
+		try {
+			client.setTokenForSession(SessionData.session.getAuthToken());
+		} catch (TException e1) {
+			// TODO Auto-generated catch block
+			e1.printStackTrace();
+		}
 
 		final Object[] options = { "Beenden", "Abbrechen" };
 
@@ -198,7 +205,7 @@ public class FTPEditDownloader_GUI extends JFrame implements
 
 		lblPath.addPropertyChangeListener(new PropertyChangeListener() {
 			public void propertyChange(PropertyChangeEvent arg0) {
-				if (lblPath.getText() == null) {
+				if (lblPath.getText().trim().trim() == null) {
 					// wenn leer, dann upload button nicht freigeben
 					btnDownloadStarten.setEnabled(false);
 					btnDownloadStarten.setText("Bitte warten");
@@ -473,7 +480,7 @@ public class FTPEditDownloader_GUI extends JFrame implements
 
 						}// end else
 							// always save download path
-						File f = new File(lblPath.getText());
+						File f = new File(lblPath.getText().trim().trim());
 						if (f.isDirectory()) {
 							Config.setLastDownloadPath(f.toString());
 						} else if (f.getParentFile().isDirectory()) {
@@ -498,13 +505,6 @@ public class FTPEditDownloader_GUI extends JFrame implements
 			}
 		});
 		menuBar.add(mnNewMenu_Info);
-
-		try {
-			client.setTokenForSession(SessionData.session.getAuthToken());
-		} catch (TException e1) {
-			// TODO Auto-generated catch block
-			e1.printStackTrace();
-		}
 		
 		c = this;
 
@@ -534,7 +534,7 @@ public class FTPEditDownloader_GUI extends JFrame implements
 		}
 
 		task = new DownloadTask(host, port, user.userName, user.password,
-				downloadFile, lblPath.getText());
+				downloadFile, lblPath.getText().trim().trim());
 		task.addPropertyChangeListener(this);
 		task.execute();
 		taskrun = true;
@@ -598,8 +598,8 @@ public class FTPEditDownloader_GUI extends JFrame implements
 	public boolean isCurrentlyLoading() {
 		isCurrentlyLoading = false;
 
-		if (lblVerbleibend.getText().equals("0 MB")
-				|| lblVerbleibend.getText().equals("0")) {
+		if (lblVerbleibend.getText().trim().trim().equals("0 MB")
+				|| lblVerbleibend.getText().trim().trim().equals("0")) {
 			isCurrentlyLoading = false;
 		} else {
 			isCurrentlyLoading = true;
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;
diff --git a/dozentenmodul/src/main/java/gui/image/FTPSearchDownloader_GUI.java b/dozentenmodul/src/main/java/gui/image/FTPSearchDownloader_GUI.java
index 54d7c6a7..88ac00a6 100644
--- a/dozentenmodul/src/main/java/gui/image/FTPSearchDownloader_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/FTPSearchDownloader_GUI.java
@@ -104,6 +104,13 @@ public class FTPSearchDownloader_GUI extends JFrame implements
 	 * Create the frame.
 	 */
 	public FTPSearchDownloader_GUI(Component formerGUI) {
+		
+		try {
+			client.setTokenForSession(SessionData.session.getAuthToken());
+		} catch (TException e1) {
+			// TODO Auto-generated catch block
+			e1.printStackTrace();
+		}
 
 		final Object[] options = { "Beenden", "Abbrechen" };
 
@@ -197,7 +204,7 @@ public class FTPSearchDownloader_GUI extends JFrame implements
 
 		lblPath.addPropertyChangeListener(new PropertyChangeListener() {
 			public void propertyChange(PropertyChangeEvent arg0) {
-				if (lblPath.getText() == null) {
+				if (lblPath.getText().trim() == null) {
 					// wenn leer, dann upload button nicht freigeben
 					btnDownloadStarten.setEnabled(false);
 					btnDownloadStarten.setText("Bitte warten");
@@ -480,7 +487,7 @@ public class FTPSearchDownloader_GUI extends JFrame implements
 							dispose();
 						}// end else
 							// save config in any case
-						Config.setLastDownloadPath(lblPath.getText());
+						Config.setLastDownloadPath(lblPath.getText().trim());
 						Config.store();
 					}// end action
 				});
@@ -490,7 +497,7 @@ public class FTPSearchDownloader_GUI extends JFrame implements
 
 			btnMainMenu.addActionListener(new ActionListener() {
 				public void actionPerformed(ActionEvent arg0) {
-					Config.setLastDownloadPath(lblPath.getText());
+					Config.setLastDownloadPath(lblPath.getText().trim());
 					Config.store();
 
 					MainMenue_GUI mm = new MainMenue_GUI(c);
@@ -510,12 +517,7 @@ public class FTPSearchDownloader_GUI extends JFrame implements
 			}
 		});
 		menuBar.add(mnNewMenu_Info);
-		try {
-			client.setTokenForSession(SessionData.session.getAuthToken());
-		} catch (TException e1) {
-			// TODO Auto-generated catch block
-			e1.printStackTrace();
-		}
+
 		c = this;
 		setVisible(true);
 
@@ -545,7 +547,7 @@ public class FTPSearchDownloader_GUI extends JFrame implements
 		}
 
 		task = new DownloadTask(host, port, user.userName, user.password,
-				downloadFile, lblPath.getText());
+				downloadFile, lblPath.getText().trim());
 		task.addPropertyChangeListener(this);
 		task.execute();
 		taskrun = true;
@@ -611,8 +613,8 @@ public class FTPSearchDownloader_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;
diff --git a/dozentenmodul/src/main/java/gui/image/PermissionCreateImage_GUI.java b/dozentenmodul/src/main/java/gui/image/PermissionCreateImage_GUI.java
index 1498ffff..4a2596ed 100644
--- a/dozentenmodul/src/main/java/gui/image/PermissionCreateImage_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/PermissionCreateImage_GUI.java
@@ -120,6 +120,15 @@ public class PermissionCreateImage_GUI extends JFrame {
 	private JButton btnDeleteUser;
 
 	public PermissionCreateImage_GUI(Component formerGUI) {
+		
+		
+		try {
+			client.setTokenForSession(SessionData.session.getAuthToken());
+		} catch (TException e1) {
+			// TODO Auto-generated catch block
+			e1.printStackTrace();
+		}
+		
 		addWindowListener(new WindowAdapter() {
 			@Override
 			public void windowClosing(WindowEvent arg0) {
@@ -565,13 +574,6 @@ public class PermissionCreateImage_GUI extends JFrame {
 		});
 		menuBar.add(mnNewMenu_Info);
 		
-		try {
-			client.setTokenForSession(SessionData.session.getAuthToken());
-		} catch (TException e1) {
-			// TODO Auto-generated catch block
-			e1.printStackTrace();
-		}
-		
 		c = this;		
 		
 		this.setLocationRelativeTo(formerGUI);
diff --git a/dozentenmodul/src/main/java/gui/image/PermissionEditImage_GUI.java b/dozentenmodul/src/main/java/gui/image/PermissionEditImage_GUI.java
index 7f14aef0..a794f404 100644
--- a/dozentenmodul/src/main/java/gui/image/PermissionEditImage_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/PermissionEditImage_GUI.java
@@ -108,6 +108,15 @@ public class PermissionEditImage_GUI extends JFrame {
 			+ "</div></html>";
 
 	public PermissionEditImage_GUI(Component formerGUI) {
+		
+		try {
+			client.setTokenForSession(SessionData.session.getAuthToken());
+		} catch (TException e1) {
+			// TODO Auto-generated catch block
+			e1.printStackTrace();
+		}
+		
+		
 		addWindowListener(new WindowAdapter() {
 			@Override
 			public void windowClosing(WindowEvent arg0) {
@@ -556,13 +565,6 @@ public class PermissionEditImage_GUI extends JFrame {
 		});
 		menuBar.add(mnNewMenu_Info);
 		
-		try {
-			client.setTokenForSession(SessionData.session.getAuthToken());
-		} catch (TException e1) {
-			// TODO Auto-generated catch block
-			e1.printStackTrace();
-		}
-		
 		c = this;
 	}
 	
diff --git a/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java b/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java
index 983b62b1..7b8578c6 100644
--- a/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java
@@ -147,6 +147,13 @@ public class SearchEditImage_GUI extends JFrame {
 	 */
 	public SearchEditImage_GUI(Component formerGUI) {
 		
+		try {
+			client.setTokenForSession(SessionData.session.getAuthToken());
+		} catch (TException e1) {
+			// TODO Auto-generated catch block
+			e1.printStackTrace();
+		}
+		
 
 		filters.add(RowFilter.regexFilter(".", 0));
 		rf = RowFilter.orFilter(filters);
@@ -265,7 +272,7 @@ public class SearchEditImage_GUI extends JFrame {
 			public void keyReleased(KeyEvent e) {
 				// Textfield eingabe auslesen
 
-				String stext = textFieldName.getText();
+				String stext = textFieldName.getText().trim();
 				
 				//System.out.println("Help, I don't want to be filtered yet....");
 
@@ -737,12 +744,7 @@ public class SearchEditImage_GUI extends JFrame {
 			}
 		});
 		menuBar.add(mnNewMenu_Info);
-		try {
-			client.setTokenForSession(SessionData.session.getAuthToken());
-		} catch (TException e1) {
-			// TODO Auto-generated catch block
-			e1.printStackTrace();
-		}
+
 		c = this;
 	
 	}
@@ -861,9 +863,9 @@ public class SearchEditImage_GUI extends JFrame {
 			labelWeitereVerantwortliche.setText("");
 			for (int i = 0; i < contacts.size(); i++) 
 			{
-				labelWeitereVerantwortliche.setText(labelWeitereVerantwortliche.getText()+(contacts.get(i)));
+				labelWeitereVerantwortliche.setText(labelWeitereVerantwortliche.getText().trim()+(contacts.get(i)));
 			}
-			labelWeitereVerantwortliche.setToolTipText(labelWeitereVerantwortliche.getText());
+			labelWeitereVerantwortliche.setToolTipText(labelWeitereVerantwortliche.getText().trim());
 			
 			
 		} catch (TException | ParseException e1) {
diff --git a/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java b/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java
index f144489d..a0d36c5a 100644
--- a/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java
@@ -169,6 +169,14 @@ public class SearchImage_GUI extends JFrame {
 		

 

 		

+		try {

+			client.setTokenForSession(SessionData.session.getAuthToken());

+		} catch (TException e1) {

+			// TODO Auto-generated catch block

+			e1.printStackTrace();

+		}

+		

+		

 		addWindowListener(new WindowAdapter() {

 			@Override

 			public void windowClosing(WindowEvent arg0) {

@@ -354,7 +362,7 @@ public class SearchImage_GUI extends JFrame {
 			@Override

 			public void keyReleased(KeyEvent e) {

 				// Textfield eingabe auslesen

-				String stext = textFieldName.getText().trim();

+				String stext = textFieldName.getText().trim().trim();

 				

 				// Wenn Textfield nicht leer

 				if (stext != "") 

@@ -1002,13 +1010,6 @@ public class SearchImage_GUI extends JFrame {
 		});

 		menuBar.add(mnNewMenu_Info);

 		

-		try {

-			client.setTokenForSession(SessionData.session.getAuthToken());

-		} catch (TException e1) {

-			// TODO Auto-generated catch block

-			e1.printStackTrace();

-		}

-		

 		c = this;

 

 	}

@@ -1213,9 +1214,9 @@ public class SearchImage_GUI extends JFrame {
 			labelWeitereVerantwortliche.setText("");

 			for (int i = 0; i < contacts.size(); i++) 

 			{

-				labelWeitereVerantwortliche.setText(labelWeitereVerantwortliche.getText()+(contacts.get(i)));

+				labelWeitereVerantwortliche.setText(labelWeitereVerantwortliche.getText().trim()+(contacts.get(i)));

 			}

-			labelWeitereVerantwortliche.setToolTipText(labelWeitereVerantwortliche.getText());

+			labelWeitereVerantwortliche.setToolTipText(labelWeitereVerantwortliche.getText().trim());

 			

 			if(person.verantwortlicher.getRole().equals("Student") && res.get("license").equals("1"))

 			{

diff --git a/dozentenmodul/src/main/java/gui/lecture/CreateLectureAllgemein_GUI.java b/dozentenmodul/src/main/java/gui/lecture/CreateLectureAllgemein_GUI.java
index 3969eb0d..9f2c56d1 100644
--- a/dozentenmodul/src/main/java/gui/lecture/CreateLectureAllgemein_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/CreateLectureAllgemein_GUI.java
@@ -384,8 +384,8 @@ public class CreateLectureAllgemein_GUI extends JFrame {
 						}
 
 						Lecture.lecture.setName(txtFldVeranstaltungsname
-								.getText());
-						Lecture.lecture.setDesc(description.getText());
+								.getText().trim());
+						Lecture.lecture.setDesc(description.getText().trim());
 						Lecture.lecture.setEnddate(dateChooserend.getDate());
 						Lecture.lecture.setStartdate(dateChooserstart.getDate());
 
@@ -434,8 +434,8 @@ public class CreateLectureAllgemein_GUI extends JFrame {
 							isDateMaxLifeTimeCorrect = true;
 						}
 						// Pruefen ob alles eingegeben wurde
-						if (txtFldVeranstaltungsname.getText().isEmpty() == true
-								|| description.getText().isEmpty() == true) {
+						if (txtFldVeranstaltungsname.getText().trim().isEmpty() == true
+								|| description.getText().trim().isEmpty() == true) {
 							// mind 1 Textfeld ist leer
 							isAllInformationReady = false;
 							JOptionPane
@@ -463,8 +463,8 @@ public class CreateLectureAllgemein_GUI extends JFrame {
 								&& descriptionLenghtOK() == true) {
 							// everything is ok, proceed
 							Lecture.lecture.setName(txtFldVeranstaltungsname
-									.getText());
-							Lecture.lecture.setDesc(description.getText());
+									.getText().trim());
+							Lecture.lecture.setDesc(description.getText().trim());
 							Lecture.lecture.setEnddate(dateChooserend.getDate());
 							Lecture.lecture.setStartdate(dateChooserstart
 									.getDate());
@@ -567,11 +567,11 @@ public class CreateLectureAllgemein_GUI extends JFrame {
 		descriptionLengthOK = false;
 
 		// max length is 254 chars
-		if (description.getText().length() >= MAX_DESCRIPTION_LENGTH) {
+		if (description.getText().trim().length() >= MAX_DESCRIPTION_LENGTH) {
 			descriptionLengthOK = false;
 			JOptionPane.showMessageDialog(c,
 					"Die Beschreibung darf max 254 Zeichen enthalten. Aktuell enthält sie "
-							+ description.getText().length() + ".",
+							+ description.getText().trim().length() + ".",
 					"Beschreibung zu umfangreich",
 					JOptionPane.INFORMATION_MESSAGE);
 		} else {
diff --git a/dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java b/dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java
index 6fad3b69..8559c68a 100644
--- a/dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java
@@ -137,6 +137,13 @@ public class CreateLectureLink_GUI extends JFrame {
 	 */
 	public CreateLectureLink_GUI(Component formerGUI) {
 		
+		try {
+			client.setTokenForSession(SessionData.session.getAuthToken());
+		} catch (TException e1) {
+			// TODO Auto-generated catch block
+			e1.printStackTrace();
+		}
+		
 		filters.add(RowFilter.regexFilter(".", 0));
 		rf = RowFilter.orFilter(filters);
 		
@@ -263,7 +270,7 @@ public class CreateLectureLink_GUI extends JFrame {
 		textFieldName.addKeyListener(new KeyAdapter() {
 			@Override
 			public void keyReleased(KeyEvent e) {
-				String stext = textFieldName.getText();
+				String stext = textFieldName.getText().trim();
 				// Wenn Textfield nicht leer
 				if (stext != "") {
 					activeSearch = true;
@@ -746,12 +753,7 @@ public class CreateLectureLink_GUI extends JFrame {
 		}
 
 		c = this;
-		try {
-			client.setTokenForSession(SessionData.session.getAuthToken());
-		} catch (TException e1) {
-			// TODO Auto-generated catch block
-			e1.printStackTrace();
-		}
+
 	}
 
 	// Initiale Beffuelung eines Table models
diff --git a/dozentenmodul/src/main/java/gui/lecture/DeleteLecture_GUI.java b/dozentenmodul/src/main/java/gui/lecture/DeleteLecture_GUI.java
index 47414981..58fadc72 100644
--- a/dozentenmodul/src/main/java/gui/lecture/DeleteLecture_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/DeleteLecture_GUI.java
@@ -114,6 +114,13 @@ public class DeleteLecture_GUI extends JFrame {
 	 * Create the dialog.
 	 */
 	public DeleteLecture_GUI(Component formerGUI) {
+		
+		try {
+			client.setTokenForSession(SessionData.session.getAuthToken());
+		} catch (TException e1) {
+			// TODO Auto-generated catch block
+			e1.printStackTrace();
+		}
 
 		filters.add(RowFilter.regexFilter(".", 0));
 		rf = RowFilter.orFilter(filters);
@@ -242,7 +249,7 @@ public class DeleteLecture_GUI extends JFrame {
 			@Override
 			public void keyReleased(KeyEvent e) {
 				// Textfield eingabe auslesen
-				String stext = textFieldName.getText();
+				String stext = textFieldName.getText().trim();
 				// Wenn Textfield nicht leer
 				if (stext != "") {
 					activeSearch = true;
@@ -598,12 +605,7 @@ public class DeleteLecture_GUI extends JFrame {
 			}
 		});
 		menuBar.add(mnNewMenu_Info);
-		try {
-			client.setTokenForSession(SessionData.session.getAuthToken());
-		} catch (TException e1) {
-			// TODO Auto-generated catch block
-			e1.printStackTrace();
-		}
+
 		c = this;
 
 	}
diff --git a/dozentenmodul/src/main/java/gui/lecture/EditLectureAllgemein_GUI.java b/dozentenmodul/src/main/java/gui/lecture/EditLectureAllgemein_GUI.java
index 45d4b0e2..e66adea2 100644
--- a/dozentenmodul/src/main/java/gui/lecture/EditLectureAllgemein_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/EditLectureAllgemein_GUI.java
@@ -400,11 +400,11 @@ public class EditLectureAllgemein_GUI extends JFrame {
 							Lecture.lecture.setActive(false);
 						}
 
-						Lecture.lecture.setName(textFieldLaborname.getText());
-						Lecture.lecture.setDesc(description.getText());
+						Lecture.lecture.setName(textFieldLaborname.getText().trim());
+						Lecture.lecture.setDesc(description.getText().trim());
 						Lecture.lecture.setEnddate(dateChooserend.getDate());
 						Lecture.lecture.setStartdate(dateChooserstart.getDate());
-						Image.image.setImagename(textFieldLaborname.getText());
+						Image.image.setImagename(textFieldLaborname.getText().trim());
 
 						EditLectureSearch_GUI sr = new EditLectureSearch_GUI(c);
 						sr.setVisible(true);
@@ -452,8 +452,8 @@ public class EditLectureAllgemein_GUI extends JFrame {
 							isDateMaxLifeTimeCorrect = true;
 						}
 						// Pruefen ob alles eingegeben wurde
-						if (textFieldLaborname.getText().isEmpty() == true
-								|| description.getText().isEmpty() == true) {
+						if (textFieldLaborname.getText().trim().isEmpty() == true
+								|| description.getText().trim().isEmpty() == true) {
 							// mind 1 Textfeld ist leer
 							isAllInformationReady = false;
 							JOptionPane
@@ -481,14 +481,14 @@ public class EditLectureAllgemein_GUI extends JFrame {
 								&& descriptionLenghtOK() == true) {
 							// everything is ok, proceed
 							Lecture.lecture.setNewName(textFieldLaborname
-									.getText());
-							Lecture.lecture.setDesc(description.getText());
+									.getText().trim());
+							Lecture.lecture.setDesc(description.getText().trim());
 							Lecture.lecture.setEnddate(dateChooserend.getDate());
 							Lecture.lecture.setStartdate(dateChooserstart
 									.getDate());
 
 							Image.image.setImagename(textFieldLaborname
-									.getText());
+									.getText().trim());
 
 							PermissionEditLecture_GUI ev = new PermissionEditLecture_GUI(c);
 							ev.setVisible(true);
@@ -588,11 +588,11 @@ public class EditLectureAllgemein_GUI extends JFrame {
 		descriptionLengthOK = false;
 
 		// max length is 254 chars
-		if (description.getText().length() >= MAX_DESCRIPTION_LENGTH) {
+		if (description.getText().trim().length() >= MAX_DESCRIPTION_LENGTH) {
 			descriptionLengthOK = false;
 			JOptionPane.showMessageDialog(c,
 					"Die Beschreibung darf max 254 Zeichen enthalten. Aktuell enthält sie "
-							+ description.getText().length() + ".",
+							+ description.getText().trim().length() + ".",
 					"Beschreibung zu umfangreich",
 					JOptionPane.INFORMATION_MESSAGE);
 		} else {
diff --git a/dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java b/dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java
index ed2dccd6..4171ff0e 100644
--- a/dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java
@@ -149,6 +149,14 @@ public class EditLectureLink_GUI extends JFrame {
 	 * Create the dialog.
 	 */
 	public EditLectureLink_GUI(Component formerGUI) {
+		
+		try {
+			client.setTokenForSession(SessionData.session.getAuthToken());
+		} catch (TException e1) {
+			// TODO Auto-generated catch block
+			e1.printStackTrace();
+		}
+		
 		addWindowListener(new WindowAdapter() {
 			@Override
 			public void windowClosing(WindowEvent arg0) {
@@ -340,7 +348,7 @@ public class EditLectureLink_GUI extends JFrame {
 		textFieldName.addKeyListener(new KeyAdapter() {
 			@Override
 			public void keyReleased(KeyEvent e) {
-				String stext = textFieldName.getText();
+				String stext = textFieldName.getText().trim();
 				// Wenn Textfield nicht leer
 				if (stext != "") 
 				{
@@ -1184,13 +1192,6 @@ public class EditLectureLink_GUI extends JFrame {
 			}
 		});
 		menuBar.add(mnNewMenu_Info);
-
-		try {
-			client.setTokenForSession(SessionData.session.getAuthToken());
-		} catch (TException e1) {
-			// TODO Auto-generated catch block
-			e1.printStackTrace();
-		}
 		
 		c = this;
 
diff --git a/dozentenmodul/src/main/java/gui/lecture/EditLectureSearch_GUI.java b/dozentenmodul/src/main/java/gui/lecture/EditLectureSearch_GUI.java
index 5c40d936..6131350c 100644
--- a/dozentenmodul/src/main/java/gui/lecture/EditLectureSearch_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/EditLectureSearch_GUI.java
@@ -113,6 +113,13 @@ public class EditLectureSearch_GUI extends JFrame {
 	 * Create the dialog.
 	 */
 	public EditLectureSearch_GUI(Component formerGUI) {
+		
+		try {
+			client.setTokenForSession(SessionData.session.getAuthToken());
+		} catch (TException e1) {
+			// TODO Auto-generated catch block
+			e1.printStackTrace();
+		}
 
 		filters.add(RowFilter.regexFilter(".", 0));
 		rf = RowFilter.orFilter(filters);
@@ -240,7 +247,7 @@ public class EditLectureSearch_GUI extends JFrame {
 			@Override
 			public void keyReleased(KeyEvent e) {
 				// Textfield eingabe auslesen
-				String stext = textFieldName.getText();
+				String stext = textFieldName.getText().trim();
 				// Wenn Textfield nicht leer
 				if (stext != "") {
 					activeSearch = true;
@@ -644,12 +651,7 @@ public class EditLectureSearch_GUI extends JFrame {
 			}
 		});
 		menuBar.add(mnNewMenu_Info);
-		try {
-			client.setTokenForSession(SessionData.session.getAuthToken());
-		} catch (TException e1) {
-			// TODO Auto-generated catch block
-			e1.printStackTrace();
-		}
+
 		c = this;
 
 	}
diff --git a/dozentenmodul/src/main/java/gui/lecture/PermissionCreateLecture_GUI.java b/dozentenmodul/src/main/java/gui/lecture/PermissionCreateLecture_GUI.java
index 34ec3792..c57b13e3 100644
--- a/dozentenmodul/src/main/java/gui/lecture/PermissionCreateLecture_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/PermissionCreateLecture_GUI.java
@@ -122,6 +122,14 @@ public class PermissionCreateLecture_GUI extends JFrame {
 	// private JTable tablePermittedUsers;
 
 	public PermissionCreateLecture_GUI(Component formerGUI) {
+		
+		try {
+			client.setTokenForSession(SessionData.session.getAuthToken());
+		} catch (TException e1) {
+			// TODO Auto-generated catch block
+			e1.printStackTrace();
+		}
+		
 		addWindowListener(new WindowAdapter() {
 			@Override
 			public void windowClosing(WindowEvent arg0) {
@@ -543,12 +551,7 @@ public class PermissionCreateLecture_GUI extends JFrame {
 			}
 		});
 		menuBar.add(mnNewMenu_Info);
-		try {
-			client.setTokenForSession(SessionData.session.getAuthToken());
-		} catch (TException e1) {
-			// TODO Auto-generated catch block
-			e1.printStackTrace();
-		}
+
 		c = this;
 
 	}// end constructor
diff --git a/dozentenmodul/src/main/java/gui/lecture/PermissionEditLecture_GUI.java b/dozentenmodul/src/main/java/gui/lecture/PermissionEditLecture_GUI.java
index c42cb1bc..0278942c 100644
--- a/dozentenmodul/src/main/java/gui/lecture/PermissionEditLecture_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/PermissionEditLecture_GUI.java
@@ -105,6 +105,14 @@ public class PermissionEditLecture_GUI extends JFrame {
 	};
 
 	public PermissionEditLecture_GUI(Component formerGUI) {
+		
+		try {
+			client.setTokenForSession(SessionData.session.getAuthToken());
+		} catch (TException e1) {
+			// TODO Auto-generated catch block
+			e1.printStackTrace();
+		}
+		
 		addWindowListener(new WindowAdapter() {
 			@Override
 			public void windowClosing(WindowEvent arg0) {
@@ -562,12 +570,7 @@ public class PermissionEditLecture_GUI extends JFrame {
 			}
 		});
 		menuBar.add(mnNewMenu_Info);
-		try {
-			client.setTokenForSession(SessionData.session.getAuthToken());
-		} catch (TException e1) {
-			// TODO Auto-generated catch block
-			e1.printStackTrace();
-		}
+
 		c = this;
 
 	}// end constructor
diff --git a/dozentenmodul/src/main/java/gui/lecture/SearchLecture_GUI.java b/dozentenmodul/src/main/java/gui/lecture/SearchLecture_GUI.java
index 39978f3f..7401dc1c 100644
--- a/dozentenmodul/src/main/java/gui/lecture/SearchLecture_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/SearchLecture_GUI.java
@@ -120,6 +120,13 @@ public class SearchLecture_GUI extends JFrame {
 	 */

 	public SearchLecture_GUI(Component formerGUI) {

 		

+		try {

+			client.setTokenForSession(SessionData.session.getAuthToken());

+		} catch (TException e1) {

+			// TODO Auto-generated catch block

+			e1.printStackTrace();

+		}

+		

 		filters.add(RowFilter.regexFilter(".", 0));

 		rf = RowFilter.orFilter(filters);

 		

@@ -267,7 +274,7 @@ public class SearchLecture_GUI extends JFrame {
 			@Override

 			public void keyReleased(KeyEvent e) {

 				// Textfield eingabe auslesen

-				String stext = textFieldName.getText();

+				String stext = textFieldName.getText().trim();

 				// Wenn Textfield nicht leer

 				if (stext != "") {

 					activeSearch=true;

@@ -613,12 +620,7 @@ public class SearchLecture_GUI extends JFrame {
 			}

 		});

 		mnNewMenu_1.add(mntmAbout);

-		try {

-			client.setTokenForSession(SessionData.session.getAuthToken());

-		} catch (TException e1) {

-			// TODO Auto-generated catch block

-			e1.printStackTrace();

-		}

+

 		c = this;

 

 	}