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/lecture/SearchLecture_GUI.java   | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

(limited to 'dozentenmodul/src/main/java/gui/lecture/SearchLecture_GUI.java')

diff --git a/dozentenmodul/src/main/java/gui/lecture/SearchLecture_GUI.java b/dozentenmodul/src/main/java/gui/lecture/SearchLecture_GUI.java
index bd387fab..fbb24849 100644
--- a/dozentenmodul/src/main/java/gui/lecture/SearchLecture_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/SearchLecture_GUI.java
@@ -60,9 +60,8 @@ import models.person;
 
 import org.apache.thrift.TException;
 import org.openslx.sat.thrift.iface.Lecture;
-import org.openslx.sat.thrift.iface.Server.Client;
 
-import thrift.ThriftConnection;
+import thrift.ThriftManager;
 import util.OpenLinks;
 
 @SuppressWarnings("serial")
@@ -89,8 +88,6 @@ public class SearchLecture_GUI extends JFrame {
 	String[] titles = { "Veranstaltungsname", "Beschreibung",
 			"Gültigkeitsdatum", "Aktiv", "Letzte Benutzung",
 			"Verantwortlicher", "Image", "Schlagwort", "ID" };
-	ThriftConnection con = new ThriftConnection();
-	Client client = models.Client.clientcon.getClient();
 	
 	final DefaultTableModel modelAll = new DefaultTableModel(titles, 0){
 		 public boolean isCellEditable(int rowIndex, int mColIndex) {
@@ -127,9 +124,8 @@ public class SearchLecture_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();
@@ -628,10 +624,10 @@ public class SearchLecture_GUI extends JFrame {
 			// Hole eine Liste der erlaubten Images für die diese Person
 			if(person.verantwortlicher.getRole()=="Admin"){
 				//get complete list
-				lectures = client.getLectureList(SessionData.session.getAuthToken());
+				lectures = ThriftManager.getSatClient().getLectureList(SessionData.session.getAuthToken());
 			} else {
 				//get permitted list			
-				lectures = client.getLectureListPermissionRead(SessionData.session.getAuthToken());
+				lectures = ThriftManager.getSatClient().getLectureListPermissionRead(SessionData.session.getAuthToken());
 			}
 			
 			Iterator<Lecture> i = lectures.iterator();
@@ -671,8 +667,8 @@ public class SearchLecture_GUI extends JFrame {
 		List<Lecture> lectures;
 		try {
 			// Hole eine Liste der erlaubten Images für die diese Person
-			//lectures = client.getLectureList();
-			lectures = client.getLectureList(SessionData.session.getAuthToken());
+			//lectures = ThriftManager.getSatClient().getLectureList();
+			lectures = ThriftManager.getSatClient().getLectureList(SessionData.session.getAuthToken());
 			Iterator<Lecture> i = lectures.iterator();
 			SimpleDateFormat in=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 			SimpleDateFormat out=new SimpleDateFormat("dd.MM.yyyy HH:mm:ss");
@@ -725,7 +721,7 @@ public class SearchLecture_GUI extends JFrame {
  
 			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.getLectureData(id,SessionData.session.getAuthToken());
+			Map<String,String> res=ThriftManager.getSatClient().getLectureData(id,SessionData.session.getAuthToken());
 			labelName.setText(res.get("name"));
 			labelAktiv.setText(res.get("isActive"));
 			labeldesc.setText(res.get("desc"));
-- 
cgit v1.2.3-55-g7522