Haufen Konsolenausgaben enfernt

9 files changed, 17 insertions, 40 deletions

diff --git a/Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java b/Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java
index cdcf9f6d..b80e4953 100644
--- a/Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java
+++ b/Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java
@@ -267,12 +267,7 @@ public class EditImageAllgemein_GUI extends JFrame {
 				okButton = new JButton("Weiter");
 				okButton.addActionListener(new ActionListener() {
 					public void actionPerformed(ActionEvent arg0) {
-						System.out.println("text length="+imagename.getText().length());
-						//Setzen der Eingabe im Model, dadurch bleiben die Daten bei einem erneuten Aufruf verfügbar
-
-						//TODO
-						//Prüfung ob alle notwendigen Felder ausgefüllt sind --> funktioniert aktuell nicht
-						//der Button wechselt beim Klick auf die nächste Seite, selbst wenn kein handler implementiert ist... WTF???
+						//check is textfield has content
 						if(imagename.getText().length() <= 0){
 							JOptionPane.showMessageDialog(null,
 								    "Bitte geben Sie einen Labornamen ein.",
diff --git a/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java b/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java
index b585fa50..e8c0c4b9 100644
--- a/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java
+++ b/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java
@@ -142,12 +142,12 @@ public class FTPCreateUploader_GUI extends JFrame implements
 					File file = fc.getSelectedFile();
 					// check if a file is selected and exists
 					if (file != null) {
-						System.out.println("File to upload exists");
+						// file selected
 						uploadFile = file;
 						filename = uploadFile.getName();
 						lblPath.setText(file.getAbsolutePath());
 					} else {
-						System.out.println("No file selected");
+						// no file selected
 						lblPath.setText("");
 					}// end if
 				}
@@ -378,9 +378,9 @@ public class FTPCreateUploader_GUI extends JFrame implements
 
 		try {
 			user = client.getFtpUser();
-			System.out.println("name" + user.userName);
-			System.out.println("path" + user.path);
-			System.out.println("pass" + user.password);
+			System.out.println("FTP name" + user.userName);
+			System.out.println("FTP path" + user.path);
+			System.out.println("FTP pass" + user.password);
 		} catch (TException e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
diff --git a/Dozentenmodul/src/gui/image/FTPDownloader_GUI.java b/Dozentenmodul/src/gui/image/FTPDownloader_GUI.java
index f6175934..4a54e346 100644
--- a/Dozentenmodul/src/gui/image/FTPDownloader_GUI.java
+++ b/Dozentenmodul/src/gui/image/FTPDownloader_GUI.java
@@ -124,7 +124,6 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener
 					// check if directory is selected
 					if (dir != null) {
 						// is selected
-						System.out.println("Target directory exists.");
 						lblPath.setText(dir.getAbsolutePath());
 					} else {
 						// no directory selected
diff --git a/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java b/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java
index dd35ad83..9863c1c6 100644
--- a/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java
+++ b/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java
@@ -145,12 +145,12 @@ public class FTPEditUploader_GUI extends JFrame implements
 					File file = fc.getSelectedFile();
 					// check if a file is selected and exists
 					if (file != null) {
-						System.out.println("File to upload exists");
+						// file exists
 						uploadFile = file;
 						filename = uploadFile.getName();
 						lblPath.setText(file.getAbsolutePath());
 					} else {
-						System.out.println("No file selected");
+						// no file selected
 						lblPath.setText("");
 					}// end if
 				}
@@ -374,9 +374,9 @@ public class FTPEditUploader_GUI extends JFrame implements
 
 		try {
 			user = client.getFtpUser();
-			System.out.println("name" + user.userName);
-			System.out.println("path" + user.path);
-			System.out.println("pass" + user.password);
+			System.out.println("FTP name" + user.userName);
+			System.out.println("FTP path" + user.path);
+			System.out.println("FTP pass" + user.password);
 		} catch (TException e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
@@ -457,8 +457,6 @@ public class FTPEditUploader_GUI extends JFrame implements
 	public boolean updateData() {
 
 		try {
-
-			System.out.println("Start Update");
 			client.updateImageData(Image.image.getImagename(),
 					Image.image.getNewName(), Image.image.isLicensed(),
 					Image.image.isInternet(), Image.image.getRam(),
diff --git a/Dozentenmodul/src/gui/image/SearchEditImage_GUI.java b/Dozentenmodul/src/gui/image/SearchEditImage_GUI.java
index 95a50732..e6bb055e 100644
--- a/Dozentenmodul/src/gui/image/SearchEditImage_GUI.java
+++ b/Dozentenmodul/src/gui/image/SearchEditImage_GUI.java
@@ -502,7 +502,6 @@ public class SearchEditImage_GUI extends JFrame {
 						images.get(x).getUserData(),
 						images.get(x).getUpdateTime(), "", images.get(x).id,
 						images.get(x).getVersion() };
-				// System.out.println("id:"+images.get(x).getId());
 				// Füge diese Objekte der Tabelle hinzu
 				model.addRow(obj);
 				x++;
diff --git a/Dozentenmodul/src/gui/intro/Login_GUI.java b/Dozentenmodul/src/gui/intro/Login_GUI.java
index 586b8d13..488c6b69 100644
--- a/Dozentenmodul/src/gui/intro/Login_GUI.java
+++ b/Dozentenmodul/src/gui/intro/Login_GUI.java
@@ -177,7 +177,7 @@ public class Login_GUI extends JFrame {
 		final thrift.SessionData result;
 		try {
 			String passText = new String(pass.getPassword());
-			System.out.println(username.getText() + " " + passText);
+			System.out.println("Benutzer:" +username.getText() + "\nPasswort" + passText);
 			result = client.authenticate(username.getText(), passText);
 			
 		} catch (thrift.AuthenticationException e) {
diff --git a/Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java b/Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java
index 29193798..a9125829 100644
--- a/Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java
+++ b/Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java
@@ -374,7 +374,7 @@ public class CreateLectureLink_GUI extends JFrame {
 							try {
 								DateFormat formatter = new SimpleDateFormat(
 										"yyyy-MM-dd hh:mm:ss");
-								System.out.println("Veranstaltung anlegen um: "
+								System.out.println("Veranstaltung angelegt um: "
 										+ formatter.format(
 												Lecture.lecture.getStartdate())
 												.toString());
diff --git a/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java b/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java
index 819f3541..c245ce79 100644
--- a/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java
+++ b/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java
@@ -116,7 +116,8 @@ public class EditLectureLink_GUI extends JFrame {
 			getContentPane().add(panel);
 			panel.setLayout(null);
 			{
-				JLabel lblNewLabel = new JLabel("Image zur Verlinkung ausw\u00E4hlen");
+				JLabel lblNewLabel = new JLabel(
+						"Image zur Verlinkung ausw\u00E4hlen");
 				lblNewLabel.setBounds(10, 11, 509, 22);
 				panel.add(lblNewLabel);
 				lblNewLabel.setFont(new Font("Tahoma", Font.BOLD, 18));
@@ -357,13 +358,7 @@ public class EditLectureLink_GUI extends JFrame {
 						"Veranstaltung erzeugen und abschlie\u00DFen");
 				cancelButton.addActionListener(new ActionListener() {
 					public void actionPerformed(ActionEvent e) {
-						
-						System.out.println("\ntableAllImages.getSelectedRow() = "+tableAllImages.getSelectedRow()
-								+"\ntablemyImages.getSelectedRow() = "+tablemyImages.getSelectedRow() 
-								+"\ntableCoopImages.getSelectedRow() = "+tableCoopImages.getSelectedRow() 
-								+"\ntablePublicImages.getSelectedRow() = "+tablePublicImages.getSelectedRow() 
-								+"\ntablePublicVorlagen.getSelectedRow() = "+tablePublicVorlagen.getSelectedRow() );
-						
+
 						// check if a row is selected
 						if ((tableAllImages.getSelectedRow() != -1)
 								|| (tablemyImages.getSelectedRow() != -1)
diff --git a/Dozentenmodul/src/gui/lecture/EditLectureSearch_GUI.java b/Dozentenmodul/src/gui/lecture/EditLectureSearch_GUI.java
index c1ac5790..ae50fa22 100644
--- a/Dozentenmodul/src/gui/lecture/EditLectureSearch_GUI.java
+++ b/Dozentenmodul/src/gui/lecture/EditLectureSearch_GUI.java
@@ -256,7 +256,6 @@ public class EditLectureSearch_GUI extends JFrame {
 
 		tabbedPane.setBounds(10, 197, 557, 323);
 		contentPanel.add(tabbedPane);
-		System.out.println("haaaaaaaaaaa");
 		initTableModel(modelMyLectures);
 
 		JScrollPane scrollPaneAllImages = new JScrollPane();
@@ -402,13 +401,7 @@ public class EditLectureSearch_GUI extends JFrame {
 														.convertRowIndexToModel(tablemyLectures
 																.getSelectedRow()),
 												2).toString();
-								System.out.println("original date = "
-										+ modelMyLectures
-												.getValueAt(
-														tablemyLectures
-																.convertRowIndexToModel(tablemyLectures
-																		.getSelectedRow()),
-														2).toString());
+								
 								Lecture.lecture.setLinkedImagename(modelMyLectures
 										.getValueAt(
 												tablemyLectures
@@ -423,8 +416,6 @@ public class EditLectureSearch_GUI extends JFrame {
 										zweitesLeerzeichen);
 								String enddate = date
 										.substring(zweitesLeerzeichen);
-								System.out.println("startdate = " + startdate);
-								System.out.println("enddate = " + enddate);
 								DateFormat df = new SimpleDateFormat(
 										"yyyy-MM-dd hh:mm:ss");