• Ausgaben an sinnvollen gekürzt bzw. erweitert

12 files changed, 125 insertions, 122 deletions

diff --git a/dozentenmodul/src/main/java/gui/image/CreateImageAllgemein_GUI.java b/dozentenmodul/src/main/java/gui/image/CreateImageAllgemein_GUI.java
index 41dd1057..e40a2a1e 100644
--- a/dozentenmodul/src/main/java/gui/image/CreateImageAllgemein_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/CreateImageAllgemein_GUI.java
@@ -95,7 +95,7 @@ public class CreateImageAllgemein_GUI extends JFrame {
 			UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
 		} catch (ClassNotFoundException | InstantiationException
 				| IllegalAccessException | UnsupportedLookAndFeelException e) {
-			LOGGER.error("Setting look and feel from system failed.");
+			//LOGGER.error("Setting look and feel from system failed.");
 			e.printStackTrace();
 			JOptionPane.showMessageDialog(c,
 					"Konnte das Farbschema des Systems nicht ĂĽbernehmen.", "Debug-Message",
@@ -332,10 +332,10 @@ public class CreateImageAllgemein_GUI extends JFrame {
 							Image.image.setImagename(imagename.getText());
 							Image.image.setDesc(textAreadesc.getText());
 
-							LOGGER.info("Alle Eingaben in Ordnung. Imagename= \""
-									+ Image.image.getImagename()
-									+ "\", Imagebeschreibung=\""
-									+ Image.image.getDesc()+"\"");
+							//LOGGER.info("Alle Eingaben in Ordnung. Imagename= \""
+							//		+ Image.image.getImagename()
+							//		+ "\", Imagebeschreibung=\""
+							//		+ Image.image.getDesc()+"\"");
 							
 							// Zeige nächsten Schritt an
 							CreateImageTechnisch_GUI ea = new CreateImageTechnisch_GUI(c);
@@ -439,7 +439,7 @@ public class CreateImageAllgemein_GUI extends JFrame {
 				|| Hochschule.getText().isEmpty()
 				|| EMail.getText().isEmpty()) {
 			// missing some fields
-			LOGGER.info("Form has missing fields, warning user.");
+			//LOGGER.info("Form has missing fields, warning user.");
 			JOptionPane.showMessageDialog(c,
 							"Bitte geben Sie alle notwendigen Daten an!",
 							"Daten unvollständig",
@@ -451,7 +451,7 @@ public class CreateImageAllgemein_GUI extends JFrame {
 		// x2B= "+"   x2C="-"   x3A=":"   x5F="_"    
 		// 
 		if (!imagename.getText().trim().matches("[a-zA-Z0-9\\x2B\\x2D\\x3A\\x5F]+")) {
-			LOGGER.info("Image name not alpha-numerical, warn user.");
+			//LOGGER.info("Image name not alpha-numerical, warn user.");
 			JOptionPane.showMessageDialog(
 							c,
 							"Der Imagename darf nur aus Buchstaben, Zahlen und den Zeichen +  -  _  :  bestehen.",
diff --git a/dozentenmodul/src/main/java/gui/image/CreateImageTechnisch_GUI.java b/dozentenmodul/src/main/java/gui/image/CreateImageTechnisch_GUI.java
index 4508f128..b77f93ea 100644
--- a/dozentenmodul/src/main/java/gui/image/CreateImageTechnisch_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/CreateImageTechnisch_GUI.java
@@ -326,7 +326,7 @@ public class CreateImageTechnisch_GUI extends JFrame {
 						Image.image.setCpu(Integer.valueOf(spinnerCPU.getValue().toString()).intValue());
 						Image.image.setRam(Integer.valueOf(spinnerRam.getValue().toString()).intValue());
 						Image.image.setOS(comboBox.getSelectedItem().toString());
-						LOGGER.info("Betriebssystem: "+Image.image.getOS()+",  istVorlage: "+Image.image.isVorlage()+", Lizenzpflichtig: "+Image.image.isLicensed()+", Internetsperre: "+Image.image.isInternet()+", CPU: "+Image.image.getCpu()+",  RAM: "+Image.image.getRam());
+						//LOGGER.info("Betriebssystem: "+Image.image.getOS()+",  istVorlage: "+Image.image.isVorlage()+", Lizenzpflichtig: "+Image.image.isLicensed()+", Internetsperre: "+Image.image.isInternet()+", CPU: "+Image.image.getCpu()+",  RAM: "+Image.image.getRam());
 						PermissionCreateImage_GUI ea=new PermissionCreateImage_GUI(c);
 						ea.setVisible(true);
 						dispose();
diff --git a/dozentenmodul/src/main/java/gui/image/DeleteImage_GUI.java b/dozentenmodul/src/main/java/gui/image/DeleteImage_GUI.java
index e3f482e2..cb74f76f 100644
--- a/dozentenmodul/src/main/java/gui/image/DeleteImage_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/DeleteImage_GUI.java
@@ -59,6 +59,7 @@ import javax.swing.table.TableRowSorter;
 import models.Links;
 import models.person;
 
+import org.apache.log4j.Logger;
 import org.apache.thrift.TException;
 
 import server.generated.Server.Client;
@@ -69,6 +70,9 @@ import javax.swing.JTextArea;
 
 @SuppressWarnings("serial")
 public class DeleteImage_GUI extends JFrame {
+	
+	private final static Logger LOGGER = Logger
+			.getLogger(FTPCreateUploader_GUI.class);
 
 	private final JPanel contentPanel = new JPanel();
 	JLabel labelName;
@@ -212,7 +216,7 @@ public class DeleteImage_GUI extends JFrame {
 			UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
 		} catch (ClassNotFoundException | InstantiationException
 				| IllegalAccessException | UnsupportedLookAndFeelException e) {
-			// TODO Auto-generated catch block
+			 
 			e.printStackTrace();
 		}
 		// Setzt den Fenstertitel
@@ -320,7 +324,7 @@ public class DeleteImage_GUI extends JFrame {
 				comboBox.addItem(list.get(i));
 			}
 		} catch (TException e2) {
-			// TODO Auto-generated catch block
+			 
 			e2.printStackTrace();
 			JOptionPane.showMessageDialog(c,
 					e2.getCause() + "\n" + e2.getStackTrace(), "Debug-Message",
@@ -421,7 +425,6 @@ public class DeleteImage_GUI extends JFrame {
 												.getSelectedRow()), 7)
 								.toString();
 
-						// TODO
 						// Image darf nur geloescht werden, wenn keine
 						// Veranstaltung mehr auf das Image verweist.
 						// Unbdingt abfragen!
@@ -432,26 +435,26 @@ public class DeleteImage_GUI extends JFrame {
 								try {
 									client.deleteImageServer(imageid,
 											imageversion);
-									if (client.deleteImageData(imageid,
-											imageversion)) {
-										// if (client.deleteImageServer(imageid
-										// ,imageversion)) {
+									if (client.deleteImageData(imageid,imageversion)) {
+										
+										LOGGER.info("Image '"+imageid+"' erfolgreich gelöscht.");
 
 										DeleteImage_GUI di = new DeleteImage_GUI(c);
 										di.setVisible(true);
 										dispose();
 
 									} else {
+										LOGGER.info("Image '"+imageid+"' konnte nicht gelöscht werden.");
 
 										JOptionPane
 												.showConfirmDialog(
 														c,
-														"Löschen von der DB hat leider nicht geklappt!!",
+														"Image konnte nicht gelöscht werden.",
 														"Fehler",
 														JOptionPane.INFORMATION_MESSAGE);
 									}
 								} catch (HeadlessException e) {
-									// TODO Auto-generated catch block
+									 
 									e.printStackTrace();
 									JOptionPane.showMessageDialog(
 											c,
@@ -460,7 +463,7 @@ public class DeleteImage_GUI extends JFrame {
 											"Debug-Message",
 											JOptionPane.ERROR_MESSAGE);
 								} catch (TException e) {
-									// TODO Auto-generated catch block
+									 
 									e.printStackTrace();
 									JOptionPane.showMessageDialog(
 											c,
@@ -471,6 +474,7 @@ public class DeleteImage_GUI extends JFrame {
 								}
 
 							} else {
+								LOGGER.info("Image '"+imageid+"' konnte nicht gelöscht werden, da mindestens eine Veranstaltung mit diesem Image verlinkt ist.");
 
 								JOptionPane
 										.showMessageDialog(
@@ -480,7 +484,7 @@ public class DeleteImage_GUI extends JFrame {
 												JOptionPane.INFORMATION_MESSAGE);
 							}
 						} catch (TException e) {
-							// TODO Auto-generated catch block
+							 
 							e.printStackTrace();
 							JOptionPane.showMessageDialog(c, e.getCause()
 									+ "\n" + e.getStackTrace(),
@@ -710,7 +714,7 @@ public class DeleteImage_GUI extends JFrame {
 					open.openWebpage(windows);
 
 				} catch (URISyntaxException e) {
-					// TODO Auto-generated catch block
+					 
 					e.printStackTrace();
 				}
 			}
@@ -731,7 +735,7 @@ public class DeleteImage_GUI extends JFrame {
 					open.openWebpage(windows);
 
 				} catch (URISyntaxException e) {
-					// TODO Auto-generated catch block
+					 
 					e.printStackTrace();
 				}
 
@@ -802,7 +806,7 @@ public class DeleteImage_GUI extends JFrame {
 
 			return model;
 		} catch (TException | ParseException e1) {
-			// TODO Auto-generated catch block
+			 
 			e1.printStackTrace();
 			JOptionPane.showMessageDialog(c,
 					e1.getCause() + "\n" + e1.getStackTrace(), "Debug-Message",
@@ -860,7 +864,7 @@ public class DeleteImage_GUI extends JFrame {
 			labelVersion.setText(res.get("version"));
 			textAreadesc.setText(res.get("desc"));
 		} catch (TException | ParseException e1) {
-			// TODO Auto-generated catch block
+			 
 			e1.printStackTrace();
 		}
 	}
diff --git a/dozentenmodul/src/main/java/gui/image/EditImageAllgemein_GUI.java b/dozentenmodul/src/main/java/gui/image/EditImageAllgemein_GUI.java
index 28dae62b..89548a9b 100644
--- a/dozentenmodul/src/main/java/gui/image/EditImageAllgemein_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/EditImageAllgemein_GUI.java
@@ -340,12 +340,12 @@ public class EditImageAllgemein_GUI extends JFrame {
 							Image.image.setImagename(imagename.getText());
 							Image.image.setDesc(textAreadesc.getText());
 							// Info
-							LOGGER.info("Alle Eingaben in Ordnung. Imagename= \""
-											+ Image.image.getImagename()
-											+ ", NewImageName=\""
-											+ Image.image.getNewName()
-											+ "\", Imagebeschreibung=\""
-											+ Image.image.getDesc()+"\"");
+							//LOGGER.info("Alle Eingaben in Ordnung. Imagename= \""
+							//				+ Image.image.getImagename()
+							//				+ ", NewImageName=\""
+							//				+ Image.image.getNewName()
+							//				+ "\", Imagebeschreibung=\""
+							//				+ Image.image.getDesc()+"\"");
 
 							
 							EditImageTechnisch_GUI ea = new EditImageTechnisch_GUI(c);
@@ -451,7 +451,7 @@ public class EditImageAllgemein_GUI extends JFrame {
 			} else {
 				Image.image.setLicensed(true);
 			}
-			LOGGER.debug(map.get("template"));
+			//LOGGER.debug(map.get("template"));
 			if (map.get("template").equals("false")) {
 				Image.image.setVorlage(false);
 			} else {
diff --git a/dozentenmodul/src/main/java/gui/image/EditImageTechnisch_GUI.java b/dozentenmodul/src/main/java/gui/image/EditImageTechnisch_GUI.java
index a273d7cc..a3422be9 100644
--- a/dozentenmodul/src/main/java/gui/image/EditImageTechnisch_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/EditImageTechnisch_GUI.java
@@ -347,12 +347,13 @@ public class EditImageTechnisch_GUI extends JFrame {
 						
 						//System.out.println("OS bei Klick auf Weiter: "+Image.image.getOS());
 						
-						LOGGER.info("OS: " + Image.image.getOS() +
-									", Vorlage: " + Image.image.isVorlage() +
-									", Lizenzpflichtig: " + Image.image.isLicensed() +
-									", Internetsperre: " + Image.image.isInternet() +
-									", CPU: " + Image.image.getCpu() +
-									",  RAM: " + Image.image.getRam());
+						//LOGGER.info("OS: " + Image.image.getOS() +
+						//			", Vorlage: " + Image.image.isVorlage() +
+						//			", Lizenzpflichtig: " + Image.image.isLicensed() +
+						//			", Internetsperre: " + Image.image.isInternet() +
+						//			", CPU: " + Image.image.getCpu() +
+						//			",  RAM: " + Image.image.getRam());
+						
 						// oeffnet das naechste Fenster
 						PermissionEditImage_GUI ea=new PermissionEditImage_GUI(c);
 						ea.setVisible(true);
diff --git a/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java b/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java
index 66819a80..a2656a61 100644
--- a/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java
@@ -63,8 +63,7 @@ public class FTPCreateUploader_GUI extends JFrame implements
 	/**
 	 * Logger instance for this class.
 	 */
-	private final static Logger LOGGER = Logger
-			.getLogger(FTPCreateUploader_GUI.class);
+	private final static Logger LOGGER = Logger.getLogger(FTPCreateUploader_GUI.class);
 
 
 	@SuppressWarnings("unused")
@@ -397,10 +396,12 @@ public class FTPCreateUploader_GUI extends JFrame implements
 						//save data
 						boolean success = writeData();
 						if(success==true){
+							LOGGER.info("Neues Image '"+Image.image.getImagename()+"' erfolgreich gespeichert.");
 							JOptionPane.showMessageDialog(c,
 									"Die Daten wurden erfolgreich gespeichert.", "Daten gespeichert",
 									JOptionPane.INFORMATION_MESSAGE);
 						} else {
+							LOGGER.info("Neues Image '"+Image.image.getImagename()+"' konnte nicht gespeichert werden.");
 							JOptionPane.showMessageDialog(c,
 									"Die Daten konnten nicht gespeichert werden.", "Fehler",
 									JOptionPane.ERROR_MESSAGE);
@@ -574,9 +575,10 @@ public class FTPCreateUploader_GUI extends JFrame implements
 		try {
 			LOGGER.info("Getting FTP User...");
 			user = client.getFtpUser();
-			LOGGER.debug("FTP name: " + user.userName);
-			LOGGER.debug("FTP path: " + user.path);
-			LOGGER.debug("FTP pass: " + user.password);
+			LOGGER.info("Received FTP user.");
+			//LOGGER.debug("FTP name: " + user.userName);
+			//LOGGER.debug("FTP path: " + user.path);
+			//LOGGER.debug("FTP pass: " + user.password);
 		} catch (TException e) {
 			// TODO Auto-generated catch block
 			LOGGER.error("Konnte vom Satellit keinen FTP-User erhalten!");
@@ -587,10 +589,10 @@ public class FTPCreateUploader_GUI extends JFrame implements
 		}
 		DateFormat formatter = new SimpleDateFormat("yyyMMddHHmmss");
 
-		LOGGER.info("Setting new name: " + formatter.format(new Date()) + "_"
-				+ person.verantwortlicher.getHochschule() + "_"
-				+ person.verantwortlicher.getUsername() + "_"
-				+ Image.image.getImagename() + ".vmdk");
+		//LOGGER.info("Setting new name: " + formatter.format(new Date()) + "_"
+		//		+ person.verantwortlicher.getHochschule() + "_"
+		//		+ person.verantwortlicher.getUsername() + "_"
+		//		+ Image.image.getImagename() + ".vmdk");
 		Image.image.setNewName(formatter.format(new Date()) + "_"
 				+ person.verantwortlicher.getHochschule() + "_"
 				+ person.verantwortlicher.getUsername() + "_"
diff --git a/dozentenmodul/src/main/java/gui/image/FTPEditDownloader_GUI.java b/dozentenmodul/src/main/java/gui/image/FTPEditDownloader_GUI.java
index 5cd9d8f9..00ef5f8a 100644
--- a/dozentenmodul/src/main/java/gui/image/FTPEditDownloader_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/FTPEditDownloader_GUI.java
@@ -414,7 +414,7 @@ public class FTPEditDownloader_GUI extends JFrame implements
 				isAborted = true; // set flag
 				try {
 					client.DeleteFtpUser(user.userName);
-					LOGGER.info("Deleted FTP user.");
+					LOGGER.info("FTP user deleted.");
 				} catch (TException e1) {
 					// TODO Auto-generated catch block
 					e1.printStackTrace();
diff --git a/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java b/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java
index 348828fe..34f8c7f0 100644
--- a/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java
@@ -345,7 +345,7 @@ public class FTPEditUploader_GUI extends JFrame implements
 				isAborted = true; // set flag
 				try {
 					client.DeleteFtpUser(user.userName);
-					LOGGER.info("Deleted FTP user.");
+					LOGGER.info("FTP user deleted.");
 				} catch (TException e1) {
 					e1.printStackTrace();
 				}
@@ -375,6 +375,7 @@ public class FTPEditUploader_GUI extends JFrame implements
 						// save data
 						boolean success = updateData();
 						if (success == true) {
+							LOGGER.info("Bearbeitetes Image '"+Image.image.getImagename()+"' erfolgreich gespeichert.");
 							JOptionPane
 									.showMessageDialog(
 											c,
@@ -382,6 +383,7 @@ public class FTPEditUploader_GUI extends JFrame implements
 											"Ă„nderungen gespeichert",
 											JOptionPane.INFORMATION_MESSAGE);
 						} else {
+							LOGGER.error("Bearbeitetes Image  '"+Image.image.getImagename()+"'  konnte nicht gespeichert werden.");
 							JOptionPane
 									.showMessageDialog(
 											c,
@@ -551,11 +553,12 @@ public class FTPEditUploader_GUI extends JFrame implements
 		btnUploadStarten.setText("Bitte warten");
 
 		try {
-			LOGGER.info("Getting FTP-User...");
+			//LOGGER.info("Getting FTP-User...");
 			user = client.getFtpUser();
-			LOGGER.debug("FTP name: " + user.userName);
-			LOGGER.debug("FTP path: " + user.path);
-			LOGGER.debug("FTP pass: " + user.password);
+			LOGGER.info("Received FTP user.");
+			//LOGGER.debug("FTP name: " + user.userName);
+			//LOGGER.debug("FTP path: " + user.path);
+			//LOGGER.debug("FTP pass: " + user.password);
 		} catch (TException e) {
 			e.printStackTrace();
 			JOptionPane.showMessageDialog(c,
@@ -566,12 +569,12 @@ public class FTPEditUploader_GUI extends JFrame implements
 
 		// set new file name and path only when uploading a new file. else use
 		// old filename and path
-		LOGGER.info("Getting imagePath: "+Image.image.getImagepath());
-		LOGGER.info("Getting old 'newName': "+Image.image.getNewName());
-		LOGGER.info("Setting new File-Name: " + formatter.format(new Date()) + "_"
-				+ person.verantwortlicher.getHochschule() + "_"
-				+ person.verantwortlicher.getUsername() + "_"
-				+ Image.image.getImagename() + ".vmdk");
+		//LOGGER.info("Getting imagePath: "+Image.image.getImagepath());
+		//LOGGER.info("Getting old 'newName': "+Image.image.getNewName());
+		//LOGGER.info("Setting new File-Name: " + formatter.format(new Date()) + "_"
+		//		+ person.verantwortlicher.getHochschule() + "_"
+		//		+ person.verantwortlicher.getUsername() + "_"
+		//		+ Image.image.getImagename() + ".vmdk");
 		Image.image.setNewName(formatter.format(new Date()) + "_"
 				+ person.verantwortlicher.getHochschule() + "_"
 				+ person.verantwortlicher.getUsername() + "_"
@@ -646,13 +649,13 @@ public class FTPEditUploader_GUI extends JFrame implements
 	public boolean updateData() {
 
 		try {
-			LOGGER.debug("NewFileName: " + Image.image.getNewName());
-			LOGGER.debug("ImageName: " + Image.image.getImagename());
+			//LOGGER.debug("NewFileName: " + Image.image.getNewName());
+			//LOGGER.debug("ImageName: " + Image.image.getImagename());
 
 			//if a new file has been uploaded and new filename is set
 			if (Image.image.getNewName() != null) {
-				LOGGER.debug("(NOT NULL) new FileName is '"+Image.image.getNewName()+"', imagepath="
-						+ Image.image.getImagepath());
+			//	LOGGER.debug("(NOT NULL) new FileName is '"+Image.image.getNewName()+"', imagepath="
+			//			+ Image.image.getImagepath());
 				client.updateImageData(
 						Image.image.getImagename(),
 						Image.image.getImagename(),
@@ -674,7 +677,7 @@ public class FTPEditUploader_GUI extends JFrame implements
 				}
 
 			} else { //no new file uploaded and old file name stays
-				LOGGER.debug("(NULL) newName is '"+Image.image.getNewName()+"', imagepath="+ Image.image.getImagepath());
+				//LOGGER.debug("(NULL) newName is '"+Image.image.getNewName()+"', imagepath="+ Image.image.getImagepath());
 				
 				client.updateImageData(
 						Image.image.getImagename(),
diff --git a/dozentenmodul/src/main/java/gui/image/PermissionCreateImage_GUI.java b/dozentenmodul/src/main/java/gui/image/PermissionCreateImage_GUI.java
index 70fd2025..371841d4 100644
--- a/dozentenmodul/src/main/java/gui/image/PermissionCreateImage_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/PermissionCreateImage_GUI.java
@@ -57,7 +57,6 @@ import models.RightsManagement;
 import models.person;
 
 import org.apache.log4j.Logger;
-import org.apache.thrift.TException;
 
 import server.generated.Person;
 import server.generated.Server.Client;
@@ -200,7 +199,7 @@ public class PermissionCreateImage_GUI extends JFrame {
 		
 		// if new session, get values for table from database -> initialiting users
 		if (RightsManagement.rightsManagement.getPermittedUserList().size() <= 0) {
-			System.out.println("Loading data from db");
+			//System.out.println("Loading data from db");
 			//do nothing
 			/*try {
 				
@@ -237,11 +236,11 @@ public class PermissionCreateImage_GUI extends JFrame {
 			}*/
 		} else // read from model
 		{
-			System.out.println("reading from model");
-			System.out
-					.println("RightsManagement.rightsManagement.getPermittedUserList().size() = "
-							+ RightsManagement.rightsManagement
-									.getPermittedUserList().size());
+			//System.out.println("reading from model");
+			//System.out
+			//		.println("RightsManagement.rightsManagement.getPermittedUserList().size() = "
+			//				+ RightsManagement.rightsManagement
+			//						.getPermittedUserList().size());
 
 			List<person> listt = RightsManagement.rightsManagement
 					.getPermittedUserList();
@@ -259,10 +258,11 @@ public class PermissionCreateImage_GUI extends JFrame {
 						temp.isImageAdmin(), // Admin
 						temp.getUserID() // userID
 				};
-				System.out.println("Processing: " + temp.getName() + ", "
-						+ temp.getVorname() + ", " + temp.isImageRead() + ", "
-						+ temp.isImageWrite() + ", " + temp.isImageLinkAllowed() + ", "
-						+ temp.isImageAdmin() + ", " + temp.getUserID());
+				//System.out.println("Processing: " + temp.getName() + ", "
+				//		+ temp.getVorname() + ", " + temp.isImageRead() + ", "
+				//		+ temp.isImageWrite() + ", " + temp.isImageLinkAllowed() + ", "
+				//		+ temp.isImageAdmin() + ", " + temp.getUserID());
+				
 				// Fuege diese Objekte der Tabelle hinzu
 				model.addRow(obj);
 				x++;
@@ -334,11 +334,11 @@ public class PermissionCreateImage_GUI extends JFrame {
 				// delete selected users from table
 				int[] deletableRows= table.getSelectedRows();
 				int pointerCorrection=0; //after deleting a row, the length of selected rows is reduced by 1. This pointer counts the already deleted rows and correct the offset of i
-				LOGGER.info("deletabelRows.length="+deletableRows.length);
+				//LOGGER.info("deletabelRows.length="+deletableRows.length);
 				
 				for (int i=0; i<deletableRows.length; i++){
 					
-					LOGGER.info("Deleting rowCount["+i+"], tableRow number "+deletableRows[i-pointerCorrection]);
+					//LOGGER.info("Deleting rowCount["+i+"], tableRow number "+deletableRows[i-pointerCorrection]);
 					model.removeRow(deletableRows[i-pointerCorrection]);
 					pointerCorrection++;
 				}							
@@ -459,7 +459,7 @@ public class PermissionCreateImage_GUI extends JFrame {
 						for (int i = 0; i < table.getRowCount(); i++) {
 							checkIntegrity(i); // check integrity of each line
 												// again
-							System.out.println("in auto-correct");
+							//System.out.println("in auto-correct");
 						}
 
 						saveTableToList();
@@ -671,7 +671,7 @@ public class PermissionCreateImage_GUI extends JFrame {
 	// save the entered rights into the model and prepare them to be written to
 	// the database
 	private void saveTableToList() {
-		System.out.println("Saving Table to List");
+		//System.out.println("Saving Table to List");
 
 		List<person> list = new ArrayList<person>();
 
@@ -679,7 +679,7 @@ public class PermissionCreateImage_GUI extends JFrame {
 
 		// get values from table and save the checkbox values
 		if (map == null)
-			System.out.println("Error: map is null");
+			//System.out.println("Error: map is null");
 
 		// for (int i = 0; i < map.size(); i++) {
 		for (int i = 0; i < table.getRowCount(); i++) {
@@ -716,12 +716,12 @@ public class PermissionCreateImage_GUI extends JFrame {
 			}
 		}
 
-		System.out.println("Setting list information.\tTable size: "
-				+ table.getRowCount() + "\t List length (=selected users): "
-				+ list.size());
-		for (int y = 0; y < list.size(); y++) {
-			System.out.println("" + list.get(y).getName());
-		}
+		//System.out.println("Setting list information.\tTable size: "
+		//		+ table.getRowCount() + "\t List length (=selected users): "
+		//		+ list.size());
+		//for (int y = 0; y < list.size(); y++) {
+		//	System.out.println("" + list.get(y).getName());
+		//}
 
 		RightsManagement.rightsManagement.setPermittedUserList(list);
 	}// end saveTableToList()
diff --git a/dozentenmodul/src/main/java/gui/image/PermissionEditImage_GUI.java b/dozentenmodul/src/main/java/gui/image/PermissionEditImage_GUI.java
index 88a63883..1cb5d26a 100644
--- a/dozentenmodul/src/main/java/gui/image/PermissionEditImage_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/PermissionEditImage_GUI.java
@@ -188,7 +188,7 @@ public class PermissionEditImage_GUI extends JFrame {
 
 		// if new session, get values for table from database
 		if (RightsManagement.rightsManagement.getPermittedUserList().size() <= 0) {
-			System.out.println("Loading data from db");
+			//System.out.println("Loading data from db");
 			try {
 								
 				map = client.getPermissionForUserAndImage(person.verantwortlicher.getUserID(), Image.image.getImageId());
@@ -208,7 +208,7 @@ public class PermissionEditImage_GUI extends JFrame {
 							(boolean)map.get(x).isImage_admin(), // Admin
 							map.get(x).getUserID() // userID
 					};
-					System.out.println(map.get(x).isImage_read()+"gfhfxg");
+					//System.out.println(map.get(x).isImage_read()+"gfhfxg");
 					// Fuege diese Objekte der Tabelle hinzu
 					model.addRow(obj);
 					
@@ -223,11 +223,11 @@ public class PermissionEditImage_GUI extends JFrame {
 			}
 		} else // read from model
 		{
-			System.out.println("reading from model");
-			System.out
-					.println("RightsManagement.rightsManagement.getPermittedUserList().size() = "
-							+ RightsManagement.rightsManagement
-									.getPermittedUserList().size());
+			//System.out.println("reading from model");
+			//System.out
+			//		.println("RightsManagement.rightsManagement.getPermittedUserList().size() = "
+			//				+ RightsManagement.rightsManagement
+			//						.getPermittedUserList().size());
 
 			List<person> listt = RightsManagement.rightsManagement
 					.getPermittedUserList();
@@ -246,10 +246,11 @@ public class PermissionEditImage_GUI extends JFrame {
 						temp.isImageAdmin(), // Admin
 						temp.getUserID() // userID
 				};
-				System.out.println("Processing: " + temp.getName() + ", "
-						+ temp.getVorname() + ", " + temp.isImageRead() + ", "
-						+ temp.isImageWrite() + ", " + temp.isImageLinkAllowed() + ", "
-						+ temp.isImageAdmin() + ", " + temp.getUserID());
+				//System.out.println("Processing: " + temp.getName() + ", "
+				//		+ temp.getVorname() + ", " + temp.isImageRead() + ", "
+				//		+ temp.isImageWrite() + ", " + temp.isImageLinkAllowed() + ", "
+				//		+ temp.isImageAdmin() + ", " + temp.getUserID());
+				
 				// Fuege diese Objekte der Tabelle hinzu
 				model.addRow(obj);
 				x++;
@@ -337,11 +338,11 @@ public class PermissionEditImage_GUI extends JFrame {
 				// delete selected users from table
 				int[] deletableRows= table.getSelectedRows();
 				int pointerCorrection=0; //after deleting a row, the length of selected rows is reduced by 1. This pointer counts the already deleted rows and correct the offset of i
-				LOGGER.info("deletabelRows.length="+deletableRows.length);
+				//LOGGER.info("deletabelRows.length="+deletableRows.length);
 				
 				for (int i=0; i<deletableRows.length; i++){
 					
-					LOGGER.info("Deleting rowCount["+i+"], tableRow number "+deletableRows[i-pointerCorrection]);
+					//LOGGER.info("Deleting rowCount["+i+"], tableRow number "+deletableRows[i-pointerCorrection]);
 					model.removeRow(deletableRows[i-pointerCorrection]);
 					pointerCorrection++;
 				}
@@ -457,7 +458,7 @@ public class PermissionEditImage_GUI extends JFrame {
 						for (int i = 0; i < table.getRowCount(); i++) {
 							checkIntegrity(i); // check integrity of each line
 												// again
-							System.out.println("in auto-correct");
+							//System.out.println("in auto-correct");
 						}
 
 						saveTableToList();
@@ -557,7 +558,7 @@ public class PermissionEditImage_GUI extends JFrame {
 	// save the entered rights into the model and prepare them to be written to
 	// the database
 	private void saveTableToList() {
-		System.out.println("Saving Table to List");
+		//System.out.println("Saving Table to List");
 
 		List<person> list = new ArrayList<person>();
 
@@ -565,7 +566,7 @@ public class PermissionEditImage_GUI extends JFrame {
 
 		// get values from table and save the checkbox values
 		if (map == null)
-			System.out.println("Error: map is null");
+			//System.out.println("Error: map is null");
 
 		// for (int i = 0; i < map.size(); i++) {
 		for (int i = 0; i < table.getRowCount(); i++) {
diff --git a/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java b/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java
index 197068e8..0c9099c0 100644
--- a/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java
@@ -734,29 +734,24 @@ public class SearchEditImage_GUI extends JFrame {
 	// Initiale Beffuelung eines Table models
 	public DefaultTableModel initTableModel(DefaultTableModel model) {
 
-		LOGGER.debug("trying to init table first time... in: searcheditimage_gui");
+		//LOGGER.debug("trying to init table first time... in: searcheditimage_gui");
 		
 		List<server.generated.Image> images;
 		try {
 			// Hole eine Liste der passenden Images
 			images = client.getImageListPermissionWrite(person.verantwortlicher
 					.getUserID());
-			//System.out.println("User is: "
-				//	+ person.verantwortlicher.getUserID());
-			// images = client.getImageList(person.verantwortlicher.getUserID(),
-			// requiredPermission);
 
 			Iterator<server.generated.Image> i = images.iterator();
 			SimpleDateFormat in = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 			SimpleDateFormat out = new SimpleDateFormat("dd.MM.yyyy HH:mm:ss");
 			int x = 0;
-			//System.out.println("Imagesize is: "+images.size());
 
 			while (i.hasNext()) {
 				// erzeuge Objekte fuer die Tabelle
-				LOGGER.debug("Image last updated on: "
-						+ images.get(x).updateTime);
-				LOGGER.debug("Image name: " + images.get(x).getImageName());
+				//LOGGER.debug("Image last updated on: "
+				//		+ images.get(x).updateTime);
+				//LOGGER.debug("Image name: " + images.get(x).getImageName());
 				
 				Object[] obj = { images.get(x).getImageName(),
 						images.get(x).getLicenseRestriction(),
@@ -772,11 +767,11 @@ public class SearchEditImage_GUI extends JFrame {
 				// Fuege diese Objekte der Tabelle hinzu
 
 				model.addRow(obj);
-				LOGGER.info("Counting model.getRowCount(): "+model.getRowCount());
+				//LOGGER.info("Counting model.getRowCount(): "+model.getRowCount());
 				x++;
 				i.next();
 			}
-			LOGGER.info("Finished counting crap, mo"+model.getRowCount());
+			//LOGGER.info("Finished counting crap, mo"+model.getRowCount());
 
 			return model;
 		} 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 050b81d8..ba57605f 100644
--- a/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java
@@ -47,8 +47,6 @@ import javax.swing.UIManager;
 import javax.swing.UnsupportedLookAndFeelException;

 import javax.swing.border.EmptyBorder;

 import javax.swing.border.TitledBorder;

-import javax.swing.event.ChangeEvent;

-import javax.swing.event.ChangeListener;

 import javax.swing.event.ListSelectionEvent;

 import javax.swing.event.ListSelectionListener;

 import javax.swing.table.DefaultTableModel;

@@ -64,7 +62,6 @@ import org.apache.thrift.TException;
 

 import server.generated.Server.Client;

 import thrift.ThriftConnection;

-

 import util.OpenLinks;

 

 @SuppressWarnings("serial")

@@ -257,7 +254,7 @@ public class SearchImage_GUI extends JFrame {
 			UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());

 		} catch (ClassNotFoundException | InstantiationException

 				| IllegalAccessException | UnsupportedLookAndFeelException e) {

-			// TODO Auto-generated catch block

+			 

 			e.printStackTrace();

 		}

 		// Setzt den Fenstertitel

@@ -394,7 +391,7 @@ public class SearchImage_GUI extends JFrame {
 				comboBox.addItem(list.get(i));

 			}

 		} catch (TException e2) {

-			// TODO Auto-generated catch block

+			 

 			e2.printStackTrace();

 			JOptionPane.showMessageDialog(c,

 					e2.getCause() + "\n" + e2.getStackTrace(), "Debug-Message",

@@ -916,7 +913,7 @@ public class SearchImage_GUI extends JFrame {
 					open.openWebpage(windows);

 

 				} catch (URISyntaxException e) {

-					// TODO Auto-generated catch block

+					 

 					e.printStackTrace();

 				}

 			}

@@ -937,7 +934,7 @@ public class SearchImage_GUI extends JFrame {
 					open.openWebpage(windows);

 

 				} catch (URISyntaxException e) {

-					// TODO Auto-generated catch block

+					 

 					e.printStackTrace();

 				}

 

@@ -1002,7 +999,7 @@ public class SearchImage_GUI extends JFrame {
 

 			return model;

 		} catch (TException | ParseException e1) {

-			// TODO Auto-generated catch block

+			 

 			e1.printStackTrace();

 			JOptionPane.showMessageDialog(c,

 					e1.getCause() + "\n" + e1.getStackTrace(), "Debug-Message",

@@ -1048,7 +1045,7 @@ public class SearchImage_GUI extends JFrame {
 

 			return model;

 		} catch (TException | ParseException e1) {

-			// TODO Auto-generated catch block

+			 

 			e1.printStackTrace();

 			JOptionPane.showMessageDialog(c,

 					e1.getCause() + "\n" + e1.getStackTrace(), "Debug-Message",

@@ -1093,7 +1090,7 @@ public class SearchImage_GUI extends JFrame {
 

 				return model;

 			} catch (TException | ParseException e1) {

-				// TODO Auto-generated catch block

+				 

 				e1.printStackTrace();

 				JOptionPane.showMessageDialog(c,

 						e1.getCause() + "\n" + e1.getStackTrace(), "Debug-Message",

@@ -1165,7 +1162,7 @@ public class SearchImage_GUI extends JFrame {
 			labelWeitereVerantwortliche.setToolTipText(labelWeitereVerantwortliche.getText());

 			

 		} catch (TException | ParseException e1) {

-			// TODO Auto-generated catch block

+			 

 			e1.printStackTrace();

 		}

 	}