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

1 files changed, 13 insertions, 13 deletions

diff --git a/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java b/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java
index 290bd1e0..5e1607a8 100644
--- a/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java
@@ -148,13 +148,6 @@ public class SearchEditImage_GUI extends JFrame {
 	 */
 	public SearchEditImage_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);
@@ -164,7 +157,14 @@ public class SearchEditImage_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);
 			}
 
@@ -322,7 +322,7 @@ public class SearchEditImage_GUI extends JFrame {
 		try {
 			// Holt sich eine Liste aller verfuegbaren Betriebssysteme vom
 			// Server
-			List<String> list = client.getAllOS();
+			List<String> list = client.getAllOS(SessionData.session.getAuthToken());
 			// Leeres Item hinzufuegen
 			comboBox.addItem("");
 			for (int i = 0; i < list.size(); i++) {
@@ -765,10 +765,10 @@ public class SearchEditImage_GUI extends JFrame {
 			// Hole eine Liste der passenden 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 {
 				//only get permitted list
-				images = client.getImageListPermissionWrite(person.verantwortlicher.getUserID());
+				images = client.getImageListPermissionWrite(person.verantwortlicher.getUserID(),SessionData.session.getAuthToken());
 			}
 
 			Iterator<server.generated.Image> i = images.iterator();
@@ -836,7 +836,7 @@ public class SearchEditImage_GUI extends JFrame {
 		try {
 			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"))));
@@ -865,7 +865,7 @@ public class SearchEditImage_GUI extends JFrame {
 			textAreadesc.setText(res.get("desc"));
 			res.clear();
 			
-			List<String> contacts = client.getAdditionalImageContacts(id);
+			List<String> contacts = client.getAdditionalImageContacts(id,SessionData.session.getAuthToken());
 			labelWeitereVerantwortliche.setText("");
 			for (int i = 0; i < contacts.size(); i++) 
 			{
@@ -885,7 +885,7 @@ public class SearchEditImage_GUI extends JFrame {
 		
 		try {
 			//get values from server and set them in model
-			map=client.getItemOwner(imageid);
+			map=client.getItemOwner(imageid,SessionData.session.getAuthToken());
 			
 			ItemOwner.itemOwner.setUserID(map.get("userID"));
 			ItemOwner.itemOwner.setUsername(map.get("loginName"));