Aua, aua...

1 files changed, 59 insertions, 127 deletions

diff --git a/dozentenmodul/src/main/java/gui/lecture/DeleteLecture_GUI.java b/dozentenmodul/src/main/java/gui/lecture/DeleteLecture_GUI.java
index fa5c84c5..71054020 100644
--- a/dozentenmodul/src/main/java/gui/lecture/DeleteLecture_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/DeleteLecture_GUI.java
@@ -1,5 +1,6 @@
 package gui.lecture;
 
+import gui.helper.TableFiller;
 import gui.intro.MainMenue_GUI;
 
 import java.awt.Color;
@@ -16,7 +17,6 @@ import java.awt.event.MouseEvent;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
@@ -34,8 +34,6 @@ import javax.swing.JTextField;
 import javax.swing.JTextPane;
 import javax.swing.ListSelectionModel;
 import javax.swing.RowFilter;
-import javax.swing.UIManager;
-import javax.swing.UnsupportedLookAndFeelException;
 import javax.swing.border.EmptyBorder;
 import javax.swing.border.TitledBorder;
 import javax.swing.event.InternalFrameAdapter;
@@ -59,8 +57,7 @@ import util.GuiManager;
 @SuppressWarnings("serial")
 public class DeleteLecture_GUI extends JInternalFrame {
 
-	private final static Logger LOGGER = Logger
-			.getLogger(DeleteLecture_GUI.class);
+	private final static Logger LOGGER = Logger.getLogger(DeleteLecture_GUI.class);
 
 	private final JPanel contentPanel = new JPanel();
 	String[] result;
@@ -78,21 +75,16 @@ public class DeleteLecture_GUI extends JInternalFrame {
 	private JTextField textFieldName;
 	private JLabel lblTotalResults;
 	boolean activeSearch = false;
-	String[] titles = { "Veranstaltungsname", "Beschreibung",
-			"Gültigkeitsdatum", "Aktiv", "Letzte Benutzung",
-			"Verantwortlicher", "Image", "Schlagwort", "ID" };
+	String[] titles = { "Veranstaltungsname", "Beschreibung", "Gültigkeitsdatum", "Aktiv",
+			"Letzte Benutzung", "Verantwortlicher", "Image", "Schlagwort", "ID" };
 
-	final DefaultTableModel modelMyLectures = new DefaultTableModel(titles, 0){
+	final DefaultTableModel modelMyLectures = new DefaultTableModel(titles, 0) {
 		public boolean isCellEditable(int rowIndex, int mColIndex) {
 			return false;
 		}
 	};
-	
-	
-	
 
-	final TableRowSorter<TableModel> rowSorterMyLectures = new TableRowSorter<TableModel>(
-			modelMyLectures);
+	final TableRowSorter<TableModel> rowSorterMyLectures = new TableRowSorter<TableModel>(modelMyLectures);
 	private JButton button;
 
 	Component c = null;
@@ -110,7 +102,6 @@ public class DeleteLecture_GUI extends JInternalFrame {
 	 * Create the dialog.
 	 */
 	public DeleteLecture_GUI() {
-		
 
 		filters.add(RowFilter.regexFilter(".", 0));
 		rf = RowFilter.orFilter(filters);
@@ -119,13 +110,7 @@ public class DeleteLecture_GUI extends JInternalFrame {
 			@Override
 			public void internalFrameActivated(InternalFrameEvent arg0) {
 				textFieldName.requestFocusInWindow();
-				try {
-					initTableModel(modelMyLectures);
-
-				} catch (ParseException e) {
-
-					e.printStackTrace();
-				}
+				initTableModel(modelMyLectures);
 
 				// auszublendende Angaben
 				// 1=Beschreibung
@@ -153,17 +138,17 @@ public class DeleteLecture_GUI extends JInternalFrame {
 				tablemyLectures.getColumnModel().getColumn(8).setWidth(0);
 				tablemyLectures.getColumnModel().getColumn(8).setMinWidth(0);
 				tablemyLectures.getColumnModel().getColumn(8).setMaxWidth(0);
-				
+
 				tablemyLectures.getTableHeader().setReorderingAllowed(false);
 				tablemyLectures.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
 				tablemyLectures.addMouseListener(new MouseAdapter() {
 
 					@Override
-					public void mouseReleased(MouseEvent e) 
-					{
+					public void mouseReleased(MouseEvent e) {
 
 						tablemyLectures.clearSelection(); //just one row is selectablemyLectures
-						tablemyLectures.setRowSelectionInterval(tablemyLectures.rowAtPoint(e.getPoint()), tablemyLectures.rowAtPoint(e.getPoint())); 
+						tablemyLectures.setRowSelectionInterval(tablemyLectures.rowAtPoint(e.getPoint()),
+								tablemyLectures.rowAtPoint(e.getPoint()));
 						System.out.println(tablemyLectures.getSelectedRow());
 					}
 				});
@@ -173,19 +158,11 @@ public class DeleteLecture_GUI extends JInternalFrame {
 		// Verhindert das Vergroessern Des Fensters
 		setResizable(false);
 
-		try {
-			// Setzt das Look & Feel auf System
-			UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
-		} catch (ClassNotFoundException | InstantiationException
-				| IllegalAccessException | UnsupportedLookAndFeelException e) {
-
-			e.printStackTrace();
-		}
 		// Setzt den Fenstertitel
-		setTitle("bwLehrpool Suite - Veranstaltung löschen - "+person.verantwortlicher.getUserID());
+		setTitle("bwLehrpool Suite - Veranstaltung löschen - " + person.verantwortlicher.getUserID());
 		// Zentriert das Fenster in die Bildmitte
 		setBounds(0, 0, 842, 722);
-		
+
 		getContentPane().setLayout(null);
 		{
 			JPanel panel = new JPanel();
@@ -216,12 +193,12 @@ public class DeleteLecture_GUI extends JInternalFrame {
 
 		JPanel panel_1 = new JPanel();
 		panel_1.setBackground(SystemColor.menu);
-		panel_1.setBorder(new TitledBorder(null, "Filterfunktionen",
-				TitledBorder.LEADING, TitledBorder.TOP, null, null));
+		panel_1.setBorder(new TitledBorder(null, "Filterfunktionen", TitledBorder.LEADING, TitledBorder.TOP,
+				null, null));
 		panel_1.setBounds(10, 49, 557, 64);
 		contentPanel.add(panel_1);
 		panel_1.setLayout(null);
-		
+
 		JLabel lblNewLabel_2 = new JLabel("Volltextsuche:");
 		lblNewLabel_2.setBounds(30, 30, 80, 20);
 		panel_1.add(lblNewLabel_2);
@@ -291,7 +268,7 @@ public class DeleteLecture_GUI extends JInternalFrame {
 		JLabel label_2 = new JLabel(">");
 		label_2.setBounds(152, 11, 13, 14);
 		contentPanel.add(label_2);
-		
+
 		lblTotalResults = new JLabel("Anzahl:");
 		lblTotalResults.setBounds(10, 500, 131, 20);
 		contentPanel.add(lblTotalResults);
@@ -303,31 +280,27 @@ public class DeleteLecture_GUI extends JInternalFrame {
 		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) {
-
-								e1.printStackTrace();
-							} catch (ParseException e1) {
-
-								e1.printStackTrace();
-							}
-						}
+		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) {
+
+						e1.printStackTrace();
+					} catch (ParseException e1) {
+
+						e1.printStackTrace();
 					}
+				}
+			}
 
-				});
+		});
 		tablemyLectures.setModel(modelMyLectures);
 
 		tablemyLectures.getColumnModel().getColumn(1).sizeWidthToFit();
@@ -351,47 +324,33 @@ public class DeleteLecture_GUI extends JInternalFrame {
 				if (tablemyLectures.getSelectedRowCount() != 0) {
 					// a row is selected
 					// ask for confirmation
-					eingabe = JOptionPane.showConfirmDialog(c,
-							"Wollen Sie diese Daten löschen?", "Löschen?",
+					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
-												.convertRowIndexToModel(tablemyLectures
-														.getSelectedRow()),
-										8).toString();
-						
+						lectureID = modelMyLectures.getValueAt(
+								tablemyLectures.convertRowIndexToModel(tablemyLectures.getSelectedRow()), 8)
+								.toString();
+
 						//int test = tablemyLectures.convertColumnIndexToModel(tablemyLectures.getSelectedRow());
-						
-						
+
 						// LOGGER.info("Lösche Veranstaltung: " + lectureID);
 						try {
-							if (ThriftManager.getSatClient().deleteLecture(
-									lectureID,
-									SessionData.authToken,
-									person.verantwortlicher.getHochschule()
-									)
-									)
-							{
-								
+							if (ThriftManager.getSatClient().deleteLecture(lectureID, SessionData.authToken,
+									person.verantwortlicher.getHochschule())) {
+
 								// delete successful
-								LOGGER.info("Veranstaltung erfolgreich '"+lectureID+"' gelöscht.");
+								LOGGER.info("Veranstaltung erfolgreich '" + lectureID + "' gelöscht.");
 								GuiManager.show(new DeleteLecture_GUI());
 							} else {
 								// delete not successful
-								LOGGER.error("Konnte Veranstaltung '"
-										+ lectureID
+								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);
+								JOptionPane.showMessageDialog(c,
+										"Löschen der Veranstaltung aus der Datenbank fehlgeschlagen.",
+										"Fehler", JOptionPane.INFORMATION_MESSAGE);
 							}
 						} catch (TException e1) {
 
@@ -521,59 +480,33 @@ public class DeleteLecture_GUI extends JInternalFrame {
 		scrollPaneName.setBounds(10, 40, 218, 55);
 		panel.add(scrollPaneName);
 
-
 	}
 
 	// Initiale Beffuelung eines Table models
-	public DefaultTableModel initTableModel(DefaultTableModel model)
-			throws ParseException {
+	public DefaultTableModel initTableModel(DefaultTableModel model) {
 		List<Lecture> lectures;
 		try {
-		
+
 			// Hole eine Liste der erlaubten Images für die diese Person
-			if(person.verantwortlicher.getRole()=="Admin")
-			{
+			if (person.verantwortlicher.getRole() == "Admin") {
 				//get complete list
 				lectures = ThriftManager.getSatClient().getLectureList(SessionData.authToken);
-			} 
-			else 
-			{
+			} else {
 				//get permitted list
 				lectures = ThriftManager.getSatClient().getLectureListPermissionAdmin(SessionData.authToken);
 			}
-			
-			Iterator<Lecture> i = lectures.iterator();
-			SimpleDateFormat in = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-			SimpleDateFormat out = new SimpleDateFormat("dd.MM.yyyy HH:mm:ss");
-			int x = 0;
-
-			while (i.hasNext()) {
-				// erzeuge Objekte fuer die Tabelle
-				Object[] obj = {
-						lectures.get(x).lecturename,
-						lectures.get(x).desc,
-						out.format(in.parse(lectures.get(x).starttime)) + " "
-								+ out.format(in.parse(lectures.get(x).endtime)),
-						lectures.get(x).isActive,
-						out.format(in.parse(lectures.get(x).lastused)),
-						lectures.get(x).username, lectures.get(x).imagename,
-						" ", lectures.get(x).id, };
-				// Fuege diese Objekte der Tabelle hinzu
-				model.addRow(obj);
-				x++;
-				i.next();
 
-			}
+			TableFiller.fillModelWithLectureList(model, lectures);
 
 			//show number if rows in GUI
-			lblTotalResults.setText(lblTotalResults.getText()+" "+model.getRowCount());
+			lblTotalResults.setText(lblTotalResults.getText() + " " + model.getRowCount());
 
 			return model;
 		} catch (TException e1) {
 
 			e1.printStackTrace();
 		}
-		
+
 		return model;
 	}
 
@@ -597,15 +530,14 @@ public class DeleteLecture_GUI extends JInternalFrame {
 
 		SimpleDateFormat in = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 		SimpleDateFormat out = new SimpleDateFormat("dd.MM.yyyy HH:mm:ss");
-		Map<String, String> res = ThriftManager.getSatClient().getLectureData(id,SessionData.authToken);
+		Map<String, String> res = ThriftManager.getSatClient().getLectureData(id, SessionData.authToken);
 		labelName.setText(res.get("name"));
 		labelAktiv.setText(res.get("isActive"));
 		labeldesc.setText(res.get("desc"));
 		labelVerantwortlicher.setText(res.get("owner"));
 		labelstartdate.setText(out.format(in.parse(res.get("startTime"))));
 		labelenddate.setText(out.format(in.parse(res.get("endTime"))));
-		labelimage.setText(res.get("imagepath").substring(
-				res.get("imagepath").indexOf("/") + 1));
+		labelimage.setText(res.get("imagepath").substring(res.get("imagepath").indexOf("/") + 1));
 		labelimageversion.setText(res.get("imageversion"));
 
 	}