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

1 files changed, 7 insertions, 7 deletions

diff --git a/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java b/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java
index 5e5aa6f8..d3b6fcc9 100644
--- a/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java
@@ -398,7 +398,7 @@ public class SearchImage_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++) {

@@ -888,9 +888,9 @@ public class SearchImage_GUI extends JInternalFrame {
 			// Hole eine Liste der 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 {

-				images = ThriftManager.getSatClient().getImageListPermissionRead(person.verantwortlicher.getUserID(),SessionData.session.getAuthToken());

+				images = ThriftManager.getSatClient().getImageListPermissionRead(person.verantwortlicher.getUserID(),SessionData.authToken);

 			}

 

 			Iterator<org.openslx.sat.thrift.iface.Image> i = images.iterator();

@@ -938,7 +938,7 @@ public class SearchImage_GUI extends JInternalFrame {
 		List<org.openslx.sat.thrift.iface.Image> images;

 		try {

 			// Hole eine Liste der Images

-			images = ThriftManager.getSatClient().getImageList(person.verantwortlicher.getUserID(),SessionData.session.getAuthToken());

+			images = ThriftManager.getSatClient().getImageList(person.verantwortlicher.getUserID(),SessionData.authToken);

 

 			Iterator<org.openslx.sat.thrift.iface.Image> i = images.iterator();

 			SimpleDateFormat in = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");

@@ -988,7 +988,7 @@ public class SearchImage_GUI extends JInternalFrame {
 			List<org.openslx.sat.thrift.iface.Image> images;

 			try {

 				// Hole eine Liste der Images

-				images = ThriftManager.getSatClient().getImageListAllTemplates(SessionData.session.getAuthToken());

+				images = ThriftManager.getSatClient().getImageListAllTemplates(SessionData.authToken);

 

 				Iterator<org.openslx.sat.thrift.iface.Image> i = images.iterator();

 				SimpleDateFormat in = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");

@@ -1056,7 +1056,7 @@ public class SearchImage_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"))));

@@ -1083,7 +1083,7 @@ public class SearchImage_GUI extends JInternalFrame {
 			labelVersion.setText(res.get("version"));

 			textAreadesc.setText(res.get("desc"));

 			

-			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++) 

 			{