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!!! --- .../java/gui/lecture/CreateLectureLink_GUI.java | 40 +++++++--------------- 1 file changed, 13 insertions(+), 27 deletions(-) (limited to 'dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java') diff --git a/dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java b/dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java index 14b050a9..837b6683 100644 --- a/dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java +++ b/dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java @@ -63,9 +63,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") @@ -100,8 +99,6 @@ public class CreateLectureLink_GUI extends JFrame { private String uuid = null; String[] titles = { "Image-Name", "Lizenzpflichtig", "OS", "Veranstaltung", "Verantwortlicher", "Letztes Update", "ID", "Version", "Template", "Beschreibung" }; - ThriftConnection con = new ThriftConnection(); - Client client = models.Client.clientcon.getClient(); private static final String HELP_MESSAGE = "
" + "Damit Ihre Veranstaltung geladen werden kann, muss sie mit einem Image verbunden werden.
" @@ -126,7 +123,7 @@ public class CreateLectureLink_GUI extends JFrame { - RowFilter rf = null; + RowFilter rf = null; List> filters = new ArrayList>(2); /** @@ -142,12 +139,11 @@ public class CreateLectureLink_GUI extends JFrame { @Override public void windowClosing(WindowEvent arg0) { 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); } @@ -216,8 +212,6 @@ public class CreateLectureLink_GUI extends JFrame { setBounds(0, 0, 918, 722); setLocationRelativeTo(formerGUI); - final DefaultTableModel model = new DefaultTableModel(titles, 0); - getContentPane().setLayout(null); { JPanel panel = new JPanel(); @@ -300,7 +294,7 @@ public class CreateLectureLink_GUI extends JFrame { comboBox = new JComboBox(); try { - List list = client.getAllOS(SessionData.session.getAuthToken()); + List list = ThriftManager.getSatClient().getAllOS(SessionData.session.getAuthToken()); comboBox.addItem(""); for (int i = 0; i < list.size(); i++) { comboBox.addItem(list.get(i)); @@ -443,8 +437,6 @@ public class CreateLectureLink_GUI extends JFrame { "Veranstaltung erzeugen und abschließen"); doLinkButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { - String username = person.verantwortlicher.getName() - + " " + person.verantwortlicher.getVorname(); // check if a row is selected if (tablemyImages.getSelectedRow() != -1) { @@ -457,7 +449,7 @@ public class CreateLectureLink_GUI extends JFrame { "yyyy-MM-dd HH:mm:ss"); //create new lecture - client.writeLecturedata( + ThriftManager.getSatClient().writeLecturedata( Lecture.lecture.getName(), Lecture.lecture.getShortDesc(), Lecture.lecture.getDesc(), @@ -474,7 +466,7 @@ public class CreateLectureLink_GUI extends JFrame { System.out.println("lectureID" + " " + uuid); //set rights for this user - client.writeLectureRights( + ThriftManager.getSatClient().writeLectureRights( uuid, person.verantwortlicher.getRole(), SessionData.session.getAuthToken(), @@ -485,7 +477,7 @@ public class CreateLectureLink_GUI extends JFrame { //set rights for additional users 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+1)+"/"+RightsManagement.rightsManagement.getPermittedUserList().size()); - client.writeAdditionalLectureRights( + ThriftManager.getSatClient().writeAdditionalLectureRights( uuid, RightsManagement.rightsManagement.getPermittedUserList().get(i).getUserID(), RightsManagement.rightsManagement.getPermittedUserList().get(i).isLecture_read(), @@ -682,14 +674,11 @@ public class CreateLectureLink_GUI extends JFrame { mntmFaq.addMouseListener(new MouseAdapter() { @Override public void mousePressed(MouseEvent arg0) { - - OpenLinks open = new OpenLinks(); - URI windows; try { windows = new URI(Links.getFAQ()); - open.openWebpage(windows); + OpenLinks.openWebpage(windows); } catch (URISyntaxException e) { @@ -703,14 +692,11 @@ public class CreateLectureLink_GUI extends JFrame { mntmOtrs.addMouseListener(new MouseAdapter() { @Override public void mousePressed(MouseEvent arg0) { - - OpenLinks open = new OpenLinks(); - URI windows; try { windows = new URI(Links.getOTRS()); - open.openWebpage(windows); + OpenLinks.openWebpage(windows); } catch (URISyntaxException e) { @@ -743,7 +729,7 @@ public class CreateLectureLink_GUI extends JFrame { try { - uuid = client.createRandomUUID(SessionData.session.getAuthToken()); + uuid = ThriftManager.getSatClient().createRandomUUID(SessionData.session.getAuthToken()); } catch (TException e1) { @@ -763,9 +749,9 @@ public class CreateLectureLink_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.getImageListPermissionLink(person.verantwortlicher.getUserID(),SessionData.session.getAuthToken()); + images = ThriftManager.getSatClient().getImageListPermissionLink(person.verantwortlicher.getUserID(),SessionData.session.getAuthToken()); } Iterator i = images.iterator(); @@ -819,7 +805,7 @@ public class CreateLectureLink_GUI extends JFrame { SimpleDateFormat in = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); SimpleDateFormat out = new SimpleDateFormat("dd.MM.yyyy HH:mm:ss"); - Map res = client.getImageData(id, version,SessionData.session.getAuthToken()); + Map 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")))); -- cgit v1.2.3-55-g7522