1 files changed, 37 insertions, 25 deletions

diff --git a/dozentenmodul/src/main/java/gui/lecture/DeleteLecture_GUI.java b/dozentenmodul/src/main/java/gui/lecture/DeleteLecture_GUI.java
index 9449dcd7..3e010696 100644
--- a/dozentenmodul/src/main/java/gui/lecture/DeleteLecture_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/DeleteLecture_GUI.java
@@ -115,20 +115,13 @@ public class DeleteLecture_GUI extends JFrame {
 			+ "</div></html>";
 
 	RowFilter rf = null;
-	List<RowFilter<Object, Object>> filters = new ArrayList<RowFilter<Object, Object>>(
-			2);
+	List<RowFilter<Object, Object>> filters = new ArrayList<RowFilter<Object, Object>>(2);
 
 	/**
 	 * Create the dialog.
 	 */
 	public DeleteLecture_GUI(Component formerGUI) {
 		
-		try {
-			client.setTokenForSession(SessionData.session.getAuthToken());
-		} catch (TException e1) {
-			// TODO Auto-generated catch block
-			e1.printStackTrace();
-		}
 
 		filters.add(RowFilter.regexFilter(".", 0));
 		rf = RowFilter.orFilter(filters);
@@ -137,6 +130,12 @@ public class DeleteLecture_GUI extends JFrame {
 			@Override
 			public void windowClosing(WindowEvent arg0) {
 				// Beendet die Anwendung nach klick auf X
+				try {
+					client.setSessionInvalid(SessionData.session.getAuthToken());
+				} catch (TException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+				}
 				con.closeThriftConnection();
 				System.exit(0);
 			}
@@ -159,6 +158,7 @@ public class DeleteLecture_GUI extends JFrame {
 				// 6=Image
 				// 7=Schlagwort
 				// 8=ID
+
 				tablemyLectures.getColumnModel().getColumn(1).setWidth(0);
 				tablemyLectures.getColumnModel().getColumn(1).setMinWidth(0);
 				tablemyLectures.getColumnModel().getColumn(1).setMaxWidth(0);
@@ -183,10 +183,12 @@ public class DeleteLecture_GUI extends JFrame {
 				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())); 
+						System.out.println(tablemyLectures.getSelectedRow());
 					}
 				});
 
@@ -208,7 +210,7 @@ public class DeleteLecture_GUI extends JFrame {
 		// Zentriert das Fenster in die Bildmitte
 		setBounds(0, 0, 842, 722);
 		setLocationRelativeTo(formerGUI);
-
+		
 		getContentPane().setLayout(null);
 		{
 			JPanel panel = new JPanel();
@@ -217,8 +219,7 @@ public class DeleteLecture_GUI extends JFrame {
 			getContentPane().add(panel);
 			panel.setLayout(null);
 			{
-				JLabel lblNewLabel = new JLabel(
-						"Zu löschende Veranstaltung wählen");
+				JLabel lblNewLabel = new JLabel("Zu löschende Veranstaltung wählen");
 				lblNewLabel.setBounds(10, 11, 509, 22);
 				panel.add(lblNewLabel);
 				lblNewLabel.setFont(new Font("Tahoma", Font.BOLD, 18));
@@ -245,7 +246,7 @@ public class DeleteLecture_GUI extends JFrame {
 		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);
@@ -390,14 +391,22 @@ public class DeleteLecture_GUI extends JFrame {
 						lectureID = modelMyLectures
 								.getValueAt(
 										tablemyLectures
-												.convertColumnIndexToModel(tablemyLectures
-														.getSelectedRow()), 8)
-								.toString();
+												.convertRowIndexToModel(tablemyLectures
+														.getSelectedRow()),
+										8).toString();
+						
+						//int test = tablemyLectures.convertColumnIndexToModel(tablemyLectures.getSelectedRow());
+						
+						
 						// LOGGER.info("Lösche Veranstaltung: " + lectureID);
 						try {
-							if (client.deleteLecture(lectureID,
-									person.verantwortlicher.getHochschule(),
-									person.verantwortlicher.getUsername())) {
+							if (client.deleteLecture(
+									lectureID,
+									SessionData.session.getAuthToken(),
+									person.verantwortlicher.getHochschule()
+									)
+									)
+							{
 								
 								// delete successful
 								LOGGER.info("Veranstaltung erfolgreich '"+lectureID+"' gelöscht.");
@@ -626,15 +635,17 @@ public class DeleteLecture_GUI extends JFrame {
 			throws ParseException {
 		List<server.generated.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 = client.getLectureList();
-			} else {
+				lectures = client.getLectureList(SessionData.session.getAuthToken());
+			} 
+			else 
+			{
 				//get permitted list
-				lectures = client.getLectureListPermissionAdmin(person.verantwortlicher.getUserID());
+				lectures = client.getLectureListPermissionAdmin(SessionData.session.getAuthToken());
 			}
 			
 			Iterator<server.generated.Lecture> i = lectures.iterator();
@@ -668,6 +679,7 @@ public class DeleteLecture_GUI extends JFrame {
 
 			e1.printStackTrace();
 		}
+		
 		return model;
 	}
 
@@ -691,7 +703,7 @@ public class DeleteLecture_GUI extends JFrame {
 
 		SimpleDateFormat in = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 		SimpleDateFormat out = new SimpleDateFormat("dd.MM.yyyy HH:mm:ss");
-		Map<String, String> res = client.getLectureData(id);
+		Map<String, String> res = client.getLectureData(id,SessionData.session.getAuthToken());
 		labelName.setText(res.get("name"));
 		labelAktiv.setText(res.get("isActive"));
 		labeldesc.setText(res.get("desc"));