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

1 files changed, 8 insertions, 10 deletions

diff --git a/dozentenmodul/src/main/java/gui/image/DeleteImage_GUI.java b/dozentenmodul/src/main/java/gui/image/DeleteImage_GUI.java
index 1f2500db..b5938138 100644
--- a/dozentenmodul/src/main/java/gui/image/DeleteImage_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/DeleteImage_GUI.java
@@ -172,7 +172,7 @@ public class DeleteImage_GUI extends JInternalFrame {
 //			public void windowClosing(WindowEvent arg0) {
 //				// Beendet die Anwendung nach klick auf X
 //				try {
-//					ThriftManager.getSatClient().setSessionInvalid(SessionData.session.getAuthToken());
+//					ThriftManager.getSatClient().setSessionInvalid(SessionData.AuthToken);
 //				} catch (TException e) {
 //					// TODO Auto-generated catch block
 //					e.printStackTrace();
@@ -290,8 +290,7 @@ public class DeleteImage_GUI extends JInternalFrame {
 		try {
 			// Holt sich eine Liste aller verfügbaren 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++) {
@@ -404,18 +403,17 @@ public class DeleteImage_GUI extends JInternalFrame {
 						try {
 							if (!ThriftManager.getSatClient().connectedToLecture(imageid,
 									imageversion,
-									SessionData.session.getAuthToken())) {
+									SessionData.authToken)) {
 								try {
 
 									//  try to delete file from file system
 									if (ThriftManager.getSatClient().deleteImageServer(imageid,
 											imageversion,
-											SessionData.session.getAuthToken()) == true) {
+											SessionData.authToken) == true) {
 										// successful, now delete file from DB
 										if (ThriftManager.getSatClient().deleteImageData(imageid,
 												imageversion,
-												SessionData.session
-														.getAuthToken())) {
+												SessionData.authToken)) {
 
 											LOGGER.info("Image '" + imageid
 													+ "' erfolgreich gelöscht.");
@@ -701,12 +699,12 @@ public class DeleteImage_GUI extends JInternalFrame {
 			if (person.verantwortlicher.getRole() == "Admin") {
 				// get complete list
 				images = ThriftManager.getSatClient().getImageList(person.verantwortlicher
-						.getUserID(),SessionData.session.getAuthToken());
+						.getUserID(),SessionData.authToken);
 			} else {
 				// get permitted list
 				images = ThriftManager.getSatClient().getImageListPermissionAdmin(
 						person.verantwortlicher.getUserID(),
-						SessionData.session.getAuthToken());
+						SessionData.authToken);
 			}
 
 			Iterator<Image> i = images.iterator();
@@ -777,7 +775,7 @@ public class DeleteImage_GUI extends JInternalFrame {
 			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());
+					SessionData.authToken);
 			labelName.setText(res.get("name"));
 			labelOS.setText(res.get("os"));
 			labelUpdate.setText(out.format(in.parse(res.get("lastupdate"))));