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

1 files changed, 16 insertions, 22 deletions

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