ThriftManager class: use getSatClient() and getMasterClient() to get the singleton instances of the thrift clients to satellite and master servers

DO NOT CREATE NEW THRIFT OBJECTS!!!

1 files changed, 13 insertions, 17 deletions

diff --git a/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java b/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java
index a2247b97..d201d3b7 100644
--- a/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java
@@ -47,10 +47,9 @@ import models.person;
 
 import org.apache.log4j.Logger;
 import org.apache.thrift.TException;
-import org.openslx.sat.thrift.iface.Server.Client;
 import org.openslx.sat.thrift.iface.User;
 
-import thrift.ThriftConnection;
+import thrift.ThriftManager;
 import util.OpenLinks;
 import config.Config;
 import ftp.UploadTask;
@@ -91,8 +90,6 @@ public class FTPCreateUploader_GUI extends JFrame implements
 	double speed;
 	long bytesread;
 	boolean taskrun = false;
-	ThriftConnection con = new ThriftConnection();
-	Client client = models.Client.clientcon.getClient();
 	JButton btnFinish = new JButton("Fertigstellen");
 	JButton btnUploadStarten = new JButton("Upload auf Server starten");
 	JButton btnZurck = new JButton("Zurück");
@@ -120,7 +117,7 @@ public class FTPCreateUploader_GUI extends JFrame implements
 
 		try {
 
-			uuid = client.createRandomUUID(SessionData.session.getAuthToken());
+			uuid = ThriftManager.getSatClient().createRandomUUID(SessionData.session.getAuthToken());
 
 		} catch (TException e1) {
 
@@ -145,16 +142,15 @@ public class FTPCreateUploader_GUI extends JFrame implements
 					// 0=beenden, 1=abbrechen
 					if (choice == 0) {
 						try {
-							client.DeleteFtpUser(user.userName,
+							ThriftManager.getSatClient().DeleteFtpUser(user.userName,
 									SessionData.session.getAuthToken());
 						} catch (TException e1) {
 
 							e1.printStackTrace();
 						}
 						task.cancel(true);
-						con.closeThriftConnection();
 						try {
-							client.setSessionInvalid(SessionData.session
+							ThriftManager.getSatClient().setSessionInvalid(SessionData.session
 									.getAuthToken());
 						} catch (TException e) {
 							// TODO Auto-generated catch block
@@ -166,7 +162,7 @@ public class FTPCreateUploader_GUI extends JFrame implements
 					// no upload running, close window
 
 					try {
-						client.setSessionInvalid(SessionData.session
+						ThriftManager.getSatClient().setSessionInvalid(SessionData.session
 								.getAuthToken());
 					} catch (TException e) {
 						// TODO Auto-generated catch block
@@ -401,7 +397,7 @@ public class FTPCreateUploader_GUI extends JFrame implements
 
 				isAborted = true; // set flag
 				try {
-					client.DeleteFtpUser(user.userName,
+					ThriftManager.getSatClient().DeleteFtpUser(user.userName,
 							SessionData.session.getAuthToken());
 					LOGGER.info("Deleted FTP user.");
 				} catch (TException e1) {
@@ -470,7 +466,7 @@ public class FTPCreateUploader_GUI extends JFrame implements
 
 						if (taskrun == true) {
 							try {
-								client.DeleteFtpUser(user.userName,
+								ThriftManager.getSatClient().DeleteFtpUser(user.userName,
 										SessionData.session.getAuthToken());
 
 							} catch (TException e1) {
@@ -528,7 +524,7 @@ public class FTPCreateUploader_GUI extends JFrame implements
 							// 0=beenden, 1=abbrechen
 							if (choice == 0) {
 								try {
-									client.DeleteFtpUser(user.userName,
+									ThriftManager.getSatClient().DeleteFtpUser(user.userName,
 											SessionData.session.getAuthToken());
 								} catch (TException e1) {
 
@@ -642,7 +638,7 @@ public class FTPCreateUploader_GUI extends JFrame implements
 
 		try {
 			LOGGER.info("Getting FTP User...");
-			user = client.getFtpUser(SessionData.session.getAuthToken());
+			user = ThriftManager.getSatClient().getFtpUser(SessionData.session.getAuthToken());
 			LOGGER.info("Received FTP user.");
 			// LOGGER.debug("FTP name: " + user.userName);
 			// LOGGER.debug("FTP path: " + user.path);
@@ -737,7 +733,7 @@ public class FTPCreateUploader_GUI extends JFrame implements
 
 		try {
 
-			client.writeVLdata(Image.image.getImagename(),
+			ThriftManager.getSatClient().writeVLdata(Image.image.getImagename(),
 					Image.image.getDesc(), person.verantwortlicher.getTel(),
 					person.verantwortlicher.getFakultaet(),
 					Image.image.isLicensed(), Image.image.isInternet(),
@@ -750,10 +746,10 @@ public class FTPCreateUploader_GUI extends JFrame implements
 
 			// System.out.println("userID is: "+person.verantwortlicher.getUserID());
 			System.out.println("starting file copy...");
-			client.startFileCopy(Image.image.getNewName(),
+			ThriftManager.getSatClient().startFileCopy(Image.image.getNewName(),
 					SessionData.session.getAuthToken());
 
-			client.writeImageRights(uuid, SessionData.session.getAuthToken(),
+			ThriftManager.getSatClient().writeImageRights(uuid, SessionData.session.getAuthToken(),
 					person.verantwortlicher.getRole(),
 					person.verantwortlicher.getHochschule(),
 					person.verantwortlicher.getUserID());
@@ -761,7 +757,7 @@ public class FTPCreateUploader_GUI extends JFrame implements
 			for (int i = 0; i < RightsManagement.rightsManagement
 					.getPermittedUserList().size(); i++) {
 				// System.out.println("Writing additional rights for user "+RightsManagement.rightsManagement.getPermittedUserList().get(i).getUserID()+", User "+i+"/"+RightsManagement.rightsManagement.getPermittedUserList().size());
-				client.writeAdditionalImageRights(uuid,
+				ThriftManager.getSatClient().writeAdditionalImageRights(uuid,
 						RightsManagement.rightsManagement
 								.getPermittedUserList().get(i).getUserID(),
 						RightsManagement.rightsManagement