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, 8 insertions, 15 deletions

diff --git a/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java b/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java
index 7ebd604d..3ad45213 100644
--- a/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java
@@ -61,9 +61,8 @@ import models.SessionData;
 import models.person;
 
 import org.apache.thrift.TException;
-import org.openslx.sat.thrift.iface.Server.Client;
 
-import thrift.ThriftConnection;
+import thrift.ThriftManager;
 import util.OpenLinks;
 //import models.person;
 
@@ -116,10 +115,6 @@ public class SearchEditImage_GUI extends JFrame {
 			+ "Klicken Sie auf \"Weiter\" um das Image für weitere Schritte auszuwählen."
 			+ "</div></html>";
 
-	ThriftConnection con = new ThriftConnection();
-	Client client = models.Client.clientcon.getClient();
-	
-
 	
 	final DefaultTableModel modelMyImages = new DefaultTableModel(titles, 0) {
 		public boolean isCellEditable(int rowIndex, int mColIndex) {
@@ -151,13 +146,11 @@ public class SearchEditImage_GUI extends JFrame {
 			public void windowClosing(WindowEvent arg0) {
 				// Beendet die Anwendung nach klick auf X
 				try {
-					client.setSessionInvalid(SessionData.session.getAuthToken());
+					ThriftManager.getSatClient().setSessionInvalid(SessionData.session.getAuthToken());
 				} catch (TException e) {
 					// TODO Auto-generated catch block
 					e.printStackTrace();
 				}
-				con.closeThriftConnection();
-				
 				System.exit(0);
 			}
 
@@ -315,7 +308,7 @@ public class SearchEditImage_GUI extends JFrame {
 		try {
 			// Holt sich eine Liste aller verfuegbaren Betriebssysteme vom
 			// Server
-			List<String> list = client.getAllOS(SessionData.session.getAuthToken());
+			List<String> list = ThriftManager.getSatClient().getAllOS(SessionData.session.getAuthToken());
 			// Leeres Item hinzufuegen
 			comboBox.addItem("");
 			for (int i = 0; i < list.size(); i++) {
@@ -750,10 +743,10 @@ public class SearchEditImage_GUI extends JFrame {
 			// Hole eine Liste der passenden Images,
 			if(person.verantwortlicher.getRole()=="Admin"){
 				//get complete list
-				images = client.getImageList(person.verantwortlicher.getUserID(),SessionData.session.getAuthToken()); 
+				images = ThriftManager.getSatClient().getImageList(person.verantwortlicher.getUserID(),SessionData.session.getAuthToken()); 
 			} else {
 				//only get permitted list
-				images = client.getImageListPermissionWrite(person.verantwortlicher.getUserID(),SessionData.session.getAuthToken());
+				images = ThriftManager.getSatClient().getImageListPermissionWrite(person.verantwortlicher.getUserID(),SessionData.session.getAuthToken());
 			}
 
 			Iterator<org.openslx.sat.thrift.iface.Image> i = images.iterator();
@@ -821,7 +814,7 @@ public class SearchEditImage_GUI extends JFrame {
 		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 = client.getImageData(id, version,SessionData.session.getAuthToken());
+			Map<String, String> res = ThriftManager.getSatClient().getImageData(id, version,SessionData.session.getAuthToken());
 			labelName.setText(res.get("name"));
 			labelOS.setText(res.get("os"));
 			labelUpdate.setText(out.format(in.parse(res.get("lastupdate"))));
@@ -850,7 +843,7 @@ public class SearchEditImage_GUI extends JFrame {
 			textAreadesc.setText(res.get("desc"));
 			res.clear();
 			
-			List<String> contacts = client.getAdditionalImageContacts(id,SessionData.session.getAuthToken());
+			List<String> contacts = ThriftManager.getSatClient().getAdditionalImageContacts(id,SessionData.session.getAuthToken());
 			labelWeitereVerantwortliche.setText("");
 			for (int i = 0; i < contacts.size(); i++) 
 			{
@@ -870,7 +863,7 @@ public class SearchEditImage_GUI extends JFrame {
 		
 		try {
 			//get values from server and set them in model
-			map=client.getItemOwner(imageid,SessionData.session.getAuthToken());
+			map=ThriftManager.getSatClient().getItemOwner(imageid,SessionData.session.getAuthToken());
 			
 			ItemOwner.itemOwner.setUserID(map.get("userID"));
 			ItemOwner.itemOwner.setUsername(map.get("loginName"));