[client] do commit the changes :)

10 files changed, 106 insertions, 74 deletions

diff --git a/dozentenmodul/src/main/java/gui/image/CreateImageAllgemein_GUI.java b/dozentenmodul/src/main/java/gui/image/CreateImageAllgemein_GUI.java
index d5247c7e..cf5345fb 100644
--- a/dozentenmodul/src/main/java/gui/image/CreateImageAllgemein_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/CreateImageAllgemein_GUI.java
@@ -1,6 +1,7 @@
 package gui.image;
 
 import gui.intro.About_GUI;
+import gui.intro.Login_GUI;
 import gui.intro.MainMenue_GUI;
 
 import java.awt.Color;
@@ -38,7 +39,11 @@ import models.Links;
 import models.person;
 import util.GuiOrganizer;
 import util.OpenLinks;
+
 import javax.swing.JScrollPane;
+
+import org.apache.log4j.Logger;
+
 import java.awt.event.KeyAdapter;
 import java.awt.event.KeyEvent;
 
@@ -46,6 +51,11 @@ import java.awt.event.KeyEvent;
 @SuppressWarnings("serial")
 public class CreateImageAllgemein_GUI extends JFrame {
 
+	/**
+	 * Logger instance for this class.
+	 */
+	private final static Logger LOGGER = Logger.getLogger(CreateImageAllgemein_GUI.class);
+	
 	private final JPanel contentPanel = new JPanel();
 	String[] result;
 	private JTextField Vorname;
@@ -323,8 +333,7 @@ public class CreateImageAllgemein_GUI extends JFrame {
 							Image.image.setImagename(imagename.getText());
 							Image.image.setDesc(textAreadesc.getText());
 							// Info
-							System.out
-							.println("Alle Eingaben in Ordnung. Imagename= \""
+							LOGGER.info("Alle Eingaben in Ordnung. Imagename= \""
 									+ Image.image.getImagename()
 									+ "\", Imagebeschreibung=\""
 									+ Image.image.getDesc()+"\"");
diff --git a/dozentenmodul/src/main/java/gui/image/CreateImageTechnisch_GUI.java b/dozentenmodul/src/main/java/gui/image/CreateImageTechnisch_GUI.java
index ecf5b9df..57192b97 100644
--- a/dozentenmodul/src/main/java/gui/image/CreateImageTechnisch_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/CreateImageTechnisch_GUI.java
@@ -2,6 +2,7 @@ package gui.image;
 
 
 import gui.intro.About_GUI;
+import gui.intro.Login_GUI;
 import gui.intro.MainMenue_GUI;
 
 import java.awt.Color;
@@ -44,26 +45,27 @@ import server.generated.Server.Client;
 import thrift.ThriftConnection;
 import util.GuiOrganizer;
 import util.OpenLinks;
+
 import javax.swing.JComboBox;
 
+import org.apache.log4j.Logger;
 import org.apache.thrift.TException;
 
 @SuppressWarnings("serial")
 public class CreateImageTechnisch_GUI extends JFrame {
 
+	/**
+	 * Logger instance for this class.
+	 */
+	private final static Logger LOGGER = Logger.getLogger(CreateImageTechnisch_GUI.class);
+	
 	private final JPanel contentPanel = new JPanel();
 	String[] result;
 	JSpinner spinnerCPU;
 	JSpinner spinnerRam;
-	//JRadioButton rdbtnlicenseJa;
-		//JRadioButton rdbtnlicenseNein;
-		//JRadioButton rdbtnInternetJa;
-		//JRadioButton rdbtnInternetNein;
-		//JRadioButton radioButtonVorlageJa;
-		//JRadioButton radioButtonVorlageNein;
-		private JCheckBox chckbxIsTemplate;
-		private JCheckBox chckbxIsLicensed;
-		private JCheckBox chckbxIsInternetBlocked;
+	private JCheckBox chckbxIsTemplate;
+	private JCheckBox chckbxIsLicensed;
+	private JCheckBox chckbxIsInternetBlocked;
 	JComboBox comboBox;
 	private final ButtonGroup buttonGrouplicense = new ButtonGroup();
 	private final ButtonGroup buttonGroupInternet = new ButtonGroup();
@@ -389,7 +391,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());
-						System.out.println("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());
 						CreateImageFreigabe_GUI ea=new CreateImageFreigabe_GUI();
 						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 008183ef..2f6ca6f3 100644
--- a/dozentenmodul/src/main/java/gui/image/DeleteImage_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/DeleteImage_GUI.java
@@ -412,7 +412,6 @@ public class DeleteImage_GUI extends JFrame {
 		tabbedPane = new JTabbedPane(JTabbedPane.TOP);
 		tabbedPane.addChangeListener(new ChangeListener() {
 			public void stateChanged(ChangeEvent arg0) {
-				// System.out.println(tabbedPane.getSelectedIndex());
 				if (tabbedPane.getSelectedIndex() == 0 && activeSearch == false) {
 
 					String username = person.verantwortlicher.getName() + " "
@@ -444,13 +443,11 @@ public class DeleteImage_GUI extends JFrame {
 										.convertRowIndexToModel(tablemyImages
 												.getSelectedRow()), 6)
 								.toString();
-						// System.out.println(imageid);
 						String version = modelMyImages.getValueAt(
 								tablemyImages
 										.convertRowIndexToModel(tablemyImages
 												.getSelectedRow()), 7)
 								.toString();
-						// System.out.println(version);
 						writeImageData(imageid, version);
 					}
 				});
@@ -487,14 +484,12 @@ public class DeleteImage_GUI extends JFrame {
 												.convertRowIndexToModel(tablePublicVorlagen
 														.getSelectedRow()), 6)
 								.toString();
-						// System.out.println(imageid);
 						String version = modelPublicVorlagen
 								.getValueAt(
 										tablePublicVorlagen
 												.convertRowIndexToModel(tablePublicVorlagen
 														.getSelectedRow()), 7)
 								.toString();
-						// System.out.println(version);
 						writeImageData(imageid, version);
 					}
 				});
@@ -522,13 +517,11 @@ public class DeleteImage_GUI extends JFrame {
 										.convertRowIndexToModel(tableAllImages
 												.getSelectedRow()), 6)
 								.toString();
-						// System.out.println(imageid);
 						String version = modelAll.getValueAt(
 								tableAllImages
 										.convertRowIndexToModel(tableAllImages
 												.getSelectedRow()), 7)
 								.toString();
-						// System.out.println(version);
 						writeImageData(imageid, version);
 
 					}
@@ -587,8 +580,6 @@ public class DeleteImage_GUI extends JFrame {
 						try {
 							if (!client.connectedToLecture(imageid,
 									imageversion)) {
-								// System.out.println(imageid);
-								// System.out.println(imageversion);
 								try {
 									client.deleteImageServer(imageid,
 											imageversion);
@@ -694,8 +685,6 @@ public class DeleteImage_GUI extends JFrame {
 						try {
 							if (!client.connectedToLecture(imageid,
 									imageversion)) {
-								// System.out.println(imageid);
-								// System.out.println(imageversion);
 								try {
 									client.deleteImageServer(imageid,
 											imageversion);
@@ -798,8 +787,6 @@ public class DeleteImage_GUI extends JFrame {
 						try {
 							if (!client.connectedToLecture(imageid,
 									imageversion)) {
-								// System.out.println(imageid);
-								// System.out.println(imageversion);
 								try {
 									client.deleteImageServer(imageid,
 											imageversion);
@@ -1111,10 +1098,8 @@ public class DeleteImage_GUI extends JFrame {
 			int x = 0;
 			SimpleDateFormat in = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
 			SimpleDateFormat out = new SimpleDateFormat("dd.MM.yyyy hh:mm:ss");
-			while (i.hasNext()) {
-
-				// System.out.println(out.format(in.parse(images.get(x).updateTime)));
 
+			while (i.hasNext()) {
 				// erzeuge Objekte fuer die Tabelle
 				Object[] obj = { images.get(x).getImageName(),
 						images.get(x).getLicenseRestriction(),
diff --git a/dozentenmodul/src/main/java/gui/image/EditImageAllgemein_GUI.java b/dozentenmodul/src/main/java/gui/image/EditImageAllgemein_GUI.java
index e4f6e0cf..d3e83bea 100644
--- a/dozentenmodul/src/main/java/gui/image/EditImageAllgemein_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/EditImageAllgemein_GUI.java
@@ -1,6 +1,7 @@
 package gui.image;
 
 import gui.intro.About_GUI;
+import gui.intro.Login_GUI;
 import gui.intro.MainMenue_GUI;
 
 import java.awt.Color;
@@ -38,17 +39,24 @@ import models.Image;
 import models.Links;
 import models.person;
 
+import org.apache.log4j.Logger;
 import org.apache.thrift.TException;
 
 import server.generated.Server.Client;
 import thrift.ThriftConnection;
 import util.GuiOrganizer;
 import util.OpenLinks;
+
 import javax.swing.JScrollPane;
 
 @SuppressWarnings("serial")
 public class EditImageAllgemein_GUI extends JFrame {
 
+	/**
+	 * Logger instance for this class.
+	 */
+	private final static Logger LOGGER = Logger.getLogger(EditImageAllgemein_GUI.class);
+	
 	private final JPanel contentPanel = new JPanel();
 	String[] result;
 	private JTextField Vorname;
@@ -321,8 +329,7 @@ public class EditImageAllgemein_GUI extends JFrame {
 							Image.image.setImagename(imagename.getText());
 							Image.image.setDesc(textAreadesc.getText());
 							// Info
-							System.out
-									.println("Alle Eingaben in Ordnung. Imagename= \""
+							LOGGER.info("Alle Eingaben in Ordnung. Imagename= \""
 											+ Image.image.getImagename()
 											+ "\", Imagebeschreibung=\""
 											+ Image.image.getDesc()+"\"");
@@ -436,7 +443,7 @@ public class EditImageAllgemein_GUI extends JFrame {
 			} else {
 				Image.image.setLicensed(true);
 			}
-			System.out.println(map.get("template"));
+			LOGGER.debug(map.get("template"));
 			if (map.get("template").equals("false")) {
 				Image.image.setVorlage(false);
 			} else {
diff --git a/dozentenmodul/src/main/java/gui/image/EditImageTechnisch_GUI.java b/dozentenmodul/src/main/java/gui/image/EditImageTechnisch_GUI.java
index a86b0a58..d8df52c7 100644
--- a/dozentenmodul/src/main/java/gui/image/EditImageTechnisch_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/EditImageTechnisch_GUI.java
@@ -1,13 +1,13 @@
 package gui.image;
 
 import gui.intro.About_GUI;
+import gui.intro.Login_GUI;
 import gui.intro.MainMenue_GUI;
 
 import java.awt.Color;
 import java.awt.FlowLayout;
 import java.awt.Font;
 import java.awt.SystemColor;
-
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.MouseAdapter;
@@ -18,7 +18,6 @@ import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.List;
 
-
 import javax.swing.ButtonGroup;
 import javax.swing.JButton;
 import javax.swing.JFrame;
@@ -44,24 +43,26 @@ import util.GuiOrganizer;
 import util.OpenLinks;
 import models.Image;
 import models.Links;
+
 import javax.swing.JComboBox;
 
+import org.apache.log4j.Logger;
 import org.apache.thrift.TException;
+
 import javax.swing.JCheckBox;
 
 @SuppressWarnings("serial")
 public class EditImageTechnisch_GUI extends JFrame {
 
+	/**
+	 * Logger instance for this class.
+	 */
+	private final static Logger LOGGER = Logger.getLogger(EditImageTechnisch_GUI.class);
+	
 	private final JPanel contentPanel = new JPanel();
 	String[] result;
 	JSpinner spinnerCPU;
 	JSpinner spinnerRam;
-	//JRadioButton rdbtnlicenseJa;
-	//JRadioButton rdbtnlicenseNein;
-	//JRadioButton rdbtnInternetJa;
-	//JRadioButton rdbtnInternetNein;
-	//JRadioButton radioButtonVorlageJa;
-	//JRadioButton radioButtonVorlageNein;
 	private JCheckBox chckbxIsTemplate;
 	private JCheckBox chckbxIsLicensed;
 	private JCheckBox chckbxIsInternetBlocked;
@@ -223,7 +224,7 @@ public class EditImageTechnisch_GUI extends JFrame {
 			// TODO Auto-generated catch block
 			e1.printStackTrace();
 		}
-		System.out.println("OS Model:" + Image.image.getOS());
+		LOGGER.info("OS of this image: " + Image.image.getOS());
 		for(int i =0;i<comboBox.getItemCount();i++)
 		{
 			if(comboBox.getItemAt(i).equals(Image.image.getOS()+" bit")){
@@ -232,7 +233,7 @@ public class EditImageTechnisch_GUI extends JFrame {
 				
 			}
 		}
-		System.out.println(comboBox.getSelectedItem().toString());
+		LOGGER.debug(comboBox.getSelectedItem().toString());
 		comboBox.setBounds(270, 26, 277, 20);
 		panel_1.add(comboBox);
 		
@@ -434,7 +435,12 @@ public class EditImageTechnisch_GUI extends JFrame {
 						}
 						
 						Image.image.setOS(comboBox.getSelectedItem().toString());
-						System.out.println("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("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
 						EditImageFreigabe_GUI ea=new EditImageFreigabe_GUI();
 						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 d2e81721..a2825d54 100644
--- a/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java
@@ -44,6 +44,7 @@ import models.Links;
 import models.SessionData;
 import models.person;
 
+import org.apache.log4j.Logger;
 import org.apache.thrift.TException;
 import org.ini4j.InvalidFileFormatException;
 import org.ini4j.Wini;
@@ -54,6 +55,7 @@ import util.GuiOrganizer;
 import util.OpenLinks;
 import ftp.UploadTask;
 import gui.intro.About_GUI;
+import gui.intro.Login_GUI;
 import gui.intro.MainMenue_GUI;
 import config.Config;
 
@@ -61,6 +63,11 @@ import config.Config;
 public class FTPCreateUploader_GUI extends JFrame implements
 		PropertyChangeListener {
 
+	/**
+	 * Logger instance for this class.
+	 */
+	private final static Logger LOGGER = Logger.getLogger(FTPCreateUploader_GUI.class);
+	
 	@SuppressWarnings("unused")
 	private JPanel contentPane;
 	private final JPanel contentPanel = new JPanel();
@@ -431,11 +438,11 @@ public class FTPCreateUploader_GUI extends JFrame implements
 		menuItem.addMouseListener(new MouseAdapter() {
 			@Override
 			public void mousePressed(MouseEvent arg0) {
-				OpenLinks open = new OpenLinks();
+				//OpenLinks open = new OpenLinks();
 				URI windows;
 				try {
 					windows = new URI(Links.getFAQ());
-					open.openWebpage(windows);
+					OpenLinks.openWebpage(windows);
 				} catch (URISyntaxException e) {
 					// TODO Auto-generated catch block
 					e.printStackTrace();
@@ -481,21 +488,22 @@ public class FTPCreateUploader_GUI extends JFrame implements
 		btnUploadStarten.setText("Bitte warten");
 
 		try {
-			System.out.println("Getting FTP User");
+			LOGGER.info("Getting FTP User...");
 			user = client.getFtpUser();
-			System.out.println("FTP name: " + user.userName);
-			System.out.println("FTP path: " + user.path);
-			System.out.println("FTP pass: " + user.password);
+			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!");
 			e.printStackTrace();
 			JOptionPane.showMessageDialog(null,
-					e.getCause() + "\n" + e.getStackTrace(), "Debug-Message",
+					"Konnte vom Satellit keinen FTP-User erhalten!", "Debug-Message",
 					JOptionPane.ERROR_MESSAGE);
 		}
 		DateFormat formatter = new SimpleDateFormat("yyyMMddhhmmss");
 
-		System.out.println("Setting new Name: " + formatter.format(new Date())
+		LOGGER.info("Setting new name: " + formatter.format(new Date())
 				+ "_" + person.verantwortlicher.getHochschule() + "_"
 				+ person.verantwortlicher.getUsername() + "_"
 				+ Image.image.getImagename() + ".vmdk");
@@ -503,7 +511,7 @@ public class FTPCreateUploader_GUI extends JFrame implements
 				+ person.verantwortlicher.getHochschule() + "_"
 				+ person.verantwortlicher.getUsername() + "_"
 				+ Image.image.getImagename() + ".vmdk");
-		System.out.println("Uploading to host: " + host);
+		LOGGER.info("Uploading to host: " + host);
 
 		task = new UploadTask(host, port, user.userName, user.password,
 				user.path + "temp/", uploadFile);
diff --git a/dozentenmodul/src/main/java/gui/image/FTPEditDownloader_GUI.java b/dozentenmodul/src/main/java/gui/image/FTPEditDownloader_GUI.java
index 99ae2bc6..42a2c20c 100644
--- a/dozentenmodul/src/main/java/gui/image/FTPEditDownloader_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/FTPEditDownloader_GUI.java
@@ -40,6 +40,7 @@ import models.Image;
 import models.Links;
 import models.SessionData;
 
+import org.apache.log4j.Logger;
 import org.apache.thrift.TException;
 import org.ini4j.InvalidFileFormatException;
 import org.ini4j.Wini;
@@ -58,6 +59,11 @@ import config.Config;
 public class FTPEditDownloader_GUI extends JFrame implements
 		PropertyChangeListener {
 
+	/**
+	 * Logger instance for this class.
+	 */
+	private final static Logger LOGGER = Logger.getLogger(FTPEditDownloader_GUI.class);
+	
 	@SuppressWarnings("unused")
 	private JPanel contentPane;
 	private final JPanel contentPanel = new JPanel();
@@ -534,7 +540,6 @@ public class FTPEditDownloader_GUI extends JFrame implements
 		} else {
 			isCurrentlyLoading = true;
 		}
-		System.out.println("isCurrentlyLoading="+isCurrentlyLoading);
 		return isCurrentlyLoading;
 	}// end isCurrentlyLoading()
 
diff --git a/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java b/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java
index 8ab64d3f..ca7c1d48 100644
--- a/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java
@@ -43,6 +43,7 @@ import models.Links;
 import models.SessionData;
 import models.person;
 
+import org.apache.log4j.Logger;
 import org.apache.thrift.TException;
 import org.ini4j.InvalidFileFormatException;
 import org.ini4j.Wini;
@@ -53,6 +54,7 @@ import util.GuiOrganizer;
 import util.OpenLinks;
 import ftp.UploadTask;
 import gui.intro.About_GUI;
+import gui.intro.Login_GUI;
 import gui.intro.MainMenue_GUI;
 import config.Config;
 
@@ -60,6 +62,11 @@ import config.Config;
 public class FTPEditUploader_GUI extends JFrame implements
 		PropertyChangeListener {
 
+	/**
+	 * Logger instance for this class.
+	 */
+	private final static Logger LOGGER = Logger.getLogger(FTPEditUploader_GUI.class);
+	
 	@SuppressWarnings("unused")
 	private JPanel contentPane;
 	private final JPanel contentPanel = new JPanel();
@@ -480,20 +487,21 @@ public class FTPEditUploader_GUI extends JFrame implements
 		btnUploadStarten.setText("Bitte warten");
 
 		try {
+			LOGGER.info("Getting FTP-User...");
 			user = client.getFtpUser();
-			System.out.println("FTP name: " + user.userName);
-			System.out.println("FTP path: " + user.path);
-			System.out.println("FTP pass: " + user.password);
+			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
 			e.printStackTrace();
 			JOptionPane.showMessageDialog(null,
-					e.getCause() + "\n" + e.getStackTrace(), "Debug-Message",
+					"Konnte vom Satelliten keine FTP-User erhalten!", "Debug-Message",
 					JOptionPane.ERROR_MESSAGE);
 		}
 		DateFormat formatter = new SimpleDateFormat("yyyMMddhhmmss");
 
-		System.out.println("Setting new Name: " + formatter.format(new Date())
+		LOGGER.info("Setting new Name: " + formatter.format(new Date())
 				+ "_" + person.verantwortlicher.getHochschule() + "_"
 				+ person.verantwortlicher.getUsername() + "_"
 				+ Image.image.getImagename() + ".vmdk");
@@ -563,8 +571,8 @@ public class FTPEditUploader_GUI extends JFrame implements
 	public boolean updateData() {
 
 		try {
-			System.out.println("NewName=" + Image.image.getNewName());
-			System.out.println("OldName=" + Image.image.getImagename());
+			LOGGER.debug("NewName: " + Image.image.getNewName());
+			LOGGER.debug("OldName: " + Image.image.getImagename());
 			if (Image.image.getNewName() != null) {
 				client.updateImageData(Image.image.getImagename(),
 						Image.image.getImagename(), Image.image.getDesc(),
@@ -597,7 +605,7 @@ public class FTPEditUploader_GUI extends JFrame implements
 			// TODO Auto-generated catch block
 			e.printStackTrace();
 			JOptionPane.showMessageDialog(null,
-					e.getCause() + "\n" + e.getStackTrace(), "Debug-Message",
+					"Konnte die Metadaten des Images nicht in die Datenbank speichern!", "Debug-Message",
 					JOptionPane.ERROR_MESSAGE);
 			return false;
 		}
diff --git a/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java b/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java
index 1e27725c..dbb667fe 100644
--- a/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java
@@ -1,6 +1,7 @@
 package gui.image;
 
 import gui.intro.About_GUI;
+import gui.intro.Login_GUI;
 import gui.intro.MainMenue_GUI;
 
 import java.awt.Color;
@@ -57,6 +58,7 @@ import models.Image;
 import models.Links;
 import models.person;
 
+import org.apache.log4j.Logger;
 import org.apache.thrift.TException;
 
 import server.generated.Server.Client;
@@ -68,6 +70,11 @@ import util.OpenLinks;
 @SuppressWarnings("serial")
 public class SearchEditImage_GUI extends JFrame {
 
+	/**
+	 * Logger instance for this class.
+	 */
+	private final static Logger LOGGER = Logger.getLogger(SearchEditImage_GUI.class);
+	
 	private final JPanel contentPanel = new JPanel();
 	JLabel labelName;
 	JLabel labelUpdate;
@@ -433,13 +440,11 @@ public class SearchEditImage_GUI extends JFrame {
 										.convertRowIndexToModel(tablemyImages
 												.getSelectedRow()), 6)
 								.toString();
-						//System.out.println(imageid);
 						String version = modelMyImages.getValueAt(
 								tablemyImages
 										.convertRowIndexToModel(tablemyImages
 												.getSelectedRow()), 7)
 								.toString();
-						//System.out.println(version);
 						writeImageData(imageid, version);
 					}
 				});
@@ -474,14 +479,12 @@ public class SearchEditImage_GUI extends JFrame {
 												.convertRowIndexToModel(tablePublicVorlagen
 														.getSelectedRow()), 6)
 								.toString();
-						//System.out.println(imageid);
 						String version = modelPublicVorlagen
 								.getValueAt(
 										tablePublicVorlagen
 												.convertRowIndexToModel(tablePublicVorlagen
 														.getSelectedRow()), 7)
 								.toString();
-						//System.out.println(version);
 						writeImageData(imageid, version);
 					}
 				});
@@ -506,13 +509,11 @@ public class SearchEditImage_GUI extends JFrame {
 										.convertRowIndexToModel(tableAllImages
 												.getSelectedRow()), 6)
 								.toString();
-						//System.out.println(imageid);
 						String version = modelAll.getValueAt(
 								tableAllImages
 										.convertRowIndexToModel(tableAllImages
 												.getSelectedRow()), 7)
 								.toString();
-						//System.out.println(version);
 						writeImageData(imageid, version);
 
 					}
@@ -990,8 +991,8 @@ public class SearchEditImage_GUI extends JFrame {
 
 			while (i.hasNext()) {
 				// erzeuge Objekte fuer die Tabelle
-				System.out.println("image time: " + images.get(x).updateTime);
-				System.out.println("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(),
 						images.get(x).getOsName(),
diff --git a/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java b/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java
index fedf27df..64c76bed 100644
--- a/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java
@@ -59,18 +59,25 @@ import models.Image;
 import models.Links;

 import models.person;

 

+import org.apache.log4j.Logger;

 import org.apache.thrift.TException;

 

 import server.generated.Server.Client;

 import thrift.ThriftConnection;

 import util.GuiOrganizer;

 import util.OpenLinks;

+

 import java.beans.PropertyChangeListener;

 import java.beans.PropertyChangeEvent;

 

 @SuppressWarnings("serial")

 public class SearchImage_GUI extends JFrame {

 

+	/**

+	 * Logger instance for this class.

+	 */

+	private final static Logger LOGGER = Logger.getLogger(SearchImage_GUI.class);

+	

 	private final JPanel contentPanel = new JPanel();

 	JLabel labelName;

 	JLabel labelUpdate;

@@ -440,13 +447,11 @@ public class SearchImage_GUI extends JFrame {
 										.convertRowIndexToModel(tableAllImages

 												.getSelectedRow()), 6)

 								.toString();

-						//System.out.println(imageid);

 						String version = modelAll.getValueAt(

 								tableAllImages

 										.convertRowIndexToModel(tableAllImages

 												.getSelectedRow()), 7)

 								.toString();

-						//System.out.println(version);

 						writeImageData(imageid, version);

 

 					}

@@ -468,13 +473,11 @@ public class SearchImage_GUI extends JFrame {
 										.convertRowIndexToModel(tablemyImages

 												.getSelectedRow()), 6)

 								.toString();

-						//System.out.println(imageid);

 						String version = modelMyImages.getValueAt(

 								tablemyImages

 										.convertRowIndexToModel(tablemyImages

 												.getSelectedRow()), 7)

 								.toString();

-						//System.out.println(version);

 						writeImageData(imageid, version);

 					}

 				});

@@ -500,14 +503,12 @@ public class SearchImage_GUI extends JFrame {
 												.convertRowIndexToModel(tablePublicVorlagen

 														.getSelectedRow()), 6)

 								.toString();

-						//System.out.println(imageid);

 						String version = modelPublicVorlagen

 								.getValueAt(

 										tablePublicVorlagen

 												.convertRowIndexToModel(tablePublicVorlagen

 														.getSelectedRow()), 7)

 								.toString();

-						//System.out.println(version);

 						writeImageData(imageid, version);

 					}

 				});