[client] do commit the changes :)

5 files changed, 11 insertions, 23 deletions

diff --git a/dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java b/dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java
index 2ac5555d..cc947084 100644
--- a/dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java
@@ -410,14 +410,12 @@ public class CreateLectureLink_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);
 	        	try {
 					writeImageData(imageid, version);
 				} catch (TException e1) {
@@ -461,14 +459,12 @@ public class CreateLectureLink_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);
 					        	try {
 									writeImageData(imageid, version);
 								} catch (TException e1) {
@@ -504,14 +500,12 @@ public class CreateLectureLink_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);
 			        	try {
 							writeImageData(imageid, version);
 						} catch (TException e1) {
diff --git a/dozentenmodul/src/main/java/gui/lecture/DeleteLecture_GUI.java b/dozentenmodul/src/main/java/gui/lecture/DeleteLecture_GUI.java
index dd6f6048..b387ab9f 100644
--- a/dozentenmodul/src/main/java/gui/lecture/DeleteLecture_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/DeleteLecture_GUI.java
@@ -1,6 +1,7 @@
 package gui.lecture;
 
 import gui.intro.About_GUI;
+import gui.intro.Login_GUI;
 import gui.intro.MainMenue_GUI;
 
 import java.awt.Color;
@@ -56,6 +57,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;
@@ -65,6 +67,8 @@ import util.OpenLinks;
 
 @SuppressWarnings("serial")
 public class DeleteLecture_GUI extends JFrame {
+	
+	private final static Logger LOGGER = Logger.getLogger(DeleteLecture_GUI.class);
 
 	private final JPanel contentPanel = new JPanel();
 	String[] result;
@@ -330,7 +334,6 @@ public class DeleteLecture_GUI extends JFrame {
 										.convertRowIndexToModel(tableAllLectures
 												.getSelectedRow()), 8)
 						.toString();
-	        	//System.out.println(imageid);
 
 	        	try {
 					writeLectureData(imageid);
@@ -362,7 +365,6 @@ public class DeleteLecture_GUI extends JFrame {
 										.convertRowIndexToModel(tablemyLectures
 												.getSelectedRow()), 8)
 						.toString();
-	        	//System.out.println(imageid);
 
 	        	try {
 					writeLectureData(imageid);
@@ -534,10 +536,10 @@ public class DeleteLecture_GUI extends JFrame {
 							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();
-								System.out.println("Lösche Lecture "+lectureID);
+								LOGGER.info("Lösche Veranstaltung: " + lectureID);
 								try {
 									if(client.deleteLecture(lectureID, person.verantwortlicher.getHochschule(),person.verantwortlicher.getUsername())){
-										System.out.println("Löschen erfolgreich");
+										LOGGER.info("Löschen erfolgreich.");
 										//delete successful
 										
 										DeleteLecture_GUI dl = new DeleteLecture_GUI();
@@ -545,10 +547,11 @@ public class DeleteLecture_GUI extends JFrame {
 										dispose();
 									} else {
 										//delete not successful
+										LOGGER.error("Konnte Veranstaltung '" + lectureID + "' nicht aus der Datenbank löschen!");
 										JOptionPane
 										.showMessageDialog(
 												null,
-												"Löschen aus Datenbank fehlgeschlagen.",
+												"Löschen der Veranstaltung aus der Datenbank fehlgeschlagen.",
 												"Fehler",
 												JOptionPane.INFORMATION_MESSAGE);
 									}
@@ -569,10 +572,10 @@ public class DeleteLecture_GUI extends JFrame {
 							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();
-								System.out.println("Lösche Lecture "+lectureID);
+								LOGGER.info("Lösche Veranstaltung: "+lectureID);
 								try {
 									if(client.deleteLecture(lectureID, person.verantwortlicher.getHochschule(),person.verantwortlicher.getUsername())){
-										System.out.println("Löschen erfolgreich");
+										LOGGER.info("Löschen erfolgreich.");
 										//delete successful
 										
 										DeleteLecture_GUI dl = new DeleteLecture_GUI();
@@ -580,6 +583,7 @@ public class DeleteLecture_GUI extends JFrame {
 										dispose();
 									} else {
 										//delete not successful
+										LOGGER.error("Konnte Veranstaltung '" + lectureID + "' nicht aus der Datenbank löschen!");
 										JOptionPane
 										.showMessageDialog(
 												null,
diff --git a/dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java b/dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java
index bc9056de..7c828ea0 100644
--- a/dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java
@@ -406,14 +406,12 @@ public class EditLectureLink_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);
 
 	        }
@@ -436,14 +434,12 @@ public class EditLectureLink_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);
 			        }
 			    });
@@ -469,14 +465,12 @@ public class EditLectureLink_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);
 			        }
 			    });
diff --git a/dozentenmodul/src/main/java/gui/lecture/EditLectureSearch_GUI.java b/dozentenmodul/src/main/java/gui/lecture/EditLectureSearch_GUI.java
index b143420a..ab72cf11 100644
--- a/dozentenmodul/src/main/java/gui/lecture/EditLectureSearch_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/EditLectureSearch_GUI.java
@@ -335,7 +335,6 @@ public class EditLectureSearch_GUI extends JFrame {
 												.convertRowIndexToModel(tableAllLectures
 														.getSelectedRow()), 8)
 								.toString();
-						//System.out.println(imageid);
 
 						try {
 							writeLectureData(imageid);
@@ -365,7 +364,6 @@ public class EditLectureSearch_GUI extends JFrame {
 										.convertRowIndexToModel(tablemyLectures
 												.getSelectedRow()), 8)
 								.toString();
-						//System.out.println(imageid);
 
 						try {
 							writeLectureData(imageid);
diff --git a/dozentenmodul/src/main/java/gui/lecture/SearchLecture_GUI.java b/dozentenmodul/src/main/java/gui/lecture/SearchLecture_GUI.java
index e3c70c4b..510e7a7d 100644
--- a/dozentenmodul/src/main/java/gui/lecture/SearchLecture_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/SearchLecture_GUI.java
@@ -325,7 +325,6 @@ public class SearchLecture_GUI extends JFrame {
 										.convertRowIndexToModel(tableAllLectures

 												.getSelectedRow()), 8)

 						.toString();

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

 

 	        	try {

 					writeLectureData(imageid);

@@ -357,7 +356,6 @@ public class SearchLecture_GUI extends JFrame {
 										.convertRowIndexToModel(tablemyLectures

 												.getSelectedRow()), 8)

 						.toString();

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

 

 	        	try {

 					writeLectureData(imageid);