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

7 files changed, 39 insertions, 39 deletions

diff --git a/dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java b/dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java
index d5d5c586..5bd5d84c 100644
--- a/dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java
@@ -277,7 +277,7 @@ public class CreateLectureLink_GUI extends JInternalFrame {
 
 		comboBox = new JComboBox<String>();
 		try {
-			List<String> list = ThriftManager.getSatClient().getAllOS(SessionData.session.getAuthToken());
+			List<String> list = ThriftManager.getSatClient().getAllOS(SessionData.authToken);
 			comboBox.addItem("");
 			for (int i = 0; i < list.size(); i++) {
 				comboBox.addItem(list.get(i));
@@ -433,7 +433,7 @@ public class CreateLectureLink_GUI extends JInternalFrame {
 										formatter.format(Lecture.lecture.getEnddate()).toString(),
 										Lecture.lecture.isActive(),
 										imageID,
-										SessionData.session.getAuthToken(),
+										SessionData.authToken,
 										person.verantwortlicher.getTel(),
 										person.verantwortlicher.getFakultaet(),
 										uuid,
@@ -445,7 +445,7 @@ public class CreateLectureLink_GUI extends JInternalFrame {
 								ThriftManager.getSatClient().writeLectureRights(
 										uuid,
 										person.verantwortlicher.getRole(),
-										SessionData.session.getAuthToken(),
+										SessionData.authToken,
 										person.verantwortlicher.getHochschule(),
 										person.verantwortlicher.getUserID()
 										);
@@ -459,7 +459,7 @@ public class CreateLectureLink_GUI extends JInternalFrame {
 											RightsManagement.rightsManagement.getPermittedUserList().get(i).isLecture_read(),
 											RightsManagement.rightsManagement.getPermittedUserList().get(i).isLecture_write(),
 											RightsManagement.rightsManagement.getPermittedUserList().get(i).isLecture_admin(),
-											SessionData.session.getAuthToken()
+											SessionData.authToken
 											);
 								
 								}//end for
@@ -641,7 +641,7 @@ public class CreateLectureLink_GUI extends JInternalFrame {
 		
 		try 
 		{
-			uuid = ThriftManager.getSatClient().createRandomUUID(SessionData.session.getAuthToken());
+			uuid = ThriftManager.getSatClient().createRandomUUID(SessionData.authToken);
 		} 
 		catch (TException e1) 
 		{
@@ -660,9 +660,9 @@ public class CreateLectureLink_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().getImageListPermissionLink(person.verantwortlicher.getUserID(),SessionData.session.getAuthToken());
+			images = ThriftManager.getSatClient().getImageListPermissionLink(person.verantwortlicher.getUserID(),SessionData.authToken);
 		}
 
 		Iterator<Image> i = images.iterator();
@@ -716,7 +716,7 @@ public class CreateLectureLink_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());
+		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"))));
diff --git a/dozentenmodul/src/main/java/gui/lecture/DeleteLecture_GUI.java b/dozentenmodul/src/main/java/gui/lecture/DeleteLecture_GUI.java
index 05beda93..fa5c84c5 100644
--- a/dozentenmodul/src/main/java/gui/lecture/DeleteLecture_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/DeleteLecture_GUI.java
@@ -372,7 +372,7 @@ public class DeleteLecture_GUI extends JInternalFrame {
 						try {
 							if (ThriftManager.getSatClient().deleteLecture(
 									lectureID,
-									SessionData.session.getAuthToken(),
+									SessionData.authToken,
 									person.verantwortlicher.getHochschule()
 									)
 									)
@@ -534,12 +534,12 @@ public class DeleteLecture_GUI extends JInternalFrame {
 			if(person.verantwortlicher.getRole()=="Admin")
 			{
 				//get complete list
-				lectures = ThriftManager.getSatClient().getLectureList(SessionData.session.getAuthToken());
+				lectures = ThriftManager.getSatClient().getLectureList(SessionData.authToken);
 			} 
 			else 
 			{
 				//get permitted list
-				lectures = ThriftManager.getSatClient().getLectureListPermissionAdmin(SessionData.session.getAuthToken());
+				lectures = ThriftManager.getSatClient().getLectureListPermissionAdmin(SessionData.authToken);
 			}
 			
 			Iterator<Lecture> i = lectures.iterator();
@@ -597,7 +597,7 @@ public class DeleteLecture_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().getLectureData(id,SessionData.session.getAuthToken());
+		Map<String, String> res = ThriftManager.getSatClient().getLectureData(id,SessionData.authToken);
 		labelName.setText(res.get("name"));
 		labelAktiv.setText(res.get("isActive"));
 		labeldesc.setText(res.get("desc"));
diff --git a/dozentenmodul/src/main/java/gui/lecture/EditLectureAllgemein_GUI.java b/dozentenmodul/src/main/java/gui/lecture/EditLectureAllgemein_GUI.java
index 24f9ce65..b36ff94f 100644
--- a/dozentenmodul/src/main/java/gui/lecture/EditLectureAllgemein_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/EditLectureAllgemein_GUI.java
@@ -480,7 +480,7 @@ public class EditLectureAllgemein_GUI extends JInternalFrame {
 							//check which GUI to open
 							try {
 
-								if((ThriftManager.getSatClient().userIsLectureAdmin(person.verantwortlicher.getUserID(), Lecture.lecture.getid(),SessionData.session.getAuthToken()) || (person.verantwortlicher.getRole().equals("Admin")))){
+								if((ThriftManager.getSatClient().userIsLectureAdmin(person.verantwortlicher.getUserID(), Lecture.lecture.getid(),SessionData.authToken) || (person.verantwortlicher.getRole().equals("Admin")))){
 									//user is admin of the lecture
 									GuiManager.show(new PermissionEditLecture_GUI());
 								} else {
diff --git a/dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java b/dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java
index 2a57dcfe..b4bf7bff 100644
--- a/dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java
@@ -388,7 +388,7 @@ public class EditLectureLink_GUI extends JInternalFrame {
 
 		comboBox = new JComboBox<String>();
 		try {
-			List<String> list = ThriftManager.getSatClient().getAllOS(SessionData.session.getAuthToken());
+			List<String> list = ThriftManager.getSatClient().getAllOS(SessionData.authToken);
 			comboBox.addItem("");
 			for (int i = 0; i < list.size(); i++) {
 				comboBox.addItem(list.get(i));
@@ -600,7 +600,7 @@ public class EditLectureLink_GUI extends JInternalFrame {
 						//check which GUI to open
 						try {
 
-							if(ThriftManager.getSatClient().userIsLectureAdmin(person.verantwortlicher.getUserID(), Lecture.lecture.getid(),SessionData.session.getAuthToken()) || (person.verantwortlicher.getRole().equals("Admin"))){
+							if(ThriftManager.getSatClient().userIsLectureAdmin(person.verantwortlicher.getUserID(), Lecture.lecture.getid(),SessionData.authToken) || (person.verantwortlicher.getRole().equals("Admin"))){
 
 								//user is admin of the lecture
 								GuiManager.show(new PermissionEditLecture_GUI());
@@ -655,7 +655,7 @@ public class EditLectureLink_GUI extends JInternalFrame {
 																.convertRowIndexToModel(tablemyImages
 																		.getSelectedRow()),
 														7).toString(),
-										SessionData.session.getAuthToken(),
+										SessionData.authToken,
 										person.verantwortlicher.getTel(),
 										person.verantwortlicher.getFakultaet(),
 										Lecture.lecture.getid(),
@@ -665,7 +665,7 @@ public class EditLectureLink_GUI extends JInternalFrame {
 								// first stage
 								ThriftManager.getSatClient().deleteAllAdditionalLecturePermissions(
 										Lecture.lecture.getid(),
-										SessionData.session.getAuthToken(),
+										SessionData.authToken,
 										person.verantwortlicher.getUserID());
 
 								// then, add user permissions as they have been
@@ -703,7 +703,7 @@ public class EditLectureLink_GUI extends JInternalFrame {
 											RightsManagement.rightsManagement
 													.getPermittedUserList()
 													.get(i).isLecture_admin(),// admin
-											SessionData.session.getAuthToken()
+											SessionData.authToken
 									);
 
 								}// end for
@@ -768,7 +768,7 @@ public class EditLectureLink_GUI extends JInternalFrame {
 																.convertRowIndexToModel(tablePublicVorlagen
 																		.getSelectedRow()),
 														7).toString(),
-										SessionData.session.getAuthToken(),
+										SessionData.authToken,
 										person.verantwortlicher.getTel(),
 										person.verantwortlicher.getFakultaet(),
 										Lecture.lecture.getid(),
@@ -778,7 +778,7 @@ public class EditLectureLink_GUI extends JInternalFrame {
 								// first stage
 								ThriftManager.getSatClient().deleteAllAdditionalLecturePermissions(
 										Lecture.lecture.getid(),
-										SessionData.session.getAuthToken(),
+										SessionData.authToken,
 										person.verantwortlicher.getUserID());
 
 								// then, add user permissions as they have been
@@ -810,7 +810,7 @@ public class EditLectureLink_GUI extends JInternalFrame {
 											RightsManagement.rightsManagement
 													.getPermittedUserList()
 													.get(i).isImageAdmin(),// admin
-											SessionData.session.getAuthToken()		
+											SessionData.authToken		
 									);
 								}
 
@@ -871,7 +871,7 @@ public class EditLectureLink_GUI extends JInternalFrame {
 														.convertRowIndexToModel(tableAllImages
 																.getSelectedRow()),
 												7).toString(),
-										SessionData.session.getAuthToken(),
+										SessionData.authToken,
 										person.verantwortlicher.getTel(),
 										person.verantwortlicher.getFakultaet(),
 										Lecture.lecture.getid(),
@@ -881,7 +881,7 @@ public class EditLectureLink_GUI extends JInternalFrame {
 								// first stage
 								ThriftManager.getSatClient().deleteAllAdditionalLecturePermissions(
 										Lecture.lecture.getid(),
-										SessionData.session.getAuthToken(),
+										SessionData.authToken,
 										person.verantwortlicher.getUserID());
 
 								// then, add user permissions as they have been
@@ -913,7 +913,7 @@ public class EditLectureLink_GUI extends JInternalFrame {
 											RightsManagement.rightsManagement
 													.getPermittedUserList()
 													.get(i).isImageAdmin(),// admin
-											SessionData.session.getAuthToken()
+											SessionData.authToken
 									);
 								}
 
@@ -1102,11 +1102,11 @@ public class EditLectureLink_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 {
 			//get permitted list
 			images = ThriftManager.getSatClient().getImageListPermissionLink(person.verantwortlicher
-				.getUserID(),SessionData.session.getAuthToken());
+				.getUserID(),SessionData.authToken);
 		}
 
 		Iterator<Image> i = images.iterator();
@@ -1145,11 +1145,11 @@ public class EditLectureLink_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 {
 			//get permitted list
 			images = ThriftManager.getSatClient().getImageListPermissionLink(person.verantwortlicher
-				.getUserID(),SessionData.session.getAuthToken());
+				.getUserID(),SessionData.authToken);
 		}
 
 		Iterator<Image> i = images.iterator();
@@ -1188,7 +1188,7 @@ public class EditLectureLink_GUI extends JInternalFrame {
 
 			// Hole eine Liste der Images
 			//images = ThriftManager.getSatClient().getImageListPermissionLink(person.verantwortlicher.getUserID());
-			images = ThriftManager.getSatClient().getImageListAllTemplates(SessionData.session.getAuthToken());
+			images = ThriftManager.getSatClient().getImageListAllTemplates(SessionData.authToken);
 
 			Iterator<Image> i = images.iterator();
 			SimpleDateFormat in = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -1242,7 +1242,7 @@ public class EditLectureLink_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"))));
diff --git a/dozentenmodul/src/main/java/gui/lecture/EditLectureSearch_GUI.java b/dozentenmodul/src/main/java/gui/lecture/EditLectureSearch_GUI.java
index a1e1cc87..e83c4bc3 100644
--- a/dozentenmodul/src/main/java/gui/lecture/EditLectureSearch_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/EditLectureSearch_GUI.java
@@ -561,10 +561,10 @@ public class EditLectureSearch_GUI extends JInternalFrame {
 			// Hole eine Liste der erlaubten Images für die diese Person
 			if(person.verantwortlicher.getRole()=="Admin"){
 				//get complete list
-				lectures = ThriftManager.getSatClient().getLectureList(SessionData.session.getAuthToken());
+				lectures = ThriftManager.getSatClient().getLectureList(SessionData.authToken);
 			} else {
 				//get permitted list
-				lectures = ThriftManager.getSatClient().getLectureListPermissionWrite(SessionData.session.getAuthToken());
+				lectures = ThriftManager.getSatClient().getLectureListPermissionWrite(SessionData.authToken);
 			}
 			
 			Iterator<org.openslx.sat.thrift.iface.Lecture> i = lectures.iterator();
@@ -623,7 +623,7 @@ public class EditLectureSearch_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().getLectureData(id,SessionData.session.getAuthToken());
+		Map<String, String> res = ThriftManager.getSatClient().getLectureData(id,SessionData.authToken);
 		labelName.setText(res.get("name"));
 		labelAktiv.setText(res.get("isActive"));
 		labeldesc.setText(res.get("desc"));
@@ -641,7 +641,7 @@ public class EditLectureSearch_GUI extends JInternalFrame {
 
 		try {
 			// get values from server and set them in model
-			map = ThriftManager.getSatClient().getItemOwner(lectureid,SessionData.session.getAuthToken());
+			map = ThriftManager.getSatClient().getItemOwner(lectureid,SessionData.authToken);
 
 			ItemOwner.itemOwner.setUserID(map.get("userID"));
 			ItemOwner.itemOwner.setUsername(map.get("loginName"));
diff --git a/dozentenmodul/src/main/java/gui/lecture/PermissionEditLecture_GUI.java b/dozentenmodul/src/main/java/gui/lecture/PermissionEditLecture_GUI.java
index dab6f2c9..f090eb46 100644
--- a/dozentenmodul/src/main/java/gui/lecture/PermissionEditLecture_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/PermissionEditLecture_GUI.java
@@ -205,7 +205,7 @@ public class PermissionEditLecture_GUI extends JInternalFrame {
 			try {
 
 				map = ThriftManager.getSatClient().getPermissionForUserAndLecture(
-						SessionData.session.getAuthToken(),Lecture.lecture.getid(),person.verantwortlicher.getUserID()
+						SessionData.authToken,Lecture.lecture.getid(),person.verantwortlicher.getUserID()
 						);
 				Iterator<Person> i = map.iterator();
 
diff --git a/dozentenmodul/src/main/java/gui/lecture/SearchLecture_GUI.java b/dozentenmodul/src/main/java/gui/lecture/SearchLecture_GUI.java
index 8ae9871e..07f8a6e7 100644
--- a/dozentenmodul/src/main/java/gui/lecture/SearchLecture_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/SearchLecture_GUI.java
@@ -536,10 +536,10 @@ public class SearchLecture_GUI extends JInternalFrame {
 			// Hole eine Liste der erlaubten Images für die diese Person

 			if(person.verantwortlicher.getRole()=="Admin"){

 				//get complete list

-				lectures = ThriftManager.getSatClient().getLectureList(SessionData.session.getAuthToken());

+				lectures = ThriftManager.getSatClient().getLectureList(SessionData.authToken);

 			} else {

 				//get permitted list			

-				lectures = ThriftManager.getSatClient().getLectureListPermissionRead(SessionData.session.getAuthToken());

+				lectures = ThriftManager.getSatClient().getLectureListPermissionRead(SessionData.authToken);

 			}

 			

 			Iterator<Lecture> i = lectures.iterator();

@@ -580,7 +580,7 @@ public class SearchLecture_GUI extends JInternalFrame {
 		try {

 			// Hole eine Liste der erlaubten Images für die diese Person

 			//lectures = ThriftManager.getSatClient().getLectureList();

-			lectures = ThriftManager.getSatClient().getLectureList(SessionData.session.getAuthToken());

+			lectures = ThriftManager.getSatClient().getLectureList(SessionData.authToken);

 			Iterator<Lecture> i = lectures.iterator();

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

 			SimpleDateFormat out=new SimpleDateFormat("dd.MM.yyyy HH:mm:ss");

@@ -633,7 +633,7 @@ public class SearchLecture_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().getLectureData(id,SessionData.session.getAuthToken());

+			Map<String,String> res=ThriftManager.getSatClient().getLectureData(id,SessionData.authToken);

 			labelName.setText(res.get("name"));

 			labelAktiv.setText(res.get("isActive"));

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