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, 9 insertions, 26 deletions

diff --git a/dozentenmodul/src/main/java/gui/image/DeleteImage_GUI.java b/dozentenmodul/src/main/java/gui/image/DeleteImage_GUI.java
index 44e86aae..c6dc58c9 100644
--- a/dozentenmodul/src/main/java/gui/image/DeleteImage_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/DeleteImage_GUI.java
@@ -61,9 +61,8 @@ import models.person;
 import org.apache.log4j.Logger;
 import org.apache.thrift.TException;
 import org.openslx.sat.thrift.iface.Image;
-import org.openslx.sat.thrift.iface.Server.Client;
 
-import thrift.ThriftConnection;
+import thrift.ThriftManager;
 import util.OpenLinks;
 
 @SuppressWarnings("serial")
@@ -116,9 +115,6 @@ public class DeleteImage_GUI extends JFrame {
 			+ "Wird das Image nach dem Löschen nochmal benötigt, muss es erneut hochgeladen werden."
 			+ "</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) {
 			return false;
@@ -145,9 +141,8 @@ public class DeleteImage_GUI extends JFrame {
 			@Override
 			public void windowClosing(WindowEvent arg0) {
 				// Beendet die Anwendung nach klick auf X
-				con.closeThriftConnection();
 				try {
-					client.setSessionInvalid(SessionData.session.getAuthToken());
+					ThriftManager.getSatClient().setSessionInvalid(SessionData.session.getAuthToken());
 				} catch (TException e) {
 					// TODO Auto-generated catch block
 					e.printStackTrace();
@@ -298,7 +293,7 @@ public class DeleteImage_GUI extends JFrame {
 		try {
 			// Holt sich eine Liste aller verfügbaren Betriebssysteme vom
 			// Server
-			List<String> list = client.getAllOS(SessionData.session
+			List<String> list = ThriftManager.getSatClient().getAllOS(SessionData.session
 					.getAuthToken());
 			// Leeres Item hinzufuegen
 			comboBox.addItem("");
@@ -352,12 +347,6 @@ public class DeleteImage_GUI extends JFrame {
 		lblHauptmen.addMouseListener(new MouseAdapter() {
 			@Override
 			public void mouseClicked(MouseEvent arg0) {
-
-				// oeffnet das Hauuetmenue
-				con.closeThriftConnection();
-
-				// oeffnet das Hauuetmenue
-
 				DeleteImage_GUI.this.setVisible(false);
 				MainMenue_GUI main = new MainMenue_GUI(c);
 				main.setVisible(true);
@@ -418,17 +407,17 @@ public class DeleteImage_GUI extends JFrame {
 						// Unbdingt abfragen!
 
 						try {
-							if (!client.connectedToLecture(imageid,
+							if (!ThriftManager.getSatClient().connectedToLecture(imageid,
 									imageversion,
 									SessionData.session.getAuthToken())) {
 								try {
 
 									//  try to delete file from file system
-									if (client.deleteImageServer(imageid,
+									if (ThriftManager.getSatClient().deleteImageServer(imageid,
 											imageversion,
 											SessionData.session.getAuthToken()) == true) {
 										// successful, now delete file from DB
-										if (client.deleteImageData(imageid,
+										if (ThriftManager.getSatClient().deleteImageData(imageid,
 												imageversion,
 												SessionData.session
 														.getAuthToken())) {
@@ -566,12 +555,6 @@ public class DeleteImage_GUI extends JFrame {
 				JButton okButton = new JButton("Zurück");
 				okButton.addActionListener(new ActionListener() {
 					public void actionPerformed(ActionEvent e) {
-
-						// oeffnet das Hauptmenü
-						con.closeThriftConnection();
-
-						// oeffnet das Hauptmenue
-
 						MainMenue_GUI main = new MainMenue_GUI(c);
 						main.setVisible(true);
 						dispose();
@@ -791,11 +774,11 @@ public class DeleteImage_GUI extends JFrame {
 			// Hole eine Liste der Images
 			if (person.verantwortlicher.getRole() == "Admin") {
 				// get complete list
-				images = client.getImageList(person.verantwortlicher
+				images = ThriftManager.getSatClient().getImageList(person.verantwortlicher
 						.getUserID(),SessionData.session.getAuthToken());
 			} else {
 				// get permitted list
-				images = client.getImageListPermissionAdmin(
+				images = ThriftManager.getSatClient().getImageListPermissionAdmin(
 						person.verantwortlicher.getUserID(),
 						SessionData.session.getAuthToken());
 			}
@@ -867,7 +850,7 @@ public class DeleteImage_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,
+			Map<String, String> res = ThriftManager.getSatClient().getImageData(id, version,
 					SessionData.session.getAuthToken());
 			labelName.setText(res.get("name"));
 			labelOS.setText(res.get("os"));