[client] Make SessionData a static class instead of a class that doesn't know if it's a singleton or not

1 files changed, 6 insertions, 6 deletions

diff --git a/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java b/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java
index 77e9bb28..2c037885 100644
--- a/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java
@@ -289,7 +289,7 @@ public class SearchEditImage_GUI extends JInternalFrame {
 		try {
 			// Holt sich eine Liste aller verfuegbaren Betriebssysteme vom
 			// Server
-			List<String> list = ThriftManager.getSatClient().getAllOS(SessionData.session.getAuthToken());
+			List<String> list = ThriftManager.getSatClient().getAllOS(SessionData.authToken);
 			// Leeres Item hinzufuegen
 			comboBox.addItem("");
 			for (int i = 0; i < list.size(); i++) {
@@ -649,10 +649,10 @@ public class SearchEditImage_GUI extends JInternalFrame {
 			// Hole eine Liste der passenden Images,
 			if(person.verantwortlicher.getRole()=="Admin"){
 				//get complete list
-				images = ThriftManager.getSatClient().getImageList(person.verantwortlicher.getUserID(),SessionData.session.getAuthToken()); 
+				images = ThriftManager.getSatClient().getImageList(person.verantwortlicher.getUserID(),SessionData.authToken); 
 			} else {
 				//only get permitted list
-				images = ThriftManager.getSatClient().getImageListPermissionWrite(person.verantwortlicher.getUserID(),SessionData.session.getAuthToken());
+				images = ThriftManager.getSatClient().getImageListPermissionWrite(person.verantwortlicher.getUserID(),SessionData.authToken);
 			}
 
 			Iterator<org.openslx.sat.thrift.iface.Image> i = images.iterator();
@@ -720,7 +720,7 @@ public class SearchEditImage_GUI extends JInternalFrame {
 		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 = ThriftManager.getSatClient().getImageData(id, version,SessionData.session.getAuthToken());
+			Map<String, String> res = ThriftManager.getSatClient().getImageData(id, version,SessionData.authToken);
 			labelName.setText(res.get("name"));
 			labelOS.setText(res.get("os"));
 			labelUpdate.setText(out.format(in.parse(res.get("lastupdate"))));
@@ -749,7 +749,7 @@ public class SearchEditImage_GUI extends JInternalFrame {
 			textAreadesc.setText(res.get("desc"));
 			res.clear();
 			
-			List<String> contacts = ThriftManager.getSatClient().getAdditionalImageContacts(id,SessionData.session.getAuthToken());
+			List<String> contacts = ThriftManager.getSatClient().getAdditionalImageContacts(id,SessionData.authToken);
 			labelWeitereVerantwortliche.setText("");
 			for (int i = 0; i < contacts.size(); i++) 
 			{
@@ -769,7 +769,7 @@ public class SearchEditImage_GUI extends JInternalFrame {
 		
 		try {
 			//get values from server and set them in model
-			map=ThriftManager.getSatClient().getItemOwner(imageid,SessionData.session.getAuthToken());
+			map=ThriftManager.getSatClient().getItemOwner(imageid,SessionData.authToken);
 			
 			ItemOwner.itemOwner.setUserID(map.get("userID"));
 			ItemOwner.itemOwner.setUsername(map.get("loginName"));