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

1 files changed, 19 insertions, 26 deletions

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();
 				}