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/image/CreateImageTechnisch_GUI.java | 9 ++--- .../src/main/java/gui/image/DeleteImage_GUI.java | 35 +++++--------------- .../java/gui/image/EditImageAllgemein_GUI.java | 11 +++---- .../java/gui/image/EditImageTechnisch_GUI.java | 13 +++----- .../main/java/gui/image/FTPCreateUploader_GUI.java | 30 ++++++++--------- .../main/java/gui/image/FTPEditDownloader_GUI.java | 20 +++++------- .../main/java/gui/image/FTPEditUploader_GUI.java | 38 ++++++++++------------ .../java/gui/image/FTPSearchDownloader_GUI.java | 22 +++++-------- .../main/java/gui/image/SearchEditImage_GUI.java | 23 +++++-------- .../src/main/java/gui/image/SearchImage_GUI.java | 23 ++++++------- 10 files changed, 86 insertions(+), 138 deletions(-) (limited to 'dozentenmodul/src/main/java/gui/image') diff --git a/dozentenmodul/src/main/java/gui/image/CreateImageTechnisch_GUI.java b/dozentenmodul/src/main/java/gui/image/CreateImageTechnisch_GUI.java index 42e98c4f..ac90c518 100644 --- a/dozentenmodul/src/main/java/gui/image/CreateImageTechnisch_GUI.java +++ b/dozentenmodul/src/main/java/gui/image/CreateImageTechnisch_GUI.java @@ -46,9 +46,8 @@ import models.person; import org.apache.log4j.Logger; import org.apache.thrift.TException; -import org.openslx.sat.thrift.iface.Server.Client; -import thrift.ThriftConnection; +import thrift.ThriftManager; import util.OpenLinks; @SuppressWarnings("serial") @@ -66,8 +65,6 @@ public class CreateImageTechnisch_GUI extends JFrame { private JCheckBox chckbxIsLicensed; private JCheckBox chckbxIsInternetBlocked; JComboBox comboBox; - ThriftConnection con = new ThriftConnection(); - Client client = models.Client.clientcon.getClient(); Component c = null; private static final String HELP_MESSAGE = "
" + "Geben Sie hier bitte einige technische Daten an, die dann mit dem Image angezeigt werden.
" + @@ -85,7 +82,7 @@ public class CreateImageTechnisch_GUI extends JFrame { @Override public void windowClosing(WindowEvent arg0) { try { - client.setSessionInvalid(SessionData.session.getAuthToken()); + ThriftManager.getSatClient().setSessionInvalid(SessionData.session.getAuthToken()); } catch (TException e1) { // TODO Auto-generated catch block e1.printStackTrace(); @@ -202,7 +199,7 @@ public class CreateImageTechnisch_GUI extends JFrame { }); List os = null; try { - os = client.getAllOS(SessionData.session.getAuthToken()); + os = ThriftManager.getSatClient().getAllOS(SessionData.session.getAuthToken()); for(int i=0; i"; - 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 list = client.getAllOS(SessionData.session + List 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 res = client.getImageData(id, version, + Map res = ThriftManager.getSatClient().getImageData(id, version, SessionData.session.getAuthToken()); labelName.setText(res.get("name")); labelOS.setText(res.get("os")); diff --git a/dozentenmodul/src/main/java/gui/image/EditImageAllgemein_GUI.java b/dozentenmodul/src/main/java/gui/image/EditImageAllgemein_GUI.java index 1dfd8191..57406817 100644 --- a/dozentenmodul/src/main/java/gui/image/EditImageAllgemein_GUI.java +++ b/dozentenmodul/src/main/java/gui/image/EditImageAllgemein_GUI.java @@ -43,9 +43,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") @@ -59,8 +58,6 @@ public class EditImageAllgemein_GUI extends JFrame { private JTextField EMail; private JTextField imagename; private JTextArea textAreadesc; - ThriftConnection con = new ThriftConnection(); - Client client = models.Client.clientcon.getClient(); private JPanel panel_2; private JLabel lblNewLabel; private JTextPane txtpnBitteWhlenSie; @@ -86,9 +83,8 @@ public class EditImageAllgemein_GUI extends JFrame { @Override public void windowClosing(WindowEvent arg0) { // Beendet die Anwendung bei einem Klick auf das 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(); @@ -433,7 +429,8 @@ public class EditImageAllgemein_GUI extends JFrame { public void initData() { try { - Map map = client.getImageData(Image.image.getImageId(), Image.image.getVersion(),SessionData.session.getAuthToken()); + Map map = ThriftManager.getSatClient().getImageData( + Image.image.getImageId(), Image.image.getVersion(),SessionData.session.getAuthToken()); if (map.get("internet").equals("0")) { Image.image.setInternet(false); diff --git a/dozentenmodul/src/main/java/gui/image/EditImageTechnisch_GUI.java b/dozentenmodul/src/main/java/gui/image/EditImageTechnisch_GUI.java index 6895f6c1..679b3c62 100644 --- a/dozentenmodul/src/main/java/gui/image/EditImageTechnisch_GUI.java +++ b/dozentenmodul/src/main/java/gui/image/EditImageTechnisch_GUI.java @@ -45,9 +45,8 @@ import models.person; import org.apache.log4j.Logger; import org.apache.thrift.TException; -import org.openslx.sat.thrift.iface.Server.Client; -import thrift.ThriftConnection; +import thrift.ThriftManager; import util.OpenLinks; @SuppressWarnings("serial") @@ -65,8 +64,6 @@ public class EditImageTechnisch_GUI extends JFrame { private JCheckBox chckbxIsLicensed; private JCheckBox chckbxIsInternetBlocked; JComboBox comboBox; - ThriftConnection con = new ThriftConnection(); - Client client = models.Client.clientcon.getClient(); Component c = null; private static final String HELP_MESSAGE = "
" + "Bearbeiten Sie hier die technischen Angaben zu Ihrem Image, die Sie beim Erzeugen des Images hinterlegt haben.
" + @@ -83,7 +80,7 @@ public class EditImageTechnisch_GUI extends JFrame { public void windowClosing(WindowEvent arg0) { // Beendet die Anwendung bei Klick auf das X try { - client.setSessionInvalid(SessionData.session.getAuthToken()); + ThriftManager.getSatClient().setSessionInvalid(SessionData.session.getAuthToken()); } catch (TException e) { // TODO Auto-generated catch block e.printStackTrace(); @@ -200,7 +197,7 @@ public class EditImageTechnisch_GUI extends JFrame { List os = null; try { - os=client.getAllOS(SessionData.session.getAuthToken()); + os=ThriftManager.getSatClient().getAllOS(SessionData.session.getAuthToken()); for(int i=0;i"; - 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 list = client.getAllOS(SessionData.session.getAuthToken()); + List 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 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 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")))); @@ -850,7 +843,7 @@ public class SearchEditImage_GUI extends JFrame { textAreadesc.setText(res.get("desc")); res.clear(); - List contacts = client.getAdditionalImageContacts(id,SessionData.session.getAuthToken()); + List 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")); 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." + "
"; - 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 list = client.getAllOS(SessionData.session.getAuthToken()); + List 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 i = images.iterator(); @@ -1037,7 +1034,7 @@ public class SearchImage_GUI extends JFrame { List 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 i = images.iterator(); SimpleDateFormat in = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); @@ -1087,7 +1084,7 @@ public class SearchImage_GUI extends JFrame { List images; try { // Hole eine Liste der Images - images = client.getImageListAllTemplates(SessionData.session.getAuthToken()); + images = ThriftManager.getSatClient().getImageListAllTemplates(SessionData.session.getAuthToken()); Iterator 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 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")))); @@ -1182,7 +1179,7 @@ public class SearchImage_GUI extends JFrame { labelVersion.setText(res.get("version")); textAreadesc.setText(res.get("desc")); - List contacts = client.getAdditionalImageContacts(id,SessionData.session.getAuthToken()); + List contacts = ThriftManager.getSatClient().getAdditionalImageContacts(id,SessionData.session.getAuthToken()); labelWeitereVerantwortliche.setText(""); for (int i = 0; i < contacts.size(); i++) { -- cgit v1.2.3-55-g7522