Merge branch 'master' of git.openslx.org:openslx-ng/tutor-module

1 files changed, 21 insertions, 24 deletions

diff --git a/dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java b/dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java
index a8634e3d..ea1c7b88 100644
--- a/dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java
@@ -137,13 +137,7 @@ public class CreateLectureLink_GUI extends JFrame {
 	 * Create the dialog.
 	 */
 	public CreateLectureLink_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);
@@ -151,6 +145,12 @@ public class CreateLectureLink_GUI extends JFrame {
 		addWindowListener(new WindowAdapter() {
 			@Override
 			public void windowClosing(WindowEvent arg0) {
+				try {
+					client.setSessionInvalid(SessionData.session.getAuthToken());
+				} catch (TException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+				}
 				con.closeThriftConnection();
 				System.exit(0);
 			}
@@ -304,7 +304,7 @@ public class CreateLectureLink_GUI extends JFrame {
 
 		comboBox = new JComboBox<String>();
 		try {
-			List<String> list = client.getAllOS();
+			List<String> list = client.getAllOS(SessionData.session.getAuthToken());
 			comboBox.addItem("");
 			for (int i = 0; i < list.size(); i++) {
 				comboBox.addItem(list.get(i));
@@ -469,26 +469,22 @@ public class CreateLectureLink_GUI extends JFrame {
 										formatter.format(Lecture.lecture.getEnddate()).toString(),
 										Lecture.lecture.isActive(),
 										imageID,
-										person.verantwortlicher.getUsername(),
-										person.verantwortlicher.getVorname(),
-										person.verantwortlicher.getName(),
-										person.verantwortlicher.getHochschule(),
-										person.verantwortlicher.getEMail(),
+										SessionData.session.getAuthToken(),
 										person.verantwortlicher.getTel(),
 										person.verantwortlicher.getFakultaet(),
-										uuid);
+										uuid,
+										person.verantwortlicher.getHochschule());
 								System.out.println("imageID" + " " + imageID);
 								System.out.println("lectureID" + " " + uuid);
 								//set rights for this user
 								
 								client.writeLectureRights(
 										uuid,
-										person.verantwortlicher.getUsername(),
-										person.verantwortlicher.getName(),
-										person.verantwortlicher.getVorname(),
-										person.verantwortlicher.getEMail(),
+										person.verantwortlicher.getRole(),
+										SessionData.session.getAuthToken(),
 										person.verantwortlicher.getHochschule(),
-										person.verantwortlicher.getRole());
+										person.verantwortlicher.getUserID()
+										);
 								
 								//set rights for additional users
 								for(int i=0; i< RightsManagement.rightsManagement.getPermittedUserList().size(); i++){
@@ -498,7 +494,8 @@ public class CreateLectureLink_GUI extends JFrame {
 											RightsManagement.rightsManagement.getPermittedUserList().get(i).getUserID(),
 											RightsManagement.rightsManagement.getPermittedUserList().get(i).isLecture_read(),
 											RightsManagement.rightsManagement.getPermittedUserList().get(i).isLecture_write(),
-											RightsManagement.rightsManagement.getPermittedUserList().get(i).isLecture_admin()
+											RightsManagement.rightsManagement.getPermittedUserList().get(i).isLecture_admin(),
+											SessionData.session.getAuthToken()
 											);
 								
 								}//end for
@@ -750,7 +747,7 @@ public class CreateLectureLink_GUI extends JFrame {
 		
 		try 
 		{
-			uuid = client.createRandomUUID();
+			uuid = client.createRandomUUID(SessionData.session.getAuthToken());
 		} 
 		catch (TException e1) 
 		{
@@ -770,9 +767,9 @@ public class CreateLectureLink_GUI extends JFrame {
 		// Hole eine Liste der Images
 		if(person.verantwortlicher.getRole()=="Admin"){
 			//get complete list
-			images = client.getImageList(person.verantwortlicher.getUserID());
+			images = client.getImageList(person.verantwortlicher.getUserID(),SessionData.session.getAuthToken());
 		} else {		
-			images = client.getImageListPermissionLink(person.verantwortlicher.getUserID());
+			images = client.getImageListPermissionLink(person.verantwortlicher.getUserID(),SessionData.session.getAuthToken());
 		}
 
 		Iterator<server.generated.Image> i = images.iterator();
@@ -826,7 +823,7 @@ public class CreateLectureLink_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.getImageData(id, version);
+		Map<String, String> res = client.getImageData(id, version,SessionData.session.getAuthToken());
 		labelName.setText(res.get("name"));
 		labelOS.setText(res.get("os"));
 		labelUpdate.setText(out.format(in.parse(res.get("lastupdate"))));