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

Conflicts:
	dozentenmodulserver/src/main/java/server/ServerHandler.java
	dozentenmodulserver/src/main/java/sql/SQL.java

27 files changed, 627 insertions, 645 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 778fbed1..89548a9b 100644
--- a/dozentenmodul/src/main/java/gui/image/EditImageAllgemein_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/EditImageAllgemein_GUI.java
@@ -37,6 +37,7 @@ import javax.swing.border.EmptyBorder;
 import javax.swing.border.TitledBorder;
 
 import models.Image;
+import models.ItemOwner;
 import models.Links;
 import models.person;
 
@@ -104,7 +105,6 @@ public class EditImageAllgemein_GUI extends JFrame {
 			UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
 		} catch (ClassNotFoundException | InstantiationException
 				| IllegalAccessException | UnsupportedLookAndFeelException e) {
-			// TODO Auto-generated catch block
 			e.printStackTrace();
 		}
 		// Setzt den Fenstertitel
@@ -159,8 +159,8 @@ public class EditImageAllgemein_GUI extends JFrame {
 		Vorname.setEditable(false);
 		Vorname.setEnabled(false);
 		Vorname.setBackground(Color.WHITE);
-		Vorname.setText(person.verantwortlicher.getVorname());
-		//Vorname.setText(Image.image.get);
+		//Vorname.setText(person.verantwortlicher.getVorname());
+		Vorname.setText(ItemOwner.itemOwner.getVorname());
 		Vorname.setColumns(10);
 		Vorname.setBounds(145, 245, 350, 20);
 		panel_1.add(Vorname);
@@ -174,7 +174,8 @@ public class EditImageAllgemein_GUI extends JFrame {
 		Nachname.setEnabled(false);
 		Nachname.setEditable(false);
 		Nachname.setBackground(Color.WHITE);
-		Nachname.setText(person.verantwortlicher.getName());
+		//Nachname.setText(person.verantwortlicher.getName());
+		Nachname.setText(ItemOwner.itemOwner.getNachname());
 		Nachname.setColumns(10);
 		Nachname.setBounds(145, 276, 350, 20);
 		panel_1.add(Nachname);
@@ -188,7 +189,8 @@ public class EditImageAllgemein_GUI extends JFrame {
 		Hochschule.setEnabled(false);
 		Hochschule.setEditable(false);
 		Hochschule.setBackground(Color.WHITE);
-		Hochschule.setText(person.verantwortlicher.getHochschule());
+		//Hochschule.setText(person.verantwortlicher.getHochschule());
+		Hochschule.setText(ItemOwner.itemOwner.getHochschule());
 		Hochschule.setColumns(10);
 		Hochschule.setBounds(145, 307, 350, 20);
 		panel_1.add(Hochschule);
@@ -202,7 +204,8 @@ public class EditImageAllgemein_GUI extends JFrame {
 		EMail.setEnabled(false);
 		EMail.setEditable(false);
 		EMail.setBackground(Color.WHITE);
-		EMail.setText(person.verantwortlicher.getEMail());
+		//EMail.setText(person.verantwortlicher.getEMail());
+		EMail.setText(ItemOwner.itemOwner.getEmail());
 		EMail.setColumns(10);
 		EMail.setBounds(145, 338, 350, 20);
 		panel_1.add(EMail);
@@ -337,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);
@@ -385,11 +388,8 @@ public class EditImageAllgemein_GUI extends JFrame {
 				URI windows;
 				try {
 					windows = new URI(Links.getFAQ());
-					
 					open.openWebpage(windows);
-					
 				} catch (URISyntaxException e) {
-					// TODO Auto-generated catch block
 					e.printStackTrace();
 				}
 			}
@@ -407,11 +407,8 @@ public class EditImageAllgemein_GUI extends JFrame {
 				URI windows;
 				try {
 					windows = new URI(Links.getOTRS());
-					
 					open.openWebpage(windows);
-					
 				} catch (URISyntaxException e) {
-					// TODO Auto-generated catch block
 					e.printStackTrace();
 				}
 				
@@ -427,14 +424,7 @@ public class EditImageAllgemein_GUI extends JFrame {
 			}
 		});
 		mnNewMenu_1.add(menuItem);
-		// setFocusTraversalPolicy(new FocusTraversalOnArray(new
-		// Component[]{getContentPane(), panel_2, lblNewLabel,
-		// txtpnBitteWhlenSie, contentPanel, panel_1, label, Vorname, label_7,
-		// Nachname, label_8, Hochschule, label_9, EMail, lblImagename,
-		// imagename, txtrGebenSieBitte, panel, lblPflichtfelder, lblHauptmen,
-		// label_1, lblVlimage, label_2, lblNewLabel_1, buttonPane, backButton,
-		// okButton, separator, separator_1, menuBar, mnNewMenu_1, mntmFaq,
-		// mntmOtrs}));
+
 		JMenu mnNewMenu_Info = new JMenu("Info");
 		mnNewMenu_Info.addMouseListener(new MouseAdapter() {
 			@Override
@@ -461,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 {
@@ -484,7 +474,6 @@ public class EditImageAllgemein_GUI extends JFrame {
 			Image.image.setShareMode(mode);
 			Image.image.setOS(map.get("os"));
 		} catch (TException e) {
-			// TODO Auto-generated catch block
 			e.printStackTrace();
 			JOptionPane.showMessageDialog(c,
 					e.getCause() + "\n" + e.getStackTrace(), "Debug-Message",
diff --git a/dozentenmodul/src/main/java/gui/image/EditImageTechnisch_GUI.java b/dozentenmodul/src/main/java/gui/image/EditImageTechnisch_GUI.java
index 012ae441..712b874a 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 e656a711..673b8537 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")
@@ -398,10 +397,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);
@@ -583,9 +584,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!");
@@ -596,10 +598,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 589fbf87..2c6dbc26 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,20 +649,19 @@ 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(),
 						Image.image.getDesc(),
 						//Image.image.getImagepath(),
 						"temp/"+Image.image.getNewName(),
-						
 						Image.image.isLicensed(),
 						Image.image.isInternet(),
 						Image.image.getRam(),
@@ -675,21 +677,24 @@ 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(),
 						Image.image.getImagename(),
 						Image.image.getDesc(),
-						
 						//"temp/" + Image.image.getNewName(), //wrong
 						Image.image.getImagepath(),
-						
-						Image.image.isLicensed(), Image.image.isInternet(),
-						Image.image.getRam(), Image.image.getCpu(),
-						Image.image.getImageId(), Image.image.getVersion(),
-						Image.image.isVorlage(), Image.image.getFilesize(),
-						Image.image.getShareMode(), Image.image.getOS());
+						Image.image.isLicensed(), 
+						Image.image.isInternet(),
+						Image.image.getRam(), 
+						Image.image.getCpu(),
+						Image.image.getImageId(), 
+						Image.image.getVersion(),
+						Image.image.isVorlage(), 
+						Image.image.getFilesize(),
+						Image.image.getShareMode(), 
+						Image.image.getOS());
 
 				if (fileupload == true) {
 					client.startFileCopy(Image.image.getNewName());
@@ -697,7 +702,6 @@ public class FTPEditUploader_GUI extends JFrame implements
 				}
 			}
 
-			// set additional user rights - quick and dirty TODO refactor
 
 			// remove all additional user permissions on first stage
 
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 cfb83308..0c9099c0 100644
--- a/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java
@@ -21,6 +21,7 @@ import java.net.URISyntaxException;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -53,6 +54,7 @@ import javax.swing.table.TableModel;
 import javax.swing.table.TableRowSorter;
 
 import models.Image;
+import models.ItemOwner;
 import models.Links;
 import models.person;
 
@@ -442,7 +444,12 @@ public class SearchEditImage_GUI extends JFrame {
 													.convertRowIndexToModel(tablemyImages
 															.getSelectedRow()),
 											7).toString();
+							
+							//write the values into the information pane on the right hand side
 							writeImageData(imageid, version);
+							
+							//fill the itemOwnder model with information from selected item
+							setItemOwnerInformation(imageid);
 						}
 					}
 				});
@@ -673,7 +680,6 @@ public class SearchEditImage_GUI extends JFrame {
 					open.openWebpage(windows);
 
 				} catch (URISyntaxException e) {
-					// TODO Auto-generated catch block
 					e.printStackTrace();
 				}
 			}
@@ -694,7 +700,6 @@ public class SearchEditImage_GUI extends JFrame {
 					open.openWebpage(windows);
 
 				} catch (URISyntaxException e) {
-					// TODO Auto-generated catch block
 					e.printStackTrace();
 				}
 
@@ -729,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(),
@@ -767,15 +767,14 @@ 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) {
-			// TODO Auto-generated catch block
 			e1.printStackTrace();
 			JOptionPane.showMessageDialog(c,
 					e1.getCause() + "\n" + e1.getStackTrace(), "Debug-Message",
@@ -846,10 +845,32 @@ public class SearchEditImage_GUI extends JFrame {
 			
 			
 		} catch (TException | ParseException e1) {
-			// TODO Auto-generated catch block
 			e1.printStackTrace();
 		}
-	}
+	}//end writeImageData
+	
+	
+	public void setItemOwnerInformation(String imageid){
+		Map<String, String> map = new HashMap<String, String>();
+		
+		try {
+			//get values from server and set them in model
+			map=client.getItemOwner(imageid);
+			
+			ItemOwner.itemOwner.setUserID(map.get("userID"));
+			ItemOwner.itemOwner.setUsername(map.get("loginName"));
+			ItemOwner.itemOwner.setNachname(map.get("Nachname"));
+			ItemOwner.itemOwner.setVorname(map.get("Vorname"));
+			ItemOwner.itemOwner.setEmail(map.get("mail"));
+			ItemOwner.itemOwner.setHochschule(map.get("institution"));
+						
+			
+		} catch (TException e) {
+			e.printStackTrace();
+		}
+		
+	}//end setItemInformation
+	
 	
 	public static String byteToGigabyte(long bytes, boolean si) {
 	    int unit = si ? 1000 : 1024;
@@ -857,5 +878,5 @@ public class SearchEditImage_GUI extends JFrame {
 	    int exp = (int) (Math.log(bytes) / Math.log(unit));
 	    String pre = (si ? "kMGTPE" : "KMGTPE").charAt(exp-1) + (si ? "" : "i");
 	    return String.format("%.1f %sB", bytes / Math.pow(unit, exp), pre);
-	}
-}
+	}//end byteToGigabyte
+}// end class
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();

 		}

 	}

diff --git a/dozentenmodul/src/main/java/gui/intro/ListAllOtherUsers_GUI.java b/dozentenmodul/src/main/java/gui/intro/ListAllOtherUsers_GUI.java
index c67ad6cb..4c24e035 100644
--- a/dozentenmodul/src/main/java/gui/intro/ListAllOtherUsers_GUI.java
+++ b/dozentenmodul/src/main/java/gui/intro/ListAllOtherUsers_GUI.java
@@ -79,9 +79,8 @@ public class ListAllOtherUsers_GUI extends JFrame {
 
 	ThriftConnection con = new ThriftConnection();
 	Client client = models.Client.clientcon.getClient();
-	final DefaultTableModel modelUsers = new DefaultTableModel(titles, 0);
-	final TableRowSorter<TableModel> rowSorterAll = new TableRowSorter<TableModel>(
-			modelUsers);
+	//final DefaultTableModel modelUsers = new DefaultTableModel(titles, 0);
+	
 	private JButton btnAdd;
 	private List<Person> map = null; // List of people
 	private JTextField textField;
@@ -96,6 +95,16 @@ public class ListAllOtherUsers_GUI extends JFrame {
 			+ "Sie können die Veranstaltungen hier löschen. Alternativ werden veraltete Einträge irgendwann automatisch gelöscht.<br />"
 			+ "Veraltet bedeutet, dass Veranstaltungen, die drei Monate lang nicht augerufen wurden, vorerst deaktiviert werden."
 			+ "</div></html>";
+	
+	
+	//prevent table cells being clickable
+	final DefaultTableModel modelUsers = new DefaultTableModel(titles, 0){
+		public boolean isCellEditable(int rowIndex, int mColIndex) {
+			return false;
+		}
+	};
+	
+	final TableRowSorter<TableModel> rowSorterAll = new TableRowSorter<TableModel>(modelUsers);
 
 	/**
 	 * 
@@ -267,11 +276,6 @@ public class ListAllOtherUsers_GUI extends JFrame {
 								model.addRow(obj);
 							}
 
-							System.out.println("Info in row("
-									+ pos
-									+ ") is="
-									+ tableUsers.getValueAt(selectedRows[pos],
-											0));
 							pos++;// next selected row
 						}
 					}// end if
@@ -359,21 +363,17 @@ public class ListAllOtherUsers_GUI extends JFrame {
 	// get users from db which are not in listed in the permission yet
 	public void initTableContent() {
 		
-		LOGGER.info("Getting list of all other users from server");
+		//LOGGER.info("Getting list of all other users from server");
 		try {
 			
 			//set users which are NOT to be listed in table
 			//logged on user
-			System.out.println("adding value'"+ person.verantwortlicher.getUserID());
 			user.add(0, person.verantwortlicher.getUserID());
 			
 			//users already in table
 			for(int y=0; y<table.getRowCount(); y++){
-				System.out.println("adding value'"+table.getValueAt(y, userIDPos)+"'");
 				user.add(""+table.getValueAt(y, userIDPos));
-			}
-			System.out.println("user has '"+user.size()+"' elements.");
-			
+			}			
 			
 			//get the info
 			map = client.getAllOtherSatelliteUsers(user);
diff --git a/dozentenmodul/src/main/java/gui/intro/Login_GUI.java b/dozentenmodul/src/main/java/gui/intro/Login_GUI.java
index 879ae879..e2105074 100644
--- a/dozentenmodul/src/main/java/gui/intro/Login_GUI.java
+++ b/dozentenmodul/src/main/java/gui/intro/Login_GUI.java
@@ -373,8 +373,8 @@ public class Login_GUI extends JFrame {
 			models.Client.clientcon.setClient(bwClient);
 
 			// User-Info
-			LOGGER.debug("Session-ID: " + result.sessionId);
-			LOGGER.debug("Token: " + result.authToken);
+			//LOGGER.debug("Session-ID: " + result.sessionId);
+			//LOGGER.debug("Token: " + result.authToken);
 			setStatus(Color.green, "Daten erhalten.", null);
 			
 			String hochschule = user.eMail.substring(user.eMail.indexOf("@") + 1);
@@ -476,9 +476,9 @@ public class Login_GUI extends JFrame {
 		server.generated.Server.Client client_2 = models.Client.clientcon.getClient();
 		try {
 			String pk_institution = client_2.setInstitution(person.verantwortlicher.getHochschule());
-			LOGGER.info("Institution of user is: "+pk_institution);
+			//LOGGER.info("Institution of user is: "+pk_institution);
 			client_2.setPerson(person.verantwortlicher.getUserID(), person.verantwortlicher.getName(), person.verantwortlicher.getVorname(), person.verantwortlicher.getEMail(), pk_institution);
-			LOGGER.info("user data, ID="+person.verantwortlicher.getUserID()+" , Name="+person.verantwortlicher.getName()+" , Vorname="+ person.verantwortlicher.getVorname()+" , E-Mail="+ person.verantwortlicher.getEMail()+" , Institution="+ pk_institution);
+			//LOGGER.info("user data, ID="+person.verantwortlicher.getUserID()+" , Name="+person.verantwortlicher.getName()+" , Vorname="+ person.verantwortlicher.getVorname()+" , E-Mail="+ person.verantwortlicher.getEMail()+" , Institution="+ pk_institution);
 		} catch (TException e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
diff --git a/dozentenmodul/src/main/java/gui/intro/MainMenue_GUI.java b/dozentenmodul/src/main/java/gui/intro/MainMenue_GUI.java
index 0f68de44..724eac5c 100644
--- a/dozentenmodul/src/main/java/gui/intro/MainMenue_GUI.java
+++ b/dozentenmodul/src/main/java/gui/intro/MainMenue_GUI.java
@@ -47,6 +47,7 @@ import javax.swing.border.TitledBorder;
 import models.GUIRights;
 import models.Image;
 import models.ImageRights;
+import models.ItemOwner;
 import models.Lecture;
 import models.Links;
 import models.RightsManagement;
@@ -139,12 +140,16 @@ public class MainMenue_GUI extends JFrame {
 			panel.add(txtpnBitteWhlenSie);
 		}
 		
-		//reset the list of permissions every time the user goes back to the main menu
+		
+		
+		//reset the list of permissions and models
+		//every time the user goes back to the main menu
 		RightsManagement.rightsManagement.getPermittedUserList().clear();
-		//reset model
 		Image.image.reset();
-		//Lecture.lecture.reset();
+		ItemOwner.itemOwner.reset();
 
+		
+		
 		setResizable(false); // window is not resizable
 		
 		contentPanel.setBounds(10, 104, 567, 502);
@@ -597,13 +602,6 @@ public class MainMenue_GUI extends JFrame {
 			GUIRights.rights.setLinkAllowed(0);
 		}// end if else
 		
-		// always print rights information 
-		//LOGGER.info("Rights: (r, w, cp, a, la) = ("
-		//		+ GUIRights.rights.getRead() + ", "
-		//		+ GUIRights.rights.getWrite() + ", "
-		//		+ GUIRights.rights.getChangePermission() + ", "
-		//		+ GUIRights.rights.getAdmin() + ", "
-		//		+ GUIRights.rights.getLinkAllowed() + ")");
 	}// end setRoleRights
 
 	public void setCorrectRadioButton() {
diff --git a/dozentenmodul/src/main/java/gui/intro/VmWareLink_GUI.java b/dozentenmodul/src/main/java/gui/intro/VmWareLink_GUI.java
index 2d50fd8b..fe3c1c9c 100644
--- a/dozentenmodul/src/main/java/gui/intro/VmWareLink_GUI.java
+++ b/dozentenmodul/src/main/java/gui/intro/VmWareLink_GUI.java
@@ -60,7 +60,7 @@ public class VmWareLink_GUI extends JFrame {
 			UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
 		} catch (ClassNotFoundException | InstantiationException
 				| IllegalAccessException | UnsupportedLookAndFeelException e) {
-			// TODO Auto-generated catch block
+			 
 			e.printStackTrace();
 		}
 		setTitle("bwLehrpool Suite");
@@ -131,7 +131,7 @@ public class VmWareLink_GUI extends JFrame {
 					open.openWebpage(windows);
 					
 				} catch (URISyntaxException e) {
-					// TODO Auto-generated catch block
+					 
 					e.printStackTrace();
 				}
 				
@@ -151,7 +151,7 @@ public class VmWareLink_GUI extends JFrame {
 					open.openWebpage(linux);
 					
 				} catch (URISyntaxException f) {
-					// TODO Auto-generated catch block
+					 
 					f.printStackTrace();
 				}
 			}
@@ -170,7 +170,7 @@ public class VmWareLink_GUI extends JFrame {
 					anleitung = new URI(Links.getAnleitungVMDK());
 					open.openWebpage(anleitung);
 				} catch (URISyntaxException e1) {
-					// TODO Auto-generated catch block
+					 
 					e1.printStackTrace();
 				}
 			}
@@ -229,7 +229,7 @@ public class VmWareLink_GUI extends JFrame {
 								open.openWebpage(windows);
 								
 							} catch (URISyntaxException e) {
-								// TODO Auto-generated catch block
+								 
 								e.printStackTrace();
 							}
 
@@ -253,7 +253,7 @@ public class VmWareLink_GUI extends JFrame {
 								open.openWebpage(windows);
 								
 							} catch (URISyntaxException e) {
-								// TODO Auto-generated catch block
+								 
 								e.printStackTrace();
 							}
 
diff --git a/dozentenmodul/src/main/java/gui/lecture/CreateLectureAllgemein_GUI.java b/dozentenmodul/src/main/java/gui/lecture/CreateLectureAllgemein_GUI.java
index b4c54ab3..3969eb0d 100644
--- a/dozentenmodul/src/main/java/gui/lecture/CreateLectureAllgemein_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/CreateLectureAllgemein_GUI.java
@@ -104,7 +104,7 @@ public class CreateLectureAllgemein_GUI extends JFrame {
 			UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
 		} catch (ClassNotFoundException | InstantiationException
 				| IllegalAccessException | UnsupportedLookAndFeelException e) {
-			// TODO Auto-generated catch block
+			 
 			e.printStackTrace();
 		}
 		setTitle("bwLehrpool Suite - Veranstaltung erzeugen");
@@ -509,7 +509,7 @@ public class CreateLectureAllgemein_GUI extends JFrame {
 					windows = new URI(Links.getFAQ());
 					open.openWebpage(windows);
 				} catch (URISyntaxException e) {
-					// TODO Auto-generated catch block
+					 
 					e.printStackTrace();
 				}
 			}
@@ -528,7 +528,7 @@ public class CreateLectureAllgemein_GUI extends JFrame {
 					windows = new URI(Links.getOTRS());
 					open.openWebpage(windows);
 				} catch (URISyntaxException e) {
-					// TODO Auto-generated catch block
+					 
 					e.printStackTrace();
 				}
 			}
diff --git a/dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java b/dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java
index f5b157de..c9e8dbd0 100644
--- a/dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java
@@ -1,5 +1,6 @@
 package gui.lecture;
 
+import gui.image.FTPCreateUploader_GUI;
 import gui.intro.About_GUI;
 import gui.intro.MainMenue_GUI;
 
@@ -58,6 +59,7 @@ import models.Links;
 import models.RightsManagement;
 import models.person;
 
+import org.apache.log4j.Logger;
 import org.apache.thrift.TException;
 
 import server.generated.Server.Client;
@@ -71,6 +73,8 @@ import javax.swing.event.ListSelectionListener;
 
 @SuppressWarnings("serial")
 public class CreateLectureLink_GUI extends JFrame {
+	
+	private final static Logger LOGGER = Logger.getLogger(FTPCreateUploader_GUI.class);
 
 	private final JPanel contentPanel = new JPanel();
 	String[] result;
@@ -118,23 +122,11 @@ public class CreateLectureLink_GUI extends JFrame {
 			return false;
 		}
 	};
-	/*
-	final DefaultTableModel modelPublicVorlagen = new DefaultTableModel(titles,
-			0) {
-		public boolean isCellEditable(int rowIndex, int mColIndex) {
-			return false;
-		}
-	};
-	*/
-	// final TableRowSorter<TableModel> rowSorterAll = new
-	// TableRowSorter<TableModel>(
-	// modelAll);
+	
 	final TableRowSorter<TableModel> rowSorterMyImages = new TableRowSorter<TableModel>(
 			modelMyImages);
 
-	// final TableRowSorter<TableModel> rowSorterPublicVorlagen = new
-	// TableRowSorter<TableModel>(
-	// modelPublicVorlagen);
+	
 	
 	RowFilter rf = null;
 	List<RowFilter<Object,Object>> filters = new ArrayList<RowFilter<Object,Object>>(2);
@@ -158,13 +150,11 @@ public class CreateLectureLink_GUI extends JFrame {
 			public void windowOpened(WindowEvent arg0) {
 				try {
 					initTableModel(modelMyImages);
-					//initTableModel(modelAll);
-					//initTableModel(modelPublicVorlagen);
+
 				} catch (TException e) {
-					// TODO Auto-generated catch block
+
 					e.printStackTrace();
 				} catch (ParseException e) {
-					// TODO Auto-generated catch block
 					e.printStackTrace();
 				}
 
@@ -202,7 +192,7 @@ public class CreateLectureLink_GUI extends JFrame {
 			UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
 		} catch (ClassNotFoundException | InstantiationException
 				| IllegalAccessException | UnsupportedLookAndFeelException e) {
-			// TODO Auto-generated catch block
+			 
 			e.printStackTrace();
 		}
 		setTitle("bwLehrpool Suite - Veranstaltung erzeugen");
@@ -299,7 +289,7 @@ public class CreateLectureLink_GUI extends JFrame {
 				comboBox.addItem(list.get(i));
 			}
 		} catch (TException e) {
-			// TODO Auto-generated catch block
+			 
 			e.printStackTrace();
 			JOptionPane.showMessageDialog(c,
 					e.getCause() + "\n" + e.getStackTrace(), "Debug-Message",
@@ -382,12 +372,13 @@ public class CreateLectureLink_GUI extends JFrame {
 												.getSelectedRow()), 7)
 								.toString();
 						try {
+							//write the image data to the information fields on the right
 							writeImageData(imageid, version);
 						} catch (TException e1) {
-							// TODO Auto-generated catch block
+							 
 							e1.printStackTrace();
 						} catch (ParseException e1) {
-							// TODO Auto-generated catch block
+							 
 							e1.printStackTrace();
 						}
 						}
@@ -476,7 +467,7 @@ public class CreateLectureLink_GUI extends JFrame {
 								
 								//set rights for additional users
 								for(int i=0; i< RightsManagement.rightsManagement.getPermittedUserList().size(); i++){
-									System.out.println("Writing additional rights for user "+RightsManagement.rightsManagement.getPermittedUserList().get(i).getUserID()+", User "+(i+1)+"/"+RightsManagement.rightsManagement.getPermittedUserList().size());
+									//System.out.println("Writing additional rights for user "+RightsManagement.rightsManagement.getPermittedUserList().get(i).getUserID()+", User "+(i+1)+"/"+RightsManagement.rightsManagement.getPermittedUserList().size());
 									client.writeAdditionalLectureRights(
 											uuid,
 											RightsManagement.rightsManagement.getPermittedUserList().get(i).getUserID(),
@@ -487,6 +478,7 @@ public class CreateLectureLink_GUI extends JFrame {
 								
 								}//end for
 								
+								LOGGER.info("Veranstaltung '"+Lecture.lecture.getName()+"' wurde erfolgreich angelegt.");
 								
 								JOptionPane
 										.showMessageDialog(
@@ -498,7 +490,8 @@ public class CreateLectureLink_GUI extends JFrame {
 								MainMenue_GUI m = new MainMenue_GUI(c);
 								m.setVisible(true);
 							} catch (TException e1) {
-								// TODO Auto-generated catch block
+								LOGGER.error("Veranstaltung '"+Lecture.lecture.getName()+"' konnte nicht angelegt werden.");
+								 
 								e1.printStackTrace();
 								JOptionPane
 										.showMessageDialog(
@@ -680,7 +673,7 @@ public class CreateLectureLink_GUI extends JFrame {
 					open.openWebpage(windows);
 
 				} catch (URISyntaxException e) {
-					// TODO Auto-generated catch block
+					 
 					e.printStackTrace();
 				}
 			}
@@ -701,7 +694,7 @@ public class CreateLectureLink_GUI extends JFrame {
 					open.openWebpage(windows);
 
 				} catch (URISyntaxException e) {
-					// TODO Auto-generated catch block
+					 
 					e.printStackTrace();
 				}
 
diff --git a/dozentenmodul/src/main/java/gui/lecture/DeleteLecture_GUI.java b/dozentenmodul/src/main/java/gui/lecture/DeleteLecture_GUI.java
index 685f3a81..44e0c4f5 100644
--- a/dozentenmodul/src/main/java/gui/lecture/DeleteLecture_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/DeleteLecture_GUI.java
@@ -90,9 +90,7 @@ public class DeleteLecture_GUI extends JFrame {
 	Client client = models.Client.clientcon.getClient();
 
 	final DefaultTableModel modelMyLectures = new DefaultTableModel(titles, 0);
-	
 
-	
 	final TableRowSorter<TableModel> rowSorterMyLectures = new TableRowSorter<TableModel>(
 			modelMyLectures);
 	private JButton button;
@@ -105,18 +103,19 @@ public class DeleteLecture_GUI extends JFrame {
 			+ "Sie können die Veranstaltungen hier löschen. Alternativ werden veraltete Einträge irgendwann automatisch gelöscht.<br />"
 			+ "Veraltet bedeutet, dass Veranstaltungen, die drei Monate lang nicht augerufen wurden, vorerst deaktiviert werden."
 			+ "</div></html>";
-	
+
 	RowFilter rf = null;
-	List<RowFilter<Object,Object>> filters = new ArrayList<RowFilter<Object,Object>>(2);
+	List<RowFilter<Object, Object>> filters = new ArrayList<RowFilter<Object, Object>>(
+			2);
 
 	/**
 	 * Create the dialog.
 	 */
 	public DeleteLecture_GUI(Component formerGUI) {
-		
+
 		filters.add(RowFilter.regexFilter(".", 0));
 		rf = RowFilter.orFilter(filters);
-		
+
 		addWindowListener(new WindowAdapter() {
 			@Override
 			public void windowClosing(WindowEvent arg0) {
@@ -130,10 +129,10 @@ public class DeleteLecture_GUI extends JFrame {
 				textFieldName.requestFocusInWindow();
 				try {
 					initTableModel(modelMyLectures);
-					//initTableModel(modelAll);
+					// initTableModel(modelAll);
 
 				} catch (ParseException e) {
-					// TODO Auto-generated catch block
+
 					e.printStackTrace();
 				}
 
@@ -163,7 +162,6 @@ public class DeleteLecture_GUI extends JFrame {
 				tablemyLectures.getColumnModel().getColumn(8).setMinWidth(0);
 				tablemyLectures.getColumnModel().getColumn(8).setMaxWidth(0);
 
-	
 			}
 		});
 		// Verhindert das Vergroessern Des Fensters
@@ -174,7 +172,7 @@ public class DeleteLecture_GUI extends JFrame {
 			UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
 		} catch (ClassNotFoundException | InstantiationException
 				| IllegalAccessException | UnsupportedLookAndFeelException e) {
-			// TODO Auto-generated catch block
+
 			e.printStackTrace();
 		}
 		// Setzt den Fenstertitel
@@ -232,29 +230,31 @@ public class DeleteLecture_GUI extends JFrame {
 				// Textfield eingabe auslesen
 				String stext = textFieldName.getText();
 				// Wenn Textfield nicht leer
-				if (stext != "") 
-				{
+				if (stext != "") {
 					activeSearch = true;
 					// Filtere nach der Eingabe
 
-				 	filters.clear();
-					filters.add(RowFilter.regexFilter("(?i)"+stext, 0)); //case insensitive
-					filters.add(RowFilter.regexFilter("(?i)"+stext, 1)); //case insensitive
+					filters.clear();
+					filters.add(RowFilter.regexFilter("(?i)" + stext, 0)); // case
+																			// insensitive
+					filters.add(RowFilter.regexFilter("(?i)" + stext, 1)); // case
+																			// insensitive
 					rf = RowFilter.orFilter(filters);
 					rowSorterMyLectures.setRowFilter(rf);
 
-				} 
-				else 
-				{
+				} else {
 					activeSearch = false;
 					filters.clear();
-					filters.add(RowFilter.regexFilter(".", 0)); //case insensitive, filter for anything
+					filters.add(RowFilter.regexFilter(".", 0)); // case
+																// insensitive,
+																// filter for
+																// anything
 					rf = RowFilter.orFilter(filters);
 					rowSorterMyLectures.setRowFilter(rf);
 				}
-				
+
 				tablemyLectures.clearSelection();
-				
+
 				resetLectureInfo();
 			}
 		});
@@ -301,28 +301,27 @@ public class DeleteLecture_GUI extends JFrame {
 		tablemyLectures.getSelectionModel().addListSelectionListener(
 				new ListSelectionListener() {
 					public void valueChanged(ListSelectionEvent e) {
-						
-						if(tablemyLectures.getSelectedRow() != -1)
-						{
-						String imageid = modelMyLectures.getValueAt(
-								tablemyLectures
-										.convertRowIndexToModel(tablemyLectures
-												.getSelectedRow()), 8)
-								.toString();
 
-						try {
-							writeLectureData(imageid);
-						} catch (TException e1) {
-							// TODO Auto-generated catch block
-							e1.printStackTrace();
-						} catch (ParseException e1) {
-							// TODO Auto-generated catch block
-							e1.printStackTrace();
+						if (tablemyLectures.getSelectedRow() != -1) {
+							String imageid = modelMyLectures
+									.getValueAt(
+											tablemyLectures
+													.convertRowIndexToModel(tablemyLectures
+															.getSelectedRow()),
+											8).toString();
+
+							try {
+								writeLectureData(imageid);
+							} catch (TException e1) {
+
+								e1.printStackTrace();
+							} catch (ParseException e1) {
+
+								e1.printStackTrace();
+							}
 						}
 					}
-					}
-					
-					
+
 				});
 		tablemyLectures.setModel(modelMyLectures);
 
@@ -334,103 +333,67 @@ public class DeleteLecture_GUI extends JFrame {
 		tablemyLectures.setRowSorter(rowSorterMyLectures);
 
 		scrollPaneMyImage.setViewportView(tablemyLectures);
-		
-				button = new JButton("Löschen");
-				button.setBounds(442, 495, 118, 23);
-				contentPanel.add(button);
-				button.addActionListener(new ActionListener() {
-					public void actionPerformed(ActionEvent e) {
 
-						String lectureID = "";
-						int eingabe;
-						String username = person.verantwortlicher.getName() + " "
-								+ person.verantwortlicher.getVorname();
-						// check if a row is selected
-						if (tablemyLectures.getSelectedRowCount() != 0) {
-							// a row is selected
-							// ask for confirmation
-							eingabe = JOptionPane.showConfirmDialog(c,
-									"Wollen Sie diese Daten löschen?", "Löschen?",
-									JOptionPane.YES_NO_OPTION);
-
-							if (eingabe == JOptionPane.YES_OPTION) {
-								// user has confirmed deletion, now get the ID of the
-								// selected lecture
-								lectureID = modelMyLectures
-										.getValueAt(
-												tablemyLectures
-														.convertColumnIndexToModel(tablemyLectures
-																.getSelectedRow()), 8)
-										.toString();
-								LOGGER.info("Lösche Veranstaltung: " + lectureID);
-								try {
-									if (client.deleteLecture(lectureID,
-											person.verantwortlicher.getHochschule(),
-											person.verantwortlicher.getUsername())) {
-										LOGGER.info("Löschen erfolgreich.");
-										// delete successful
-
-										DeleteLecture_GUI dl = new DeleteLecture_GUI(c);
-										dl.setVisible(true);
-										dispose();
-									} else {
-										// delete not successful
-										LOGGER.error("Konnte Veranstaltung '"
-												+ lectureID
-												+ "' nicht aus der Datenbank löschen!");
-										JOptionPane
-												.showMessageDialog(
-														c,
-														"Löschen der Veranstaltung aus der Datenbank fehlgeschlagen.",
-														"Fehler",
-														JOptionPane.INFORMATION_MESSAGE);
-									}
-								} catch (TException e1) {
-									// TODO Auto-generated catch block
-									e1.printStackTrace();
-								}// end delete
-							}// end ask for confirmation
-
-						}// end check if a row is selected
-						/*
-						 * else if (tableAllLectures.getSelectedRowCount() !=0 &&
-						 * tableAllLectures
-						 * .getValueAt(tableAllLectures.getSelectedRow(),
-						 * 5).toString().equals(username)){ //a row is selected //ask
-						 * for confirmation eingabe =
-						 * JOptionPane.showConfirmDialog(null,
-						 * "Wollen Sie diese Daten löschen?", "Löschen?",
-						 * JOptionPane.YES_NO_OPTION);
-						 * 
-						 * if (eingabe == JOptionPane.YES_OPTION) { //user has confirmed
-						 * deletion, now get the ID of the selected lecture lectureID =
-						 * tableAllLectures
-						 * .getValueAt(tableAllLectures.convertColumnIndexToModel
-						 * (tableAllLectures.getSelectedRow()), 8).toString();
-						 * LOGGER.info("Lösche Veranstaltung: "+lectureID); try {
-						 * if(client.deleteLecture(lectureID,
-						 * person.verantwortlicher.getHochschule
-						 * (),person.verantwortlicher.getUsername())){
-						 * LOGGER.info("Löschen erfolgreich."); //delete successful
-						 * 
-						 * DeleteLecture_GUI dl = new DeleteLecture_GUI();
-						 * dl.setVisible(true); dispose(); } else { //delete not
-						 * successful LOGGER.error("Konnte Veranstaltung '" + lectureID
-						 * + "' nicht aus der Datenbank löschen!"); JOptionPane
-						 * .showMessageDialog( null,
-						 * "Löschen aus Datenbank fehlgeschlagen.", "Fehler",
-						 * JOptionPane.INFORMATION_MESSAGE); } } catch (TException e1) {
-						 * // TODO Auto-generated catch block e1.printStackTrace();
-						 * }//end delete }//end ask for confirmation
-						 * 
-						 * } else { //end check if a row is selected JOptionPane
-						 * .showMessageDialog( null,
-						 * "Bitte wählen Sie ein eigenes Image aus.", "Message",
-						 * JOptionPane.INFORMATION_MESSAGE); }
-						 */
+		button = new JButton("Löschen");
+		button.setBounds(442, 495, 118, 23);
+		contentPanel.add(button);
+		button.addActionListener(new ActionListener() {
+			public void actionPerformed(ActionEvent e) {
 
-					}
-				});
+				String lectureID = "";
+				int eingabe;
+				String username = person.verantwortlicher.getName() + " "
+						+ person.verantwortlicher.getVorname();
+				// check if a row is selected
+				if (tablemyLectures.getSelectedRowCount() != 0) {
+					// a row is selected
+					// ask for confirmation
+					eingabe = JOptionPane.showConfirmDialog(c,
+							"Wollen Sie diese Daten löschen?", "Löschen?",
+							JOptionPane.YES_NO_OPTION);
+
+					if (eingabe == JOptionPane.YES_OPTION) {
+						// user has confirmed deletion, now get the ID of the
+						// selected lecture
+						lectureID = modelMyLectures
+								.getValueAt(
+										tablemyLectures
+												.convertColumnIndexToModel(tablemyLectures
+														.getSelectedRow()), 8)
+								.toString();
+						// LOGGER.info("Lösche Veranstaltung: " + lectureID);
+						try {
+							if (client.deleteLecture(lectureID,
+									person.verantwortlicher.getHochschule(),
+									person.verantwortlicher.getUsername())) {
+								
+								// delete successful
+								LOGGER.info("Veranstaltung erfolgreich '"+lectureID+"' gelöscht.");
+
+								DeleteLecture_GUI dl = new DeleteLecture_GUI(c);
+								dl.setVisible(true);
+								dispose();
+							} else {
+								// delete not successful
+								LOGGER.error("Konnte Veranstaltung '"
+										+ lectureID
+										+ "' nicht aus der Datenbank löschen!");
+								JOptionPane
+										.showMessageDialog(
+												c,
+												"Löschen der Veranstaltung aus der Datenbank fehlgeschlagen.",
+												"Fehler",
+												JOptionPane.INFORMATION_MESSAGE);
+							}
+						} catch (TException e1) {
+
+							e1.printStackTrace();
+						}// end delete
+					}// end ask for confirmation
+
+				}// end check if a row is selected
+			}
+		});
 		{
 			JPanel buttonPane = new JPanel();
 			buttonPane.setBounds(0, 640, 826, 33);
@@ -573,7 +536,7 @@ public class DeleteLecture_GUI extends JFrame {
 					open.openWebpage(windows);
 
 				} catch (URISyntaxException e) {
-					// TODO Auto-generated catch block
+
 					e.printStackTrace();
 				}
 			}
@@ -594,7 +557,7 @@ public class DeleteLecture_GUI extends JFrame {
 					open.openWebpage(windows);
 
 				} catch (URISyntaxException e) {
-					// TODO Auto-generated catch block
+
 					e.printStackTrace();
 				}
 
@@ -651,8 +614,7 @@ public class DeleteLecture_GUI extends JFrame {
 						lectures.get(x).isActive,
 						out.format(in.parse(lectures.get(x).lastused)),
 						lectures.get(x).username, lectures.get(x).imagename,
-						" ", lectures.get(x).id,
-						};
+						" ", lectures.get(x).id, };
 				// Fuege diese Objekte der Tabelle hinzu
 				model.addRow(obj);
 				x++;
@@ -662,14 +624,15 @@ public class DeleteLecture_GUI extends JFrame {
 
 			return model;
 		} catch (TException e1) {
-			// TODO Auto-generated catch block
+
 			e1.printStackTrace();
 		}
 		return model;
 	}
-	
+
 	private void resetLectureInfo() {
-		//reset the detailed information on the right hand side when changing search string
+		// reset the detailed information on the right hand side when changing
+		// search string
 
 		labelName.setText("");
 		labelVerantwortlicher.setText("");
@@ -699,4 +662,4 @@ public class DeleteLecture_GUI extends JFrame {
 		labelimageversion.setText(res.get("imageversion"));
 
 	}
-}//end class
+}// end class
diff --git a/dozentenmodul/src/main/java/gui/lecture/EditLectureAllgemein_GUI.java b/dozentenmodul/src/main/java/gui/lecture/EditLectureAllgemein_GUI.java
index 98e2d513..45d4b0e2 100644
--- a/dozentenmodul/src/main/java/gui/lecture/EditLectureAllgemein_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/EditLectureAllgemein_GUI.java
@@ -40,6 +40,7 @@ import javax.swing.border.EmptyBorder;
 import javax.swing.border.TitledBorder;
 
 import models.Image;
+import models.ItemOwner;
 import models.Lecture;
 import models.Links;
 import models.person;
@@ -101,7 +102,7 @@ public class EditLectureAllgemein_GUI extends JFrame {
 			UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
 		} catch (ClassNotFoundException | InstantiationException
 				| IllegalAccessException | UnsupportedLookAndFeelException e) {
-			// TODO Auto-generated catch block
+			 
 			e.printStackTrace();
 		}
 		setTitle("bwLehrpool Suite - Veranstaltung bearbeiten");
@@ -153,7 +154,8 @@ public class EditLectureAllgemein_GUI extends JFrame {
 		Vorname = new JTextField();
 		Vorname.setEditable(false);
 		Vorname.setEnabled(false);
-		Vorname.setText(person.verantwortlicher.getVorname());
+		//Vorname.setText(person.verantwortlicher.getVorname());
+		Vorname.setText(ItemOwner.itemOwner.getVorname());
 		Vorname.setBackground(Color.WHITE);
 		Vorname.setColumns(10);
 		Vorname.setBounds(145, 33, 350, 20);
@@ -167,7 +169,8 @@ public class EditLectureAllgemein_GUI extends JFrame {
 		Nachname = new JTextField();
 		Nachname.setEnabled(false);
 		Nachname.setEditable(false);
-		Nachname.setText(person.verantwortlicher.getName());
+		//Nachname.setText(person.verantwortlicher.getName());
+		Nachname.setText(ItemOwner.itemOwner.getNachname());
 		Nachname.setBackground(Color.WHITE);
 		Nachname.setColumns(10);
 		Nachname.setBounds(145, 64, 350, 20);
@@ -181,7 +184,8 @@ public class EditLectureAllgemein_GUI extends JFrame {
 		Hochschule = new JTextField();
 		Hochschule.setEnabled(false);
 		Hochschule.setEditable(false);
-		Hochschule.setText(person.verantwortlicher.getHochschule());
+		//Hochschule.setText(person.verantwortlicher.getHochschule());
+		Hochschule.setText(ItemOwner.itemOwner.getHochschule());
 		Hochschule.setBackground(Color.WHITE);
 		Hochschule.setColumns(10);
 		Hochschule.setBounds(145, 95, 350, 20);
@@ -195,7 +199,8 @@ public class EditLectureAllgemein_GUI extends JFrame {
 		EMail = new JTextField();
 		EMail.setEnabled(false);
 		EMail.setEditable(false);
-		EMail.setText(person.verantwortlicher.getEMail());
+		//EMail.setText(person.verantwortlicher.getEMail());
+		EMail.setText(ItemOwner.itemOwner.getEmail());
 		EMail.setBackground(Color.WHITE);
 		EMail.setColumns(10);
 		EMail.setBounds(145, 126, 350, 20);
@@ -526,7 +531,7 @@ public class EditLectureAllgemein_GUI extends JFrame {
 					windows = new URI(Links.getFAQ());
 					open.openWebpage(windows);
 				} catch (URISyntaxException e) {
-					// TODO Auto-generated catch block
+					 
 					e.printStackTrace();
 				}
 			}
@@ -543,7 +548,7 @@ public class EditLectureAllgemein_GUI extends JFrame {
 					windows = new URI(Links.getOTRS());
 					open.openWebpage(windows);
 				} catch (URISyntaxException e) {
-					// TODO Auto-generated catch block
+					 
 					e.printStackTrace();
 				}
 			}
diff --git a/dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java b/dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java
index 09f7295f..7e8a959f 100644
--- a/dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java
@@ -163,10 +163,10 @@ public class EditLectureLink_GUI extends JFrame {
 					//initTableModel(modelPublicVorlagen);
 					initTableModelTemplates(modelPublicVorlagen);
 				} catch (TException e) {
-					// TODO Auto-generated catch block
+					
 					e.printStackTrace();
 				} catch (ParseException e) {
-					// TODO Auto-generated catch block
+					
 					e.printStackTrace();
 				}
 
@@ -242,7 +242,7 @@ public class EditLectureLink_GUI extends JFrame {
 			UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
 		} catch (ClassNotFoundException | InstantiationException
 				| IllegalAccessException | UnsupportedLookAndFeelException e) {
-			// TODO Auto-generated catch block
+			
 			e.printStackTrace();
 		}
 		setTitle("bwLehrpool Suite - Veranstaltung bearbeiten");
@@ -375,7 +375,7 @@ public class EditLectureLink_GUI extends JFrame {
 				comboBox.addItem(list.get(i));
 			}
 		} catch (TException e2) {
-			// TODO Auto-generated catch block
+			
 			e2.printStackTrace();
 		}
 		comboBox.addActionListener(new ActionListener() {
@@ -694,7 +694,7 @@ public class EditLectureLink_GUI extends JFrame {
 								MainMenue_GUI m = new MainMenue_GUI(c);
 								m.setVisible(true);
 							} catch (TException e1) {
-								// TODO Auto-generated catch block
+								
 								e1.printStackTrace();
 								JOptionPane
 										.showMessageDialog(
@@ -805,7 +805,7 @@ public class EditLectureLink_GUI extends JFrame {
 								MainMenue_GUI m = new MainMenue_GUI(c);
 								m.setVisible(true);
 							} catch (TException e1) {
-								// TODO Auto-generated catch block
+								
 								e1.printStackTrace();
 								JOptionPane
 										.showMessageDialog(
@@ -913,7 +913,7 @@ public class EditLectureLink_GUI extends JFrame {
 								MainMenue_GUI m = new MainMenue_GUI(c);
 								m.setVisible(true);
 							} catch (TException e1) {
-								// TODO Auto-generated catch block
+								
 								e1.printStackTrace();
 								JOptionPane
 										.showMessageDialog(
@@ -1097,7 +1097,7 @@ public class EditLectureLink_GUI extends JFrame {
 					open.openWebpage(windows);
 
 				} catch (URISyntaxException e) {
-					// TODO Auto-generated catch block
+					
 					e.printStackTrace();
 				}
 			}
@@ -1118,7 +1118,7 @@ public class EditLectureLink_GUI extends JFrame {
 					open.openWebpage(windows);
 
 				} catch (URISyntaxException e) {
-					// TODO Auto-generated catch block
+					
 					e.printStackTrace();
 				}
 
@@ -1271,7 +1271,7 @@ public class EditLectureLink_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/lecture/EditLectureSearch_GUI.java b/dozentenmodul/src/main/java/gui/lecture/EditLectureSearch_GUI.java
index ca33dc3c..9867afd7 100644
--- a/dozentenmodul/src/main/java/gui/lecture/EditLectureSearch_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/EditLectureSearch_GUI.java
@@ -22,6 +22,7 @@ import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -52,6 +53,7 @@ import javax.swing.table.DefaultTableModel;
 import javax.swing.table.TableModel;
 import javax.swing.table.TableRowSorter;
 
+import models.ItemOwner;
 import models.Lecture;
 import models.Links;
 import models.person;
@@ -87,38 +89,32 @@ public class EditLectureSearch_GUI extends JFrame {
 			"Verantwortlicher", "Image", "Schlagwort", "ID" };
 	ThriftConnection con = new ThriftConnection();
 	Client client = models.Client.clientcon.getClient();
-	private static final String HELP_MESSAGE = "<html><div align=\"center\">" +
-			"Suchen Sie hier Ihre Veranstaltungen und wählen Sie sie für weitere Schritte aus.<br />" +
-			"Klicken Sie anschließend auf \"Weiter\", um die Details der Veranstaltung sowie die Berechtigungen zu ändern." +
-			"</div></html>";
-	
-	/*final DefaultTableModel modelAll = new DefaultTableModel(titles, 0) {
-		public boolean isCellEditable(int rowIndex, int mColIndex) {
-			return false;
-		}
-	};*/
+	private static final String HELP_MESSAGE = "<html><div align=\"center\">"
+			+ "Suchen Sie hier Ihre Veranstaltungen und wählen Sie sie für weitere Schritte aus.<br />"
+			+ "Klicken Sie anschließend auf \"Weiter\", um die Details der Veranstaltung sowie die Berechtigungen zu ändern."
+			+ "</div></html>";
+
 	final DefaultTableModel modelMyLectures = new DefaultTableModel(titles, 0) {
 		public boolean isCellEditable(int rowIndex, int mColIndex) {
 			return false;
 		}
 	};
-	/*final TableRowSorter<TableModel> rowSorterAll = new TableRowSorter<TableModel>(
-			modelAll);*/
-	
+
 	final TableRowSorter<TableModel> rowSorterMyLectures = new TableRowSorter<TableModel>(
 			modelMyLectures);
-	
+
 	RowFilter rf = null;
-	List<RowFilter<Object,Object>> filters = new ArrayList<RowFilter<Object,Object>>(2);
+	List<RowFilter<Object, Object>> filters = new ArrayList<RowFilter<Object, Object>>(
+			2);
 
 	/**
 	 * Create the dialog.
 	 */
 	public EditLectureSearch_GUI(Component formerGUI) {
-		
+
 		filters.add(RowFilter.regexFilter(".", 0));
 		rf = RowFilter.orFilter(filters);
-		
+
 		addWindowListener(new WindowAdapter() {
 			@Override
 			public void windowClosing(WindowEvent arg0) {
@@ -132,10 +128,10 @@ public class EditLectureSearch_GUI extends JFrame {
 				textFieldName.requestFocusInWindow();
 				try {
 					initTableModel(modelMyLectures);
-					//initTableModel(modelAll);
+					// initTableModel(modelAll);
 
 				} catch (ParseException e) {
-					// TODO Auto-generated catch block
+
 					e.printStackTrace();
 				}
 
@@ -175,7 +171,7 @@ public class EditLectureSearch_GUI extends JFrame {
 			UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
 		} catch (ClassNotFoundException | InstantiationException
 				| IllegalAccessException | UnsupportedLookAndFeelException e) {
-			// TODO Auto-generated catch block
+
 			e.printStackTrace();
 		}
 		// Setzt den Fenstertitel
@@ -232,31 +228,32 @@ public class EditLectureSearch_GUI extends JFrame {
 				// Textfield eingabe auslesen
 				String stext = textFieldName.getText();
 				// Wenn Textfield nicht leer
-				if (stext != "") 
-				{
+				if (stext != "") {
 					activeSearch = true;
 					// Filtere nach der Eingabe
 
-				 	filters.clear();
-					filters.add(RowFilter.regexFilter("(?i)"+stext, 0)); //case insensitive
-					filters.add(RowFilter.regexFilter("(?i)"+stext, 1)); //case insensitive
+					filters.clear();
+					filters.add(RowFilter.regexFilter("(?i)" + stext, 0)); // case
+																			// insensitive
+					filters.add(RowFilter.regexFilter("(?i)" + stext, 1)); // case
+																			// insensitive
 					rf = RowFilter.orFilter(filters);
 					rowSorterMyLectures.setRowFilter(rf);
 
-
-				} 
-				else 
-				{
+				} else {
 					activeSearch = false;
 					activeSearch = false;
 					filters.clear();
-					filters.add(RowFilter.regexFilter(".", 0)); //case insensitive, filter for anything
+					filters.add(RowFilter.regexFilter(".", 0)); // case
+																// insensitive,
+																// filter for
+																// anything
 					rf = RowFilter.orFilter(filters);
 					rowSorterMyLectures.setRowFilter(rf);
-					
+
 				}
 				tablemyLectures.clearSelection();
-				
+
 				resetLectureInfo();
 			}
 		});
@@ -296,46 +293,54 @@ public class EditLectureSearch_GUI extends JFrame {
 		JLabel lblNewLabel_1 = new JLabel("Bearbeiten");
 		lblNewLabel_1.setBounds(166, 11, 155, 14);
 		contentPanel.add(lblNewLabel_1);
-		
-				JScrollPane scrollPaneMyImage = new JScrollPane();
-				scrollPaneMyImage.setBounds(10, 120, 552, 369);
-				contentPanel.add(scrollPaneMyImage);
-				tablemyLectures = new JTable();
-				tablemyLectures.getSelectionModel().addListSelectionListener(
-						new ListSelectionListener() {
-							public void valueChanged(ListSelectionEvent e) {
-								
-								if(tablemyLectures.getSelectedRow() != -1)
-								{
-								String imageid = modelMyLectures.getValueAt(
-										tablemyLectures
-												.convertRowIndexToModel(tablemyLectures
-														.getSelectedRow()), 8)
-										.toString();
-
-								try {
-									writeLectureData(imageid);
-								} catch (TException e1) {
-									// TODO Auto-generated catch block
-									e1.printStackTrace();
-								} catch (ParseException e1) {
-									// TODO Auto-generated catch block
-									e1.printStackTrace();
-								}
-							}
+
+		JScrollPane scrollPaneMyImage = new JScrollPane();
+		scrollPaneMyImage.setBounds(10, 120, 552, 369);
+		contentPanel.add(scrollPaneMyImage);
+		tablemyLectures = new JTable();
+		tablemyLectures.getSelectionModel().addListSelectionListener(
+				new ListSelectionListener() {
+					public void valueChanged(ListSelectionEvent e) {
+
+						if (tablemyLectures.getSelectedRow() != -1) {
+							String lectureid = modelMyLectures
+									.getValueAt(
+											tablemyLectures
+													.convertRowIndexToModel(tablemyLectures
+															.getSelectedRow()),
+											8).toString();
+
+							try {
+
+								// write the values into the information pane on
+								// the right hand side
+								writeLectureData(lectureid);
+
+								// fill the itemOwnder model with information
+								// from selected item
+								setItemOwnerInformation(lectureid);
+
+							} catch (TException e1) {
+
+								e1.printStackTrace();
+							} catch (ParseException e1) {
+
+								e1.printStackTrace();
 							}
-							
-						});
-				tablemyLectures.setModel(modelMyLectures);
-				
-						tablemyLectures.getColumnModel().getColumn(1).sizeWidthToFit();
-						tablemyLectures.getColumnModel().getColumn(2).sizeWidthToFit();
-						tablemyLectures.getColumnModel().getColumn(3).sizeWidthToFit();
-						tablemyLectures.getColumnModel().getColumn(4).sizeWidthToFit();
-						tablemyLectures.getColumnModel().getColumn(5).sizeWidthToFit();
-						tablemyLectures.setRowSorter(rowSorterMyLectures);
-						
-								scrollPaneMyImage.setViewportView(tablemyLectures);
+						}
+					}
+
+				});
+		tablemyLectures.setModel(modelMyLectures);
+
+		tablemyLectures.getColumnModel().getColumn(1).sizeWidthToFit();
+		tablemyLectures.getColumnModel().getColumn(2).sizeWidthToFit();
+		tablemyLectures.getColumnModel().getColumn(3).sizeWidthToFit();
+		tablemyLectures.getColumnModel().getColumn(4).sizeWidthToFit();
+		tablemyLectures.getColumnModel().getColumn(5).sizeWidthToFit();
+		tablemyLectures.setRowSorter(rowSorterMyLectures);
+
+		scrollPaneMyImage.setViewportView(tablemyLectures);
 		{
 			JPanel buttonPane = new JPanel();
 			buttonPane.setBounds(0, 640, 826, 33);
@@ -355,7 +360,7 @@ public class EditLectureSearch_GUI extends JFrame {
 				});
 				btnBack.setActionCommand("OK");
 				buttonPane.add(btnBack);
-				//getRootPane().setDefaultButton(btnBack);
+				// getRootPane().setDefaultButton(btnBack);
 			}
 			{
 				JButton btnContinue = new JButton("Weiter");
@@ -414,7 +419,7 @@ public class EditLectureSearch_GUI extends JFrame {
 								enddate = out.format(in.parse(enddate));
 								startdate = out.format(in.parse(startdate));
 							} catch (ParseException e2) {
-								// TODO Auto-generated catch block
+
 								e2.printStackTrace();
 							}
 
@@ -427,7 +432,7 @@ public class EditLectureSearch_GUI extends JFrame {
 								Lecture.lecture.setStartdate(df
 										.parse(startdate));
 							} catch (ParseException e1) {
-								// TODO Auto-generated catch block
+
 								e1.printStackTrace();
 							}
 							if (modelMyLectures
@@ -443,102 +448,12 @@ public class EditLectureSearch_GUI extends JFrame {
 
 							// EditImageAllgemein_GUI ea=new
 							// EditImageAllgemein_GUI();
-							EditLectureAllgemein_GUI el = new EditLectureAllgemein_GUI(c);
+							EditLectureAllgemein_GUI el = new EditLectureAllgemein_GUI(
+									c);
 							el.setVisible(true);
 							dispose();
 						}
-						/*else if (tableAllLectures.getSelectedRow() != -1
-								&& tableAllLectures
-										.getValueAt(
-												tableAllLectures
-														.getSelectedRow(), 5)
-										.toString().equals(username)) {
-
-							// a row is selected, do operations
 
-							Lecture.lecture.setid(modelAll
-									.getValueAt(
-											tableAllLectures
-													.convertRowIndexToModel(tableAllLectures
-															.getSelectedRow()),
-											8).toString());
-							Lecture.lecture.setName(modelAll
-									.getValueAt(
-											tableAllLectures
-													.convertRowIndexToModel(tableAllLectures
-															.getSelectedRow()),
-											0).toString());
-							Lecture.lecture.setDesc(modelAll
-									.getValueAt(
-											tableAllLectures
-													.convertRowIndexToModel(tableAllLectures
-															.getSelectedRow()),
-											1).toString());
-							String date = modelAll
-									.getValueAt(
-											tableAllLectures
-													.convertRowIndexToModel(tableAllLectures
-															.getSelectedRow()),
-											2).toString();
-
-							Lecture.lecture.setLinkedImagename(modelAll
-									.getValueAt(
-											tableAllLectures
-													.convertRowIndexToModel(tableAllLectures
-															.getSelectedRow()),
-											6).toString());
-
-							int zweitesLeerzeichen = date.indexOf(" ",
-									date.indexOf(" ") + 1);
-
-							String startdate = date.substring(0,
-									zweitesLeerzeichen);
-							String enddate = date.substring(zweitesLeerzeichen);
-							SimpleDateFormat out = new SimpleDateFormat(
-									"yyyy-MM-dd HH:mm:ss");
-							SimpleDateFormat in = new SimpleDateFormat(
-									"dd.MM.yyyy HH:mm:ss");
-							try {
-								enddate = out.format(in.parse(enddate));
-								startdate = out.format(in.parse(startdate));
-							} catch (ParseException e2) {
-								// TODO Auto-generated catch block
-								e2.printStackTrace();
-							}
-							DateFormat df = new SimpleDateFormat(
-									"yyyy-MM-dd HH:mm:ss");
-
-							try {
-								// Format has to be "yyyy-MM-dd HH:mm:ss"
-								Lecture.lecture.setEnddate(df.parse(enddate));
-								Lecture.lecture.setStartdate(df
-										.parse(startdate));
-							} catch (ParseException e1) {
-								// TODO Auto-generated catch block
-								e1.printStackTrace();
-							}
-							if (modelAll
-									.getValueAt(
-											tableAllLectures
-													.convertRowIndexToModel(tableAllLectures
-															.getSelectedRow()),
-											3).toString().equals("1")) {
-								Lecture.lecture.setActive(true);
-							} else {
-								Lecture.lecture.setActive(false);
-							}
-
-							EditLectureAllgemein_GUI el = new EditLectureAllgemein_GUI();
-							el.setVisible(true);
-							dispose();
-						} else {
-							JOptionPane
-									.showMessageDialog(
-											null,
-											"Bitte wählen Sie ein eigenes Image aus.",
-											"Message",
-											JOptionPane.INFORMATION_MESSAGE);
-						} // End Else */
 					} // end action
 
 				});
@@ -667,7 +582,7 @@ public class EditLectureSearch_GUI extends JFrame {
 					open.openWebpage(windows);
 
 				} catch (URISyntaxException e) {
-					// TODO Auto-generated catch block
+
 					e.printStackTrace();
 				}
 			}
@@ -688,7 +603,7 @@ public class EditLectureSearch_GUI extends JFrame {
 					open.openWebpage(windows);
 
 				} catch (URISyntaxException e) {
-					// TODO Auto-generated catch block
+
 					e.printStackTrace();
 				}
 
@@ -705,18 +620,19 @@ public class EditLectureSearch_GUI extends JFrame {
 		});
 		mnNewMenu_1.add(mntmAbout);
 
-		
 		JMenu mnNewMenu_Info = new JMenu("Info");
 		mnNewMenu_Info.addMouseListener(new MouseAdapter() {
 			@Override
 			public void mouseClicked(MouseEvent arg0) {
-				JOptionPane.showMessageDialog(c, HELP_MESSAGE, "Hilfe zu dieser Oberfläche", JOptionPane.INFORMATION_MESSAGE);
+				JOptionPane.showMessageDialog(c, HELP_MESSAGE,
+						"Hilfe zu dieser Oberfläche",
+						JOptionPane.INFORMATION_MESSAGE);
 			}
 		});
 		menuBar.add(mnNewMenu_Info);
-		
+
 		c = this;
-		
+
 	}
 
 	// Initiale Beffuelung eines Table models
@@ -725,8 +641,10 @@ public class EditLectureSearch_GUI extends JFrame {
 		List<server.generated.Lecture> lectures;
 		try {
 			// Hole eine Liste der erlaubten Images für die diese Person
-			//lectures = client.getLectureList();
-			lectures = client.getLectureListPermissionWrite(person.verantwortlicher.getUserID());
+			// lectures = client.getLectureList();
+			lectures = client
+					.getLectureListPermissionWrite(person.verantwortlicher
+							.getUserID());
 			Iterator<server.generated.Lecture> i = lectures.iterator();
 			SimpleDateFormat in = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 			SimpleDateFormat out = new SimpleDateFormat("dd.MM.yyyy HH:mm:ss");
@@ -754,14 +672,15 @@ public class EditLectureSearch_GUI extends JFrame {
 
 			return model;
 		} catch (TException e1) {
-			// TODO Auto-generated catch block
+
 			e1.printStackTrace();
 		}
 		return model;
 	}
-	
+
 	private void resetLectureInfo() {
-		//reset the detailed information on the right hand side when changing search string
+		// reset the detailed information on the right hand side when changing
+		// search string
 
 		labelName.setText("");
 		labelVerantwortlicher.setText("");
@@ -790,6 +709,26 @@ public class EditLectureSearch_GUI extends JFrame {
 				res.get("imagepath").indexOf("/") + 1));
 		labelimageversion.setText(res.get("imageversion"));
 
-	}
+	}// end writeLectureData
+
+	public void setItemOwnerInformation(String lectureid) {
+		Map<String, String> map = new HashMap<String, String>();
+
+		try {
+			// get values from server and set them in model
+			map = client.getItemOwner(lectureid);
+
+			ItemOwner.itemOwner.setUserID(map.get("userID"));
+			ItemOwner.itemOwner.setUsername(map.get("loginName"));
+			ItemOwner.itemOwner.setNachname(map.get("Nachname"));
+			ItemOwner.itemOwner.setVorname(map.get("Vorname"));
+			ItemOwner.itemOwner.setEmail(map.get("mail"));
+			ItemOwner.itemOwner.setHochschule(map.get("institution"));
+
+		} catch (TException e) {
+			e.printStackTrace();
+		}
+
+	}// end setItemInformation
 
-}
+}// end class
diff --git a/dozentenmodul/src/main/java/gui/lecture/PermissionCreateLecture_GUI.java b/dozentenmodul/src/main/java/gui/lecture/PermissionCreateLecture_GUI.java
index 8ddd4e81..6d6f238f 100644
--- a/dozentenmodul/src/main/java/gui/lecture/PermissionCreateLecture_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/PermissionCreateLecture_GUI.java
@@ -193,15 +193,15 @@ public class PermissionCreateLecture_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");
 
 		} 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();
@@ -219,10 +219,11 @@ public class PermissionCreateLecture_GUI extends JFrame {
 						temp.isLecture_admin(), // Admin
 						temp.getUserID() // userID
 				};
-				System.out.println("Processing: " + temp.getName() + ", "
-						+ temp.getVorname() + ", " + temp.isLecture_read()
-						+ ", " + temp.isLecture_write() + ", "
-						+ temp.isLecture_admin() + ", " + temp.getUserID());
+				//System.out.println("Processing: " + temp.getName() + ", "
+				//		+ temp.getVorname() + ", " + temp.isLecture_read()
+				//		+ ", " + temp.isLecture_write() + ", "
+				//		+ temp.isLecture_admin() + ", " + temp.getUserID());
+				
 				// Fuege diese Objekte der Tabelle hinzu
 				model.addRow(obj);
 				x++;
@@ -231,8 +232,8 @@ public class PermissionCreateLecture_GUI extends JFrame {
 
 		// table wird hier nie initialisiert und ist entsprechend null
 
-		if (tablePermittedUsers == null)
-			LOGGER.error("NPE incoming...");
+		//if (tablePermittedUsers == null)
+		//	LOGGER.error("NPE incoming...");
 		TableColumn tc1 = tablePermittedUsers.getColumnModel().getColumn(1);
 		tc1.setCellEditor(tablePermittedUsers.getDefaultEditor(Boolean.class));
 		tc1.setCellRenderer(tablePermittedUsers
@@ -372,13 +373,13 @@ public class PermissionCreateLecture_GUI extends JFrame {
 											// 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++;
 				}
@@ -453,7 +454,7 @@ public class PermissionCreateLecture_GUI extends JFrame {
 						for (int i = 0; i < tablePermittedUsers.getRowCount(); i++) {
 							checkIntegrity(i); // check integrity of each line
 												// again
-							System.out.println("in auto-correct");
+							//System.out.println("in auto-correct");
 						}
 
 						saveTableToList();
@@ -626,7 +627,7 @@ public class PermissionCreateLecture_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>();
 
@@ -641,13 +642,13 @@ public class PermissionCreateLecture_GUI extends JFrame {
 
 			seperatorIndex = tablePermittedUsers.getModel().getValueAt(i, 0)
 					.toString().indexOf(",");
-			LOGGER.info(tablePermittedUsers.getModel().getValueAt(i, 4)
-					.toString() +" (userID)\t"+ Boolean.parseBoolean(tablePermittedUsers
-					.getModel().getValueAt(i, 3).toString())+"(admin)\t"+Boolean.parseBoolean(tablePermittedUsers
-					.getModel().getValueAt(i, 2).toString())+"(write)\t"+Boolean.parseBoolean(tablePermittedUsers
-					.getModel().getValueAt(i, 1).toString())+"(read)\t"+tablePermittedUsers.getModel().getValueAt(i, 0)
-					.toString().substring(0, seperatorIndex)+"(Nachname)\t"+tablePermittedUsers.getModel().getValueAt(i, 0)
-					.toString().substring(seperatorIndex + 2)+"(Vorname)");
+			//LOGGER.info(tablePermittedUsers.getModel().getValueAt(i, 4)
+			//		.toString() +" (userID)\t"+ Boolean.parseBoolean(tablePermittedUsers
+			//		.getModel().getValueAt(i, 3).toString())+"(admin)\t"+Boolean.parseBoolean(tablePermittedUsers
+			//		.getModel().getValueAt(i, 2).toString())+"(write)\t"+Boolean.parseBoolean(tablePermittedUsers
+			//		.getModel().getValueAt(i, 1).toString())+"(read)\t"+tablePermittedUsers.getModel().getValueAt(i, 0)
+			//		.toString().substring(0, seperatorIndex)+"(Nachname)\t"+tablePermittedUsers.getModel().getValueAt(i, 0)
+			//		.toString().substring(seperatorIndex + 2)+"(Vorname)");
 
 			temp.setUserID(tablePermittedUsers.getModel().getValueAt(i, 4)
 					.toString()); // get
@@ -676,9 +677,9 @@ public class PermissionCreateLecture_GUI extends JFrame {
 			}
 		}
 
-		for (int y = 0; y < list.size(); y++) {
-			System.out.println("" + list.get(y).getName());
-		}
+		//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/lecture/PermissionEditLecture_GUI.java b/dozentenmodul/src/main/java/gui/lecture/PermissionEditLecture_GUI.java
index e8dd5608..5857942c 100644
--- a/dozentenmodul/src/main/java/gui/lecture/PermissionEditLecture_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/PermissionEditLecture_GUI.java
@@ -116,7 +116,7 @@ public class PermissionEditLecture_GUI extends JFrame {
 			UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
 		} catch (ClassNotFoundException | InstantiationException
 				| IllegalAccessException | UnsupportedLookAndFeelException e) {
-			// TODO Auto-generated catch block
+			
 			e.printStackTrace();
 		}
 		setTitle("bwLehrpool Suite - Berechtigungen");
@@ -220,7 +220,7 @@ public class PermissionEditLecture_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.getPermissionForUserAndLecture(
@@ -250,16 +250,13 @@ public class PermissionEditLecture_GUI extends JFrame {
 				}
 
 			} catch (TException e1) {
-				// TODO Auto-generated catch block
+				
 				e1.printStackTrace();
 			}
 		} 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();
@@ -277,10 +274,10 @@ public class PermissionEditLecture_GUI extends JFrame {
 						temp.isLecture_admin(), // Admin
 						temp.getUserID() // userID
 				};
-				System.out.println("Processing: " + temp.getName() + ", "
-						+ temp.getVorname() + ", " + temp.isLecture_read()
-						+ ", " + temp.isLecture_write() + ", "
-						+ temp.isLecture_admin() + ", " + temp.getUserID());
+				//System.out.println("Processing: " + temp.getName() + ", "
+				//		+ temp.getVorname() + ", " + temp.isLecture_read()
+				//		+ ", " + temp.isLecture_write() + ", "
+				//		+ temp.isLecture_admin() + ", " + temp.getUserID());
 				// Fuege diese Objekte der Tabelle hinzu
 				model.addRow(obj);
 				x++;
@@ -337,13 +334,13 @@ public class PermissionEditLecture_GUI extends JFrame {
 											// 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++;
 				}
@@ -449,7 +446,7 @@ public class PermissionEditLecture_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();
@@ -510,7 +507,7 @@ public class PermissionEditLecture_GUI extends JFrame {
 					open.openWebpage(windows);
 
 				} catch (URISyntaxException e) {
-					// TODO Auto-generated catch block
+					
 					e.printStackTrace();
 				}
 			}
@@ -531,7 +528,7 @@ public class PermissionEditLecture_GUI extends JFrame {
 					open.openWebpage(windows);
 
 				} catch (URISyntaxException e) {
-					// TODO Auto-generated catch block
+					
 					e.printStackTrace();
 				}
 
@@ -590,7 +587,7 @@ public class PermissionEditLecture_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>();
 
@@ -605,22 +602,22 @@ public class PermissionEditLecture_GUI extends JFrame {
 
 			seperatorIndex = table.getModel().getValueAt(i, 0).toString()
 					.indexOf(",");
-			LOGGER.info(table.getModel().getValueAt(i, 4).toString()
-					+ " (userID)\t"
-					+ Boolean.parseBoolean(table.getModel().getValueAt(i, 3)
-							.toString())
-					+ "(admin)\t"
-					+ Boolean.parseBoolean(table.getModel().getValueAt(i, 2)
-							.toString())
-					+ "(write)\t"
-					+ Boolean.parseBoolean(table.getModel().getValueAt(i, 1)
-							.toString())
-					+ "(read)\t"
-					+ table.getModel().getValueAt(i, 0).toString()
-							.substring(0, seperatorIndex)
-					+ "(Nachname)\t"
-					+ table.getModel().getValueAt(i, 0).toString()
-							.substring(seperatorIndex + 2) + "(Vorname)");
+			//LOGGER.info(table.getModel().getValueAt(i, 4).toString()
+			//		+ " (userID)\t"
+			//		+ Boolean.parseBoolean(table.getModel().getValueAt(i, 3)
+			//				.toString())
+			//		+ "(admin)\t"
+			//		+ Boolean.parseBoolean(table.getModel().getValueAt(i, 2)
+			//				.toString())
+			//		+ "(write)\t"
+			//		+ Boolean.parseBoolean(table.getModel().getValueAt(i, 1)
+			//				.toString())
+			//		+ "(read)\t"
+			//		+ table.getModel().getValueAt(i, 0).toString()
+			//				.substring(0, seperatorIndex)
+			//		+ "(Nachname)\t"
+			//		+ table.getModel().getValueAt(i, 0).toString()
+			//				.substring(seperatorIndex + 2) + "(Vorname)");
 
 			temp.setUserID(table.getModel().getValueAt(i, 4).toString()); // get
 			// userID
@@ -648,9 +645,9 @@ public class PermissionEditLecture_GUI extends JFrame {
 			}
 		}
 
-		for (int y = 0; y < list.size(); y++) {
-			System.out.println("" + list.get(y).getName());
-		}
+		//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/lecture/SearchLecture_GUI.java b/dozentenmodul/src/main/java/gui/lecture/SearchLecture_GUI.java
index 09e5f116..e0149877 100644
--- a/dozentenmodul/src/main/java/gui/lecture/SearchLecture_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/SearchLecture_GUI.java
@@ -135,7 +135,7 @@ public class SearchLecture_GUI extends JFrame {
 					initTableModelAll(modelAll);

 

 				} catch (ParseException e) {

-					// TODO Auto-generated catch block

+					

 					e.printStackTrace();

 				}

 				tablemyLectures.getColumnModel().getColumn(1).setWidth(0);

@@ -184,7 +184,7 @@ public class SearchLecture_GUI extends JFrame {
 			UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());

 		} catch (ClassNotFoundException | InstantiationException

 				| IllegalAccessException | UnsupportedLookAndFeelException e) {

-			// TODO Auto-generated catch block

+			

 			e.printStackTrace();

 		}

 		// Setzt den Fenstertitel

@@ -341,10 +341,10 @@ public class SearchLecture_GUI extends JFrame {
 	        	try {

 					writeLectureData(imageid);

 				} catch (TException e1) {

-					// TODO Auto-generated catch block

+					

 					e1.printStackTrace();

 				} catch (ParseException e1) {

-					// TODO Auto-generated catch block

+					

 					e1.printStackTrace();

 				}

 	        }

@@ -375,10 +375,10 @@ public class SearchLecture_GUI extends JFrame {
 	        	try {

 					writeLectureData(imageid);

 				} catch (TException e1) {

-					// TODO Auto-generated catch block

+					

 					e1.printStackTrace();

 				} catch (ParseException e1) {

-					// TODO Auto-generated catch block

+					

 					e1.printStackTrace();

 				}

 	        }

@@ -547,7 +547,7 @@ public class SearchLecture_GUI extends JFrame {
 					open.openWebpage(windows);

 					

 				} catch (URISyntaxException e) {

-					// TODO Auto-generated catch block

+					

 					e.printStackTrace();

 				}

 			}

@@ -570,7 +570,7 @@ public class SearchLecture_GUI extends JFrame {
 					open.openWebpage(windows);

 					

 				} catch (URISyntaxException e) {

-					// TODO Auto-generated catch block

+					

 					e.printStackTrace();

 				}

 				

@@ -622,7 +622,7 @@ public class SearchLecture_GUI extends JFrame {
 

 			return model;

 		} catch (TException e1) {

-			// TODO Auto-generated catch block

+			

 			e1.printStackTrace();

 		}

 		return model;

@@ -659,7 +659,7 @@ public class SearchLecture_GUI extends JFrame {
 

 			return model;

 		} catch (TException e1) {

-			// TODO Auto-generated catch block

+			

 			e1.printStackTrace();

 		}

 		return model;

diff --git a/dozentenmodul/src/main/java/models/ItemOwner.java b/dozentenmodul/src/main/java/models/ItemOwner.java
new file mode 100644
index 00000000..3afb20d2
--- /dev/null
+++ b/dozentenmodul/src/main/java/models/ItemOwner.java
@@ -0,0 +1,74 @@
+package models;
+
+public class ItemOwner {
+
+	private String userID;
+	private String username;
+	private String nachname;
+	private String vorname;
+	private String hochschule;
+	private String email;
+
+
+	public static ItemOwner itemOwner = new ItemOwner();
+
+	public String getUserID() {
+		return userID;
+	}
+
+	public void setUserID(String userID) {
+		this.userID = userID;
+	}
+
+	public String getUsername() {
+		return username;
+	}
+
+	public void setUsername(String username) {
+		this.username = username;
+	}
+
+	public String getNachname() {
+		return nachname;
+	}
+
+	public void setNachname(String nachname) {
+		this.nachname = nachname;
+	}
+
+	public String getVorname() {
+		return vorname;
+	}
+
+	public void setVorname(String vorname) {
+		this.vorname = vorname;
+	}
+
+	public String getHochschule() {
+		return hochschule;
+	}
+
+	public void setHochschule(String hochschule) {
+		this.hochschule = hochschule;
+	}
+
+	public String getEmail() {
+		return email;
+	}
+
+	public void setEmail(String email) {
+		this.email = email;
+	}
+
+	
+	public void reset(){
+		userID=null;
+		username=null;
+		nachname=null;
+		vorname=null;
+		hochschule=null;
+		email=null;
+	}
+	
+
+}
diff --git a/dozentenmodul/src/main/java/models/person.java b/dozentenmodul/src/main/java/models/person.java
index d1621d00..7bb48da2 100644
--- a/dozentenmodul/src/main/java/models/person.java
+++ b/dozentenmodul/src/main/java/models/person.java
@@ -64,13 +64,6 @@ public class person {
 		this.image_write = image_write;
 	}
 
-	/*
-	 * public boolean isChangePermission() { return changePermission;}
-	 * 
-	 * public void setChangePermission(boolean changePermission) {
-	 * this.changePermission = changePermission;}
-	 */
-
 	public boolean isImageAdmin() {
 		return image_admin;
 	}