From ea9f9848a6e7a68dc90decc2e38bd3e1081ebf8a Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Mon, 2 Mar 2015 13:22:44 +0100
Subject: 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!!!

---
 .../src/main/java/gui/image/SearchImage_GUI.java   | 23 ++++++++++------------
 1 file changed, 10 insertions(+), 13 deletions(-)

(limited to 'dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java')

diff --git a/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java b/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java
index 18f4a1e7..78b21987 100644
--- a/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java
@@ -60,9 +60,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;
 
 @SuppressWarnings("serial")
@@ -114,8 +113,7 @@ public class SearchImage_GUI extends JFrame {
 			"Die Volltextsuche sucht in den Feldern Name und Beschreibung." +
 			"</div></html>";
 	
-	ThriftConnection con = new ThriftConnection();
-	Client client = models.Client.clientcon.getClient();
+
 	final DefaultTableModel modelAll = new DefaultTableModel(titles, 0) {
 		public boolean isCellEditable(int rowIndex, int mColIndex) {
 			return false;
@@ -166,12 +164,11 @@ public class SearchImage_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);
 			}
 
@@ -420,7 +417,7 @@ public class SearchImage_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++) {
@@ -987,9 +984,9 @@ public class SearchImage_GUI extends JFrame {
 			// Hole eine Liste der 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 {
-				images = client.getImageListPermissionRead(person.verantwortlicher.getUserID(),SessionData.session.getAuthToken());
+				images = ThriftManager.getSatClient().getImageListPermissionRead(person.verantwortlicher.getUserID(),SessionData.session.getAuthToken());
 			}
 
 			Iterator<org.openslx.sat.thrift.iface.Image> i = images.iterator();
@@ -1037,7 +1034,7 @@ public class SearchImage_GUI extends JFrame {
 		List<org.openslx.sat.thrift.iface.Image> images;
 		try {
 			// Hole eine Liste der Images
-			images = client.getImageList(person.verantwortlicher.getUserID(),SessionData.session.getAuthToken());
+			images = ThriftManager.getSatClient().getImageList(person.verantwortlicher.getUserID(),SessionData.session.getAuthToken());
 
 			Iterator<org.openslx.sat.thrift.iface.Image> i = images.iterator();
 			SimpleDateFormat in = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -1087,7 +1084,7 @@ public class SearchImage_GUI extends JFrame {
 			List<org.openslx.sat.thrift.iface.Image> images;
 			try {
 				// Hole eine Liste der Images
-				images = client.getImageListAllTemplates(SessionData.session.getAuthToken());
+				images = ThriftManager.getSatClient().getImageListAllTemplates(SessionData.session.getAuthToken());
 
 				Iterator<org.openslx.sat.thrift.iface.Image> i = images.iterator();
 				SimpleDateFormat in = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -1155,7 +1152,7 @@ public class SearchImage_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"))));
@@ -1182,7 +1179,7 @@ public class SearchImage_GUI extends JFrame {
 			labelVersion.setText(res.get("version"));
 			textAreadesc.setText(res.get("desc"));
 			
-			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++) 
 			{
-- 
cgit v1.2.3-55-g7522