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

12 files changed, 88 insertions, 96 deletions

diff --git a/dozentenmodul/src/main/java/gui/image/CreateImageTechnisch_GUI.java b/dozentenmodul/src/main/java/gui/image/CreateImageTechnisch_GUI.java
index 94085ac1..71728840 100644
--- a/dozentenmodul/src/main/java/gui/image/CreateImageTechnisch_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/CreateImageTechnisch_GUI.java
@@ -72,7 +72,7 @@ public class CreateImageTechnisch_GUI extends JInternalFrame {
 //			@Override
 //			public void windowClosing(WindowEvent arg0) {
 //				try {
-//					ThriftManager.getSatClient().setSessionInvalid(SessionData.session.getAuthToken());
+//					ThriftManager.getSatClient().setSessionInvalid(SessionData.AuthToken);
 //				} catch (TException e1) {
 //					// TODO Auto-generated catch block
 //					e1.printStackTrace();
@@ -189,7 +189,7 @@ public class CreateImageTechnisch_GUI extends JInternalFrame {
 		});
 		List<String> os = null;
 		try {
-			os = ThriftManager.getSatClient().getAllOS(SessionData.session.getAuthToken());
+			os = ThriftManager.getSatClient().getAllOS(SessionData.authToken);
 			for(int i=0; i<os.size();i++){
 				comboBox.addItem(os.get(i).toString());
 			}
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"))));
diff --git a/dozentenmodul/src/main/java/gui/image/EditImageAllgemein_GUI.java b/dozentenmodul/src/main/java/gui/image/EditImageAllgemein_GUI.java
index d10bbc59..9ea3dee9 100644
--- a/dozentenmodul/src/main/java/gui/image/EditImageAllgemein_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/EditImageAllgemein_GUI.java
@@ -339,7 +339,7 @@ public class EditImageAllgemein_GUI extends JInternalFrame {
 		try {
 
 			Map<String, String> map = ThriftManager.getSatClient().getImageData(
-					Image.image.getImageId(), Image.image.getVersion(),SessionData.session.getAuthToken());
+					Image.image.getImageId(), Image.image.getVersion(),SessionData.authToken);
 			
 			if (map.get("internet").equals("0")) {
 				Image.image.setInternet(false);
diff --git a/dozentenmodul/src/main/java/gui/image/EditImageTechnisch_GUI.java b/dozentenmodul/src/main/java/gui/image/EditImageTechnisch_GUI.java
index 4ede0149..f8fa5298 100644
--- a/dozentenmodul/src/main/java/gui/image/EditImageTechnisch_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/EditImageTechnisch_GUI.java
@@ -172,7 +172,7 @@ public class EditImageTechnisch_GUI extends JInternalFrame {
 		
 		List<String> os = null;
 		try {
-			os=ThriftManager.getSatClient().getAllOS(SessionData.session.getAuthToken());
+			os=ThriftManager.getSatClient().getAllOS(SessionData.authToken);
 			for(int i=0;i<os.size();i++) {
 				comboBox.addItem(os.get(i).toString());
 			}
@@ -190,7 +190,7 @@ public class EditImageTechnisch_GUI extends JInternalFrame {
 		panel_1.add(comboBox);
 		
 		try {
-			comboBox.setSelectedItem(ThriftManager.getSatClient().getOsNameForGuestOs(Image.image.getOS(),SessionData.session.getAuthToken()));
+			comboBox.setSelectedItem(ThriftManager.getSatClient().getOsNameForGuestOs(Image.image.getOS(),SessionData.authToken));
 		} catch (TException e1) 
 		{
 			// TODO Auto-generated catch block
@@ -349,7 +349,7 @@ public class EditImageTechnisch_GUI extends JInternalFrame {
 						
 						try {
 							//check if user may change permissions and choose window
-							if(ThriftManager.getSatClient().userIsImageAdmin(Image.image.getImageId(),SessionData.session.getAuthToken(), person.verantwortlicher.getUserID()) == true || (person.verantwortlicher.getRole().equals("Admin"))) {
+							if(ThriftManager.getSatClient().userIsImageAdmin(Image.image.getImageId(),SessionData.authToken, person.verantwortlicher.getUserID()) == true || (person.verantwortlicher.getRole().equals("Admin"))) {
 								//user has permission, go to permission GUI
 								GuiManager.show(new PermissionEditImage_GUI());
 							} else {
diff --git a/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java b/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java
index d1849733..38eb2654 100644
--- a/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java
@@ -22,9 +22,6 @@ import javax.swing.JFileChooser;
 import javax.swing.JFrame;
 import javax.swing.JInternalFrame;
 import javax.swing.JLabel;
-import javax.swing.JMenu;
-import javax.swing.JMenuBar;
-import javax.swing.JMenuItem;
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 import javax.swing.JProgressBar;
@@ -49,10 +46,8 @@ import org.openslx.sat.thrift.iface.User;
 import org.openslx.thrifthelper.ThriftManager;
 
 import util.GuiManager;
-import util.OpenLinks;
 import config.Config;
 import ftp.UploadTask;
-import gui.intro.About_GUI;
 import gui.intro.MainMenue_GUI;
 import gui.lecture.CreateLectureAllgemein_GUI;
 
@@ -72,7 +67,7 @@ public class FTPCreateUploader_GUI extends JInternalFrame implements
 
 	JLabel lblPath;
 	JProgressBar progressBar;
-	String host = SessionData.session.getServerAdress();
+	String host = SessionData.serverAdress;
 	int port = 21;
 	User user;
 	String filename = "";
@@ -116,7 +111,7 @@ public class FTPCreateUploader_GUI extends JInternalFrame implements
 
 		try {
 
-			uuid = ThriftManager.getSatClient().createRandomUUID(SessionData.session.getAuthToken());
+			uuid = ThriftManager.getSatClient().createRandomUUID(SessionData.authToken);
 
 		} catch (TException e1) {
 
@@ -139,15 +134,14 @@ public class FTPCreateUploader_GUI extends JInternalFrame implements
 					if (choice == 0) {
 						try {
 							ThriftManager.getSatClient().DeleteFtpUser(user.userName,
-									SessionData.session.getAuthToken());
+									SessionData.authToken);
 						} catch (TException e1) {
 
 							e1.printStackTrace();
 						}
 						task.cancel(true);
 						try {
-							ThriftManager.getSatClient().setSessionInvalid(SessionData.session
-									.getAuthToken());
+							ThriftManager.getSatClient().setSessionInvalid(SessionData.authToken);
 						} catch (TException e) {
 							// TODO Auto-generated catch block
 							e.printStackTrace();
@@ -157,7 +151,7 @@ public class FTPCreateUploader_GUI extends JInternalFrame implements
 				}
 			}
 		});
-		
+
 //		addWindowListener(new WindowAdapter() {
 //
 //			@Override
@@ -177,14 +171,14 @@ public class FTPCreateUploader_GUI extends JInternalFrame implements
 //					if (choice == 0) {
 //						try {
 //							ThriftManager.getSatClient().DeleteFtpUser(user.userName,
-//									SessionData.session.getAuthToken());
+//									SessionData.AuthToken);
 //						} catch (TException e1) {
 //
 //							e1.printStackTrace();
 //						}
 //						task.cancel(true);
 //						try {
-//							ThriftManager.getSatClient().setSessionInvalid(SessionData.session
+//							ThriftManager.getSatClient().setSessionInvalid(SessionData
 //									.getAuthToken());
 //						} catch (TException e) {
 //							// TODO Auto-generated catch block
@@ -196,7 +190,7 @@ public class FTPCreateUploader_GUI extends JInternalFrame implements
 //					// no upload running, close window
 //
 //					try {
-//						ThriftManager.getSatClient().setSessionInvalid(SessionData.session
+//						ThriftManager.getSatClient().setSessionInvalid(SessionData
 //								.getAuthToken());
 //					} catch (TException e) {
 //						// TODO Auto-generated catch block
@@ -428,7 +422,7 @@ public class FTPCreateUploader_GUI extends JInternalFrame implements
 				isAborted = true; // set flag
 				try {
 					ThriftManager.getSatClient().DeleteFtpUser(user.userName,
-							SessionData.session.getAuthToken());
+							SessionData.authToken);
 					LOGGER.info("Deleted FTP user.");
 				} catch (TException e1) {
 
@@ -494,7 +488,7 @@ public class FTPCreateUploader_GUI extends JInternalFrame implements
 						if (taskrun == true) {
 							try {
 								ThriftManager.getSatClient().DeleteFtpUser(user.userName,
-										SessionData.session.getAuthToken());
+										SessionData.authToken);
 
 							} catch (TException e1) {
 
@@ -546,7 +540,7 @@ public class FTPCreateUploader_GUI extends JInternalFrame implements
 							if (choice == 0) {
 								try {
 									ThriftManager.getSatClient().DeleteFtpUser(user.userName,
-											SessionData.session.getAuthToken());
+											SessionData.authToken);
 								} catch (TException e1) {
 
 									e1.printStackTrace();
@@ -593,7 +587,7 @@ public class FTPCreateUploader_GUI extends JInternalFrame implements
 
 		try {
 			LOGGER.info("Getting FTP User...");
-			user = ThriftManager.getSatClient().getFtpUser(SessionData.session.getAuthToken());
+			user = ThriftManager.getSatClient().getFtpUser(SessionData.authToken);
 			LOGGER.info("Received FTP user.");
 			// LOGGER.debug("FTP name: " + user.userName);
 			// LOGGER.debug("FTP path: " + user.path);
@@ -696,15 +690,15 @@ public class FTPCreateUploader_GUI extends JInternalFrame implements
 							+ Image.image.getNewName(),
 					Image.image.isVorlage(), Image.image.getFilesize(),
 					Image.image.getShareMode(), Image.image.getOS(), uuid,
-					SessionData.session.getAuthToken(),
+					SessionData.authToken,
 					person.verantwortlicher.getUserID());
 
 			// System.out.println("userID is: "+person.verantwortlicher.getUserID());
 			System.out.println("starting file copy...");
 			ThriftManager.getSatClient().startFileCopy(Image.image.getNewName(),
-					SessionData.session.getAuthToken());
+					SessionData.authToken);
 
-			ThriftManager.getSatClient().writeImageRights(uuid, SessionData.session.getAuthToken(),
+			ThriftManager.getSatClient().writeImageRights(uuid, SessionData.authToken,
 					person.verantwortlicher.getRole(),
 					person.verantwortlicher.getHochschule(),
 					person.verantwortlicher.getUserID());
@@ -724,7 +718,7 @@ public class FTPCreateUploader_GUI extends JInternalFrame implements
 								.isImageLinkAllowed(),
 						RightsManagement.rightsManagement
 								.getPermittedUserList().get(i).isImageAdmin(),
-						SessionData.session.getAuthToken());
+						SessionData.authToken);
 
 			}// end for
 
diff --git a/dozentenmodul/src/main/java/gui/image/FTPEditDownloader_GUI.java b/dozentenmodul/src/main/java/gui/image/FTPEditDownloader_GUI.java
index ef008657..608815d6 100644
--- a/dozentenmodul/src/main/java/gui/image/FTPEditDownloader_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/FTPEditDownloader_GUI.java
@@ -65,7 +65,7 @@ public class FTPEditDownloader_GUI extends JInternalFrame implements
 	JLabel lblDownSpeed;
 	User user;
 	JProgressBar progressBar;
-	String host = SessionData.session.getServerAdress();
+	String host = SessionData.serverAdress;
 	int port = 21;
 	String downloadFile = "";
 	static String arg = "";
@@ -116,9 +116,9 @@ public class FTPEditDownloader_GUI extends JInternalFrame implements
 					// 0=beenden, 1=abbrechen
 					if (choice == 0) {
 						try {
-							ThriftManager.getSatClient().DeleteFtpUser(user.userName,SessionData.session.getAuthToken());
+							ThriftManager.getSatClient().DeleteFtpUser(user.userName,SessionData.authToken);
 							try {
-								ThriftManager.getSatClient().setSessionInvalid(SessionData.session.getAuthToken());
+								ThriftManager.getSatClient().setSessionInvalid(SessionData.authToken);
 							} catch (TException e1) {
 								// TODO Auto-generated catch block
 								e1.printStackTrace();
@@ -149,9 +149,9 @@ public class FTPEditDownloader_GUI extends JInternalFrame implements
 //					// 0=beenden, 1=abbrechen
 //					if (choice == 0) {
 //						try {
-//							ThriftManager.getSatClient().DeleteFtpUser(user.userName,SessionData.session.getAuthToken());
+//							ThriftManager.getSatClient().DeleteFtpUser(user.userName,SessionData.AuthToken);
 //							try {
-//								ThriftManager.getSatClient().setSessionInvalid(SessionData.session.getAuthToken());
+//								ThriftManager.getSatClient().setSessionInvalid(SessionData.AuthToken);
 //							} catch (TException e1) {
 //								// TODO Auto-generated catch block
 //								e1.printStackTrace();
@@ -166,7 +166,7 @@ public class FTPEditDownloader_GUI extends JInternalFrame implements
 //				} else {
 //					// no download running, close window
 //					try {
-//						ThriftManager.getSatClient().setSessionInvalid(SessionData.session.getAuthToken());
+//						ThriftManager.getSatClient().setSessionInvalid(SessionData.AuthToken);
 //					} catch (TException e1) {
 //						// TODO Auto-generated catch block
 //						e1.printStackTrace();
@@ -396,7 +396,7 @@ public class FTPEditDownloader_GUI extends JInternalFrame implements
 
 				isAborted = true; // set flag
 				try {
-					ThriftManager.getSatClient().DeleteFtpUser(user.userName,SessionData.session.getAuthToken());
+					ThriftManager.getSatClient().DeleteFtpUser(user.userName,SessionData.authToken);
 					LOGGER.info("FTP user deleted.");
 				} catch (TException e1) {
 					
@@ -435,7 +435,7 @@ public class FTPEditDownloader_GUI extends JInternalFrame implements
 							if (choice == 0) {
 								task.cancel(true);
 								try {
-									ThriftManager.getSatClient().DeleteFtpUser(user.userName,SessionData.session.getAuthToken());
+									ThriftManager.getSatClient().DeleteFtpUser(user.userName,SessionData.authToken);
 								} catch (TException e1) {
 									
 									e1.printStackTrace();
@@ -480,12 +480,12 @@ public class FTPEditDownloader_GUI extends JInternalFrame implements
 												// Klick
 		btnDownloadStarten.setText("Bitte warten");
 		try {
-			user = ThriftManager.getSatClient().getFtpUser(SessionData.session.getAuthToken());
+			user = ThriftManager.getSatClient().getFtpUser(SessionData.authToken);
 
 			downloadFile = user.path
 					+ "/"
 					+ ThriftManager.getSatClient().getPathOfImage(Image.image.getImageId(),
-							Image.image.getVersion(),SessionData.session.getAuthToken());
+							Image.image.getVersion(),SessionData.authToken);
 
 		} catch (TException e) {
 			
diff --git a/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java b/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java
index b28ac83c..19c9ba00 100644
--- a/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java
@@ -70,7 +70,7 @@ public class FTPEditUploader_GUI extends JInternalFrame implements
 	private final JPanel contentPanel = new JPanel();
 	JLabel lblPath;
 	JProgressBar progressBar;
-	String host = SessionData.session.getServerAdress();
+	String host = SessionData.serverAdress;
 	int port = 21;
 	User user;
 	String filename = "";
@@ -129,19 +129,19 @@ public class FTPEditUploader_GUI extends JInternalFrame implements
 					// 0=beenden, 1=abbrechen
 					if (choice == 0) {
 						try {
-							ThriftManager.getSatClient().DeleteFtpUser(user.userName,SessionData.session.getAuthToken());
+							ThriftManager.getSatClient().DeleteFtpUser(user.userName,SessionData.authToken);
 						} catch (TException e1) {
 							e1.printStackTrace();
 						}
 						task.cancel(true);
 						try {
-							ThriftManager.getSatClient().setSessionInvalid(SessionData.session.getAuthToken());
+							ThriftManager.getSatClient().setSessionInvalid(SessionData.authToken);
 						} catch (TException e) {
 							// TODO Auto-generated catch block
 							e.printStackTrace();
 						}
 						try {
-							ThriftManager.getSatClient().setSessionInvalid(SessionData.session.getAuthToken());
+							ThriftManager.getSatClient().setSessionInvalid(SessionData.authToken);
 						} catch (TException e) {
 							// TODO Auto-generated catch block
 							e.printStackTrace();
@@ -168,19 +168,19 @@ public class FTPEditUploader_GUI extends JInternalFrame implements
 //					// 0=beenden, 1=abbrechen
 //					if (choice == 0) {
 //						try {
-//							ThriftManager.getSatClient().DeleteFtpUser(user.userName,SessionData.session.getAuthToken());
+//							ThriftManager.getSatClient().DeleteFtpUser(user.userName,SessionData.AuthToken);
 //						} catch (TException e1) {
 //							e1.printStackTrace();
 //						}
 //						task.cancel(true);
 //						try {
-//							ThriftManager.getSatClient().setSessionInvalid(SessionData.session.getAuthToken());
+//							ThriftManager.getSatClient().setSessionInvalid(SessionData.AuthToken);
 //						} catch (TException e) {
 //							// TODO Auto-generated catch block
 //							e.printStackTrace();
 //						}
 //						try {
-//							ThriftManager.getSatClient().setSessionInvalid(SessionData.session.getAuthToken());
+//							ThriftManager.getSatClient().setSessionInvalid(SessionData.AuthToken);
 //						} catch (TException e) {
 //							// TODO Auto-generated catch block
 //							e.printStackTrace();
@@ -190,7 +190,7 @@ public class FTPEditUploader_GUI extends JInternalFrame implements
 //				} else {
 //					// no upload running, close window
 //					try {
-//						ThriftManager.getSatClient().setSessionInvalid(SessionData.session.getAuthToken());
+//						ThriftManager.getSatClient().setSessionInvalid(SessionData.AuthToken);
 //					} catch (TException e) {
 //						// TODO Auto-generated catch block
 //						e.printStackTrace();
@@ -403,7 +403,7 @@ public class FTPEditUploader_GUI extends JInternalFrame implements
 
 				isAborted = true; // set flag
 				try {
-					ThriftManager.getSatClient().DeleteFtpUser(user.userName,SessionData.session.getAuthToken());
+					ThriftManager.getSatClient().DeleteFtpUser(user.userName,SessionData.authToken);
 					LOGGER.info("FTP user deleted.");
 				} catch (TException e1) {
 					e1.printStackTrace();
@@ -475,7 +475,7 @@ public class FTPEditUploader_GUI extends JInternalFrame implements
 
 						if (taskrun == true) {
 							try {
-								ThriftManager.getSatClient().DeleteFtpUser(user.userName,SessionData.session.getAuthToken());
+								ThriftManager.getSatClient().DeleteFtpUser(user.userName,SessionData.authToken);
 
 							} catch (TException e1) {
 								e1.printStackTrace();
@@ -505,7 +505,7 @@ public class FTPEditUploader_GUI extends JInternalFrame implements
 							// 0=beenden, 1=abbrechen
 							if (choice == 0) {
 								try {
-									ThriftManager.getSatClient().DeleteFtpUser(user.userName,SessionData.session.getAuthToken());
+									ThriftManager.getSatClient().DeleteFtpUser(user.userName,SessionData.authToken);
 								} catch (TException e1) {
 									e1.printStackTrace();
 								}
@@ -514,7 +514,7 @@ public class FTPEditUploader_GUI extends JInternalFrame implements
 								
 								try {
 
-									if(ThriftManager.getSatClient().userIsImageAdmin(Image.image.getImageId(), SessionData.session.getAuthToken(),person.verantwortlicher.getUserID()) == true || person.verantwortlicher.getRole().equals("Admin")){
+									if(ThriftManager.getSatClient().userIsImageAdmin(Image.image.getImageId(), SessionData.authToken,person.verantwortlicher.getUserID()) == true || person.verantwortlicher.getRole().equals("Admin")){
 
 										//user is admin and may change permissions
 										GuiManager.show(new PermissionEditImage_GUI());
@@ -541,7 +541,7 @@ public class FTPEditUploader_GUI extends JInternalFrame implements
 								try {
 									System.out.println("userID in editimageuploader is : "+person.verantwortlicher.getUserID());
 									
-									if(ThriftManager.getSatClient().userIsImageAdmin(Image.image.getImageId(), SessionData.session.getAuthToken(),person.verantwortlicher.getUserID()) == true)
+									if(ThriftManager.getSatClient().userIsImageAdmin(Image.image.getImageId(), SessionData.authToken,person.verantwortlicher.getUserID()) == true)
 									{
 										//user is admin and may change permissions
 										GuiManager.show(new PermissionEditImage_GUI());
@@ -580,7 +580,7 @@ public class FTPEditUploader_GUI extends JInternalFrame implements
 
 		try {
 			//LOGGER.info("Getting FTP-User...");
-			user = ThriftManager.getSatClient().getFtpUser(SessionData.session.getAuthToken());
+			user = ThriftManager.getSatClient().getFtpUser(SessionData.authToken);
 			LOGGER.info("Received FTP user.");
 			//LOGGER.debug("FTP name: " + user.userName);
 			//LOGGER.debug("FTP path: " + user.path);
@@ -699,10 +699,10 @@ public class FTPEditUploader_GUI extends JInternalFrame implements
 						Image.image.getFilesize(),
 						Image.image.getShareMode(),
 						Image.image.getOS(),
-						SessionData.session.getAuthToken()
+						SessionData.authToken
 						);
 				if (fileupload == true) {
-					ThriftManager.getSatClient().startFileCopy(Image.image.getNewName(),SessionData.session.getAuthToken());
+					ThriftManager.getSatClient().startFileCopy(Image.image.getNewName(),SessionData.authToken);
 				}
 
 			} else { //no new file uploaded and old file name stays
@@ -725,11 +725,11 @@ public class FTPEditUploader_GUI extends JInternalFrame implements
 						Image.image.getFilesize(),
 						Image.image.getShareMode(), 
 						Image.image.getOS(),
-						SessionData.session.getAuthToken()
+						SessionData.authToken
 						);
 
 				if (fileupload == true) {
-					ThriftManager.getSatClient().startFileCopy(Image.image.getNewName(),SessionData.session.getAuthToken());
+					ThriftManager.getSatClient().startFileCopy(Image.image.getNewName(),SessionData.authToken);
 					// client.startFileCopy(Image.image.getImagename());
 				}
 			}
@@ -737,7 +737,7 @@ public class FTPEditUploader_GUI extends JInternalFrame implements
 
 			// remove all additional user permissions on first stage
 
-			ThriftManager.getSatClient().deleteAllAdditionalImagePermissions(Image.image.getImageId(),SessionData.session.getAuthToken(),person.verantwortlicher.getUserID());
+			ThriftManager.getSatClient().deleteAllAdditionalImagePermissions(Image.image.getImageId(),SessionData.authToken,person.verantwortlicher.getUserID());
 
 			// then, add user permissions as they have been set new
 			for (int i = 0; i < RightsManagement.rightsManagement.getPermittedUserList().size(); i++) 
@@ -757,7 +757,7 @@ public class FTPEditUploader_GUI extends JInternalFrame implements
 						RightsManagement.rightsManagement.getPermittedUserList().get(i).isImageWrite(),
 						RightsManagement.rightsManagement.getPermittedUserList().get(i).isImageLinkAllowed(),
 						RightsManagement.rightsManagement.getPermittedUserList().get(i).isImageAdmin(),
-						SessionData.session.getAuthToken()
+						SessionData.authToken
 						);
 
 			}// end for
diff --git a/dozentenmodul/src/main/java/gui/image/FTPSearchDownloader_GUI.java b/dozentenmodul/src/main/java/gui/image/FTPSearchDownloader_GUI.java
index f2cbdef8..daec08e6 100644
--- a/dozentenmodul/src/main/java/gui/image/FTPSearchDownloader_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/FTPSearchDownloader_GUI.java
@@ -64,7 +64,7 @@ public class FTPSearchDownloader_GUI extends JInternalFrame implements
 	JLabel lblDownSpeed;
 	User user;
 	JProgressBar progressBar;
-	String host = SessionData.session.getServerAdress();
+	String host = SessionData.serverAdress;
 	int port = 21;
 	String downloadFile = "";
 	static String arg = "";
@@ -117,15 +117,15 @@ public class FTPSearchDownloader_GUI extends JInternalFrame implements
 					if (choice == 0) {
 
 						try {
-							ThriftManager.getSatClient().DeleteFtpUser(user.userName,SessionData.session.getAuthToken());
+							ThriftManager.getSatClient().DeleteFtpUser(user.userName,SessionData.authToken);
 							try {
-								ThriftManager.getSatClient().setSessionInvalid(SessionData.session.getAuthToken());
+								ThriftManager.getSatClient().setSessionInvalid(SessionData.authToken);
 							} catch (TException e1) {
 								// TODO Auto-generated catch block
 								e1.printStackTrace();
 							}
 							try {
-								ThriftManager.getSatClient().setSessionInvalid(SessionData.session.getAuthToken());
+								ThriftManager.getSatClient().setSessionInvalid(SessionData.authToken);
 							} catch (TException e1) {
 								// TODO Auto-generated catch block
 								e1.printStackTrace();
@@ -158,15 +158,15 @@ public class FTPSearchDownloader_GUI extends JInternalFrame implements
 //					if (choice == 0) {
 //
 //						try {
-//							ThriftManager.getSatClient().DeleteFtpUser(user.userName,SessionData.session.getAuthToken());
+//							ThriftManager.getSatClient().DeleteFtpUser(user.userName,SessionData.AuthToken);
 //							try {
-//								ThriftManager.getSatClient().setSessionInvalid(SessionData.session.getAuthToken());
+//								ThriftManager.getSatClient().setSessionInvalid(SessionData.AuthToken);
 //							} catch (TException e1) {
 //								// TODO Auto-generated catch block
 //								e1.printStackTrace();
 //							}
 //							try {
-//								ThriftManager.getSatClient().setSessionInvalid(SessionData.session.getAuthToken());
+//								ThriftManager.getSatClient().setSessionInvalid(SessionData.AuthToken);
 //							} catch (TException e1) {
 //								// TODO Auto-generated catch block
 //								e1.printStackTrace();
@@ -182,7 +182,7 @@ public class FTPSearchDownloader_GUI extends JInternalFrame implements
 //				} else {
 //					// no download running, close window
 //					try {
-//						ThriftManager.getSatClient().setSessionInvalid(SessionData.session.getAuthToken());
+//						ThriftManager.getSatClient().setSessionInvalid(SessionData.AuthToken);
 //					} catch (TException e1) {
 //						// TODO Auto-generated catch block
 //						e1.printStackTrace();
@@ -401,7 +401,7 @@ public class FTPSearchDownloader_GUI extends JInternalFrame implements
 
 				isAborted = true; // set flag
 				try {
-					ThriftManager.getSatClient().DeleteFtpUser(user.userName,SessionData.session.getAuthToken());
+					ThriftManager.getSatClient().DeleteFtpUser(user.userName,SessionData.authToken);
 					LOGGER.info("Deleted FTP user.");
 				} catch (TException e1) {
 					// TODO Auto-generated catch block
@@ -441,7 +441,7 @@ public class FTPSearchDownloader_GUI extends JInternalFrame implements
 							if (choice == 0) {
 								task.cancel(true);
 								try {
-									ThriftManager.getSatClient().DeleteFtpUser(user.userName,SessionData.session.getAuthToken());
+									ThriftManager.getSatClient().DeleteFtpUser(user.userName,SessionData.authToken);
 								} catch (TException e1) {
 									// TODO Auto-generated catch block
 									e1.printStackTrace();
@@ -485,12 +485,12 @@ public class FTPSearchDownloader_GUI extends JInternalFrame implements
 												// Klick
 		btnDownloadStarten.setText("Bitte warten");
 		try {
-			user = ThriftManager.getSatClient().getFtpUser(SessionData.session.getAuthToken());
+			user = ThriftManager.getSatClient().getFtpUser(SessionData.authToken);
 
 			downloadFile = user.path
 					+ "/"
 					+ ThriftManager.getSatClient().getPathOfImage(Image.image.getImageId(),
-							Image.image.getVersion(),SessionData.session.getAuthToken());
+							Image.image.getVersion(),SessionData.authToken);
 
 		} catch (TException e) {
 			// TODO Auto-generated catch block
diff --git a/dozentenmodul/src/main/java/gui/image/PermissionCreateImage_GUI.java b/dozentenmodul/src/main/java/gui/image/PermissionCreateImage_GUI.java
index 84891f6c..a008b6a5 100644
--- a/dozentenmodul/src/main/java/gui/image/PermissionCreateImage_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/PermissionCreateImage_GUI.java
@@ -109,7 +109,7 @@ public class PermissionCreateImage_GUI extends JInternalFrame {
 //			@Override
 //			public void windowClosing(WindowEvent arg0) {
 //				try {
-//					client.setSessionInvalid(SessionData.session.getAuthToken());
+//					client.setSessionInvalid(SessionData.AuthToken);
 //				} catch (TException e) {
 //					// TODO Auto-generated catch block
 //					e.printStackTrace();
diff --git a/dozentenmodul/src/main/java/gui/image/PermissionEditImage_GUI.java b/dozentenmodul/src/main/java/gui/image/PermissionEditImage_GUI.java
index bd9cca1a..a2f4aa5a 100644
--- a/dozentenmodul/src/main/java/gui/image/PermissionEditImage_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/PermissionEditImage_GUI.java
@@ -98,7 +98,7 @@ public class PermissionEditImage_GUI extends JInternalFrame {
 //			@Override
 //			public void windowClosing(WindowEvent arg0) {
 //				try {
-//					client.setSessionInvalid(SessionData.session.getAuthToken());
+//					client.setSessionInvalid(SessionData.AuthToken);
 //				} catch (TException e) {
 //					// TODO Auto-generated catch block
 //					e.printStackTrace();
@@ -186,7 +186,7 @@ public class PermissionEditImage_GUI extends JInternalFrame {
 			//System.out.println("Loading data from db");
 			try {
 								
-				map = ThriftManager.getSatClient().getPermissionForUserAndImage(SessionData.session.getAuthToken(),Image.image.getImageId(),person.verantwortlicher.getUserID());
+				map = ThriftManager.getSatClient().getPermissionForUserAndImage(SessionData.authToken,Image.image.getImageId(),person.verantwortlicher.getUserID());
 				Iterator<Person> i = map.iterator();
 
 				int x = 0;
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"));
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++) 

 			{