diff options
Diffstat (limited to 'dozentenmodul/src/main/java/gui/image')
10 files changed, 86 insertions, 138 deletions
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<String> comboBox; - ThriftConnection con = new ThriftConnection(); - Client client = models.Client.clientcon.getClient(); Component c = null; private static final String HELP_MESSAGE = "<html><div align = \"center\">" + "Geben Sie hier bitte einige technische Daten an, die dann mit dem Image angezeigt werden.<br />" + @@ -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<String> os = null; try { - os = client.getAllOS(SessionData.session.getAuthToken()); + os = ThriftManager.getSatClient().getAllOS(SessionData.session.getAuthToken()); for(int i=0; i<os.size();i++){ comboBox.addItem(os.get(i).toString()); } 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")); 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<String, String> map = client.getImageData(Image.image.getImageId(), Image.image.getVersion(),SessionData.session.getAuthToken()); + Map<String, String> 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<String> comboBox; - ThriftConnection con = new ThriftConnection(); - Client client = models.Client.clientcon.getClient(); Component c = null; private static final String HELP_MESSAGE = "<html><div align = \"center\">" + "Bearbeiten Sie hier die technischen Angaben zu Ihrem Image, die Sie beim Erzeugen des Images hinterlegt haben.<br />" + @@ -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<String> os = null; try { - os=client.getAllOS(SessionData.session.getAuthToken()); + os=ThriftManager.getSatClient().getAllOS(SessionData.session.getAuthToken()); for(int i=0;i<os.size();i++) { comboBox.addItem(os.get(i).toString()); } @@ -218,7 +215,7 @@ public class EditImageTechnisch_GUI extends JFrame { panel_1.add(comboBox); try { - comboBox.setSelectedItem(client.getOsNameForGuestOs(Image.image.getOS(),SessionData.session.getAuthToken())); + comboBox.setSelectedItem(ThriftManager.getSatClient().getOsNameForGuestOs(Image.image.getOS(),SessionData.session.getAuthToken())); } catch (TException e1) { // TODO Auto-generated catch block @@ -381,7 +378,7 @@ public class EditImageTechnisch_GUI extends JFrame { try { //check if user may change permissions and choose window - if(client.userIsImageAdmin(Image.image.getImageId(),SessionData.session.getAuthToken(), person.verantwortlicher.getUserID()) == true || (person.verantwortlicher.getRole().equals("Admin"))) { + if(ThriftManager.getSatClient().userIsImageAdmin(Image.image.getImageId(),SessionData.session.getAuthToken(), person.verantwortlicher.getUserID()) == true || (person.verantwortlicher.getRole().equals("Admin"))) { //user has permission, go to permission GUI PermissionEditImage_GUI ea=new PermissionEditImage_GUI(c); ea.setVisible(true); diff --git a/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java b/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java index a2247b97..d201d3b7 100644 --- a/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java +++ b/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java @@ -47,10 +47,9 @@ import models.person; import org.apache.log4j.Logger; import org.apache.thrift.TException; -import org.openslx.sat.thrift.iface.Server.Client; import org.openslx.sat.thrift.iface.User; -import thrift.ThriftConnection; +import thrift.ThriftManager; import util.OpenLinks; import config.Config; import ftp.UploadTask; @@ -91,8 +90,6 @@ public class FTPCreateUploader_GUI extends JFrame implements double speed; long bytesread; boolean taskrun = false; - ThriftConnection con = new ThriftConnection(); - Client client = models.Client.clientcon.getClient(); JButton btnFinish = new JButton("Fertigstellen"); JButton btnUploadStarten = new JButton("Upload auf Server starten"); JButton btnZurck = new JButton("Zurück"); @@ -120,7 +117,7 @@ public class FTPCreateUploader_GUI extends JFrame implements try { - uuid = client.createRandomUUID(SessionData.session.getAuthToken()); + uuid = ThriftManager.getSatClient().createRandomUUID(SessionData.session.getAuthToken()); } catch (TException e1) { @@ -145,16 +142,15 @@ public class FTPCreateUploader_GUI extends JFrame implements // 0=beenden, 1=abbrechen if (choice == 0) { try { - client.DeleteFtpUser(user.userName, + ThriftManager.getSatClient().DeleteFtpUser(user.userName, SessionData.session.getAuthToken()); } catch (TException e1) { e1.printStackTrace(); } task.cancel(true); - con.closeThriftConnection(); try { - client.setSessionInvalid(SessionData.session + ThriftManager.getSatClient().setSessionInvalid(SessionData.session .getAuthToken()); } catch (TException e) { // TODO Auto-generated catch block @@ -166,7 +162,7 @@ public class FTPCreateUploader_GUI extends JFrame implements // no upload running, close window try { - client.setSessionInvalid(SessionData.session + ThriftManager.getSatClient().setSessionInvalid(SessionData.session .getAuthToken()); } catch (TException e) { // TODO Auto-generated catch block @@ -401,7 +397,7 @@ public class FTPCreateUploader_GUI extends JFrame implements isAborted = true; // set flag try { - client.DeleteFtpUser(user.userName, + ThriftManager.getSatClient().DeleteFtpUser(user.userName, SessionData.session.getAuthToken()); LOGGER.info("Deleted FTP user."); } catch (TException e1) { @@ -470,7 +466,7 @@ public class FTPCreateUploader_GUI extends JFrame implements if (taskrun == true) { try { - client.DeleteFtpUser(user.userName, + ThriftManager.getSatClient().DeleteFtpUser(user.userName, SessionData.session.getAuthToken()); } catch (TException e1) { @@ -528,7 +524,7 @@ public class FTPCreateUploader_GUI extends JFrame implements // 0=beenden, 1=abbrechen if (choice == 0) { try { - client.DeleteFtpUser(user.userName, + ThriftManager.getSatClient().DeleteFtpUser(user.userName, SessionData.session.getAuthToken()); } catch (TException e1) { @@ -642,7 +638,7 @@ public class FTPCreateUploader_GUI extends JFrame implements try { LOGGER.info("Getting FTP User..."); - user = client.getFtpUser(SessionData.session.getAuthToken()); + user = ThriftManager.getSatClient().getFtpUser(SessionData.session.getAuthToken()); LOGGER.info("Received FTP user."); // LOGGER.debug("FTP name: " + user.userName); // LOGGER.debug("FTP path: " + user.path); @@ -737,7 +733,7 @@ public class FTPCreateUploader_GUI extends JFrame implements try { - client.writeVLdata(Image.image.getImagename(), + ThriftManager.getSatClient().writeVLdata(Image.image.getImagename(), Image.image.getDesc(), person.verantwortlicher.getTel(), person.verantwortlicher.getFakultaet(), Image.image.isLicensed(), Image.image.isInternet(), @@ -750,10 +746,10 @@ public class FTPCreateUploader_GUI extends JFrame implements // System.out.println("userID is: "+person.verantwortlicher.getUserID()); System.out.println("starting file copy..."); - client.startFileCopy(Image.image.getNewName(), + ThriftManager.getSatClient().startFileCopy(Image.image.getNewName(), SessionData.session.getAuthToken()); - client.writeImageRights(uuid, SessionData.session.getAuthToken(), + ThriftManager.getSatClient().writeImageRights(uuid, SessionData.session.getAuthToken(), person.verantwortlicher.getRole(), person.verantwortlicher.getHochschule(), person.verantwortlicher.getUserID()); @@ -761,7 +757,7 @@ public class FTPCreateUploader_GUI extends JFrame implements 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+"/"+RightsManagement.rightsManagement.getPermittedUserList().size()); - client.writeAdditionalImageRights(uuid, + ThriftManager.getSatClient().writeAdditionalImageRights(uuid, RightsManagement.rightsManagement .getPermittedUserList().get(i).getUserID(), RightsManagement.rightsManagement diff --git a/dozentenmodul/src/main/java/gui/image/FTPEditDownloader_GUI.java b/dozentenmodul/src/main/java/gui/image/FTPEditDownloader_GUI.java index d190c50f..6db115fb 100644 --- a/dozentenmodul/src/main/java/gui/image/FTPEditDownloader_GUI.java +++ b/dozentenmodul/src/main/java/gui/image/FTPEditDownloader_GUI.java @@ -42,10 +42,9 @@ import models.person; import org.apache.log4j.Logger; import org.apache.thrift.TException; -import org.openslx.sat.thrift.iface.Server.Client; import org.openslx.sat.thrift.iface.User; -import thrift.ThriftConnection; +import thrift.ThriftManager; import util.OpenLinks; import config.Config; import ftp.DownloadTask; @@ -84,8 +83,6 @@ public class FTPEditDownloader_GUI extends JFrame implements long bytesread; JLabel lblZeit; boolean taskrun = false; - ThriftConnection con = new ThriftConnection(); - Client client = models.Client.clientcon.getClient(); JButton btnZurck = new JButton("Zurück"); JButton btnDownloadStarten = new JButton("Download starten"); JButton btnDownloadStoppen = new JButton("Download abbrechen"); @@ -123,10 +120,9 @@ public class FTPEditDownloader_GUI extends JFrame implements // 0=beenden, 1=abbrechen if (choice == 0) { try { - client.DeleteFtpUser(user.userName,SessionData.session.getAuthToken()); - con.closeThriftConnection(); + ThriftManager.getSatClient().DeleteFtpUser(user.userName,SessionData.session.getAuthToken()); try { - client.setSessionInvalid(SessionData.session.getAuthToken()); + ThriftManager.getSatClient().setSessionInvalid(SessionData.session.getAuthToken()); } catch (TException e1) { // TODO Auto-generated catch block e1.printStackTrace(); @@ -141,7 +137,7 @@ public class FTPEditDownloader_GUI extends JFrame implements } else { // no download running, close window try { - client.setSessionInvalid(SessionData.session.getAuthToken()); + ThriftManager.getSatClient().setSessionInvalid(SessionData.session.getAuthToken()); } catch (TException e1) { // TODO Auto-generated catch block e1.printStackTrace(); @@ -426,7 +422,7 @@ public class FTPEditDownloader_GUI extends JFrame implements isAborted = true; // set flag try { - client.DeleteFtpUser(user.userName,SessionData.session.getAuthToken()); + ThriftManager.getSatClient().DeleteFtpUser(user.userName,SessionData.session.getAuthToken()); LOGGER.info("FTP user deleted."); } catch (TException e1) { @@ -465,7 +461,7 @@ public class FTPEditDownloader_GUI extends JFrame implements if (choice == 0) { task.cancel(true); try { - client.DeleteFtpUser(user.userName,SessionData.session.getAuthToken()); + ThriftManager.getSatClient().DeleteFtpUser(user.userName,SessionData.session.getAuthToken()); } catch (TException e1) { e1.printStackTrace(); @@ -527,11 +523,11 @@ public class FTPEditDownloader_GUI extends JFrame implements // Klick btnDownloadStarten.setText("Bitte warten"); try { - user = client.getFtpUser(SessionData.session.getAuthToken()); + user = ThriftManager.getSatClient().getFtpUser(SessionData.session.getAuthToken()); downloadFile = user.path + "/" - + client.getPathOfImage(Image.image.getImageId(), + + ThriftManager.getSatClient().getPathOfImage(Image.image.getImageId(), Image.image.getVersion(),SessionData.session.getAuthToken()); } catch (TException e) { diff --git a/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java b/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java index a8c2424c..231fd82f 100644 --- a/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java +++ b/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java @@ -47,10 +47,9 @@ import models.person; import org.apache.log4j.Logger; import org.apache.thrift.TException; -import org.openslx.sat.thrift.iface.Server.Client; import org.openslx.sat.thrift.iface.User; -import thrift.ThriftConnection; +import thrift.ThriftManager; import util.OpenLinks; import config.Config; import ftp.UploadTask; @@ -91,8 +90,6 @@ public class FTPEditUploader_GUI extends JFrame implements boolean fileupload = false; boolean taskrun = false; int progress = 0; - ThriftConnection con = new ThriftConnection(); - Client client = models.Client.clientcon.getClient(); JButton btnUploadStarten = new JButton("Upload auf Server starten"); JButton btnSpeicherortAuswhlen = new JButton("Image auswählen"); JButton btnFinish = new JButton("Fertigstellen"); @@ -135,20 +132,19 @@ public class FTPEditUploader_GUI extends JFrame implements // 0=beenden, 1=abbrechen if (choice == 0) { try { - client.DeleteFtpUser(user.userName,SessionData.session.getAuthToken()); + ThriftManager.getSatClient().DeleteFtpUser(user.userName,SessionData.session.getAuthToken()); } catch (TException e1) { e1.printStackTrace(); } task.cancel(true); try { - client.setSessionInvalid(SessionData.session.getAuthToken()); + ThriftManager.getSatClient().setSessionInvalid(SessionData.session.getAuthToken()); } catch (TException e) { // TODO Auto-generated catch block e.printStackTrace(); } - con.closeThriftConnection(); try { - client.setSessionInvalid(SessionData.session.getAuthToken()); + ThriftManager.getSatClient().setSessionInvalid(SessionData.session.getAuthToken()); } catch (TException e) { // TODO Auto-generated catch block e.printStackTrace(); @@ -158,7 +154,7 @@ public class FTPEditUploader_GUI extends JFrame implements } else { // no upload running, close window try { - client.setSessionInvalid(SessionData.session.getAuthToken()); + ThriftManager.getSatClient().setSessionInvalid(SessionData.session.getAuthToken()); } catch (TException e) { // TODO Auto-generated catch block e.printStackTrace(); @@ -375,7 +371,7 @@ public class FTPEditUploader_GUI extends JFrame implements isAborted = true; // set flag try { - client.DeleteFtpUser(user.userName,SessionData.session.getAuthToken()); + ThriftManager.getSatClient().DeleteFtpUser(user.userName,SessionData.session.getAuthToken()); LOGGER.info("FTP user deleted."); } catch (TException e1) { e1.printStackTrace(); @@ -449,7 +445,7 @@ public class FTPEditUploader_GUI extends JFrame implements if (taskrun == true) { try { - client.DeleteFtpUser(user.userName,SessionData.session.getAuthToken()); + ThriftManager.getSatClient().DeleteFtpUser(user.userName,SessionData.session.getAuthToken()); } catch (TException e1) { e1.printStackTrace(); @@ -479,7 +475,7 @@ public class FTPEditUploader_GUI extends JFrame implements // 0=beenden, 1=abbrechen if (choice == 0) { try { - client.DeleteFtpUser(user.userName,SessionData.session.getAuthToken()); + ThriftManager.getSatClient().DeleteFtpUser(user.userName,SessionData.session.getAuthToken()); } catch (TException e1) { e1.printStackTrace(); } @@ -488,7 +484,7 @@ public class FTPEditUploader_GUI extends JFrame implements try { - if(client.userIsImageAdmin(Image.image.getImageId(), SessionData.session.getAuthToken(),person.verantwortlicher.getUserID()) == true || person.verantwortlicher.getRole().equals("Admin")){ + if(ThriftManager.getSatClient().userIsImageAdmin(Image.image.getImageId(), SessionData.session.getAuthToken(),person.verantwortlicher.getUserID()) == true || person.verantwortlicher.getRole().equals("Admin")){ //user is admin and may change permissions PermissionEditImage_GUI ei = new PermissionEditImage_GUI(c); @@ -519,7 +515,7 @@ public class FTPEditUploader_GUI extends JFrame implements try { System.out.println("userID in editimageuploader is : "+person.verantwortlicher.getUserID()); - if(client.userIsImageAdmin(Image.image.getImageId(), SessionData.session.getAuthToken(),person.verantwortlicher.getUserID()) == true) + if(ThriftManager.getSatClient().userIsImageAdmin(Image.image.getImageId(), SessionData.session.getAuthToken(),person.verantwortlicher.getUserID()) == true) { //user is admin and may change permissions PermissionEditImage_GUI ei = new PermissionEditImage_GUI(c); @@ -624,7 +620,7 @@ public class FTPEditUploader_GUI extends JFrame implements try { //LOGGER.info("Getting FTP-User..."); - user = client.getFtpUser(SessionData.session.getAuthToken()); + user = ThriftManager.getSatClient().getFtpUser(SessionData.session.getAuthToken()); LOGGER.info("Received FTP user."); //LOGGER.debug("FTP name: " + user.userName); //LOGGER.debug("FTP path: " + user.path); @@ -727,7 +723,7 @@ public class FTPEditUploader_GUI extends JFrame implements LOGGER.debug("New file uploaded and new filename is set"); //LOGGER.debug("(NOT NULL) new FileName is '"+Image.image.getNewName()+"', imagepath="+ Image.image.getImagepath()); - client.updateImageData( + ThriftManager.getSatClient().updateImageData( Image.image.getImagename(), Image.image.getImagename(), Image.image.getDesc(), @@ -746,14 +742,14 @@ public class FTPEditUploader_GUI extends JFrame implements SessionData.session.getAuthToken() ); if (fileupload == true) { - client.startFileCopy(Image.image.getNewName(),SessionData.session.getAuthToken()); + ThriftManager.getSatClient().startFileCopy(Image.image.getNewName(),SessionData.session.getAuthToken()); } } else { //no new file uploaded and old file name stays //LOGGER.debug("(NULL) newName is '"+Image.image.getNewName()+"', imagepath="+ Image.image.getImagepath()); LOGGER.debug("old file should remain"); - client.updateImageData( + ThriftManager.getSatClient().updateImageData( Image.image.getImagename(), Image.image.getImagename(), Image.image.getDesc(), @@ -773,7 +769,7 @@ public class FTPEditUploader_GUI extends JFrame implements ); if (fileupload == true) { - client.startFileCopy(Image.image.getNewName(),SessionData.session.getAuthToken()); + ThriftManager.getSatClient().startFileCopy(Image.image.getNewName(),SessionData.session.getAuthToken()); // client.startFileCopy(Image.image.getImagename()); } } @@ -781,7 +777,7 @@ public class FTPEditUploader_GUI extends JFrame implements // remove all additional user permissions on first stage - client.deleteAllAdditionalImagePermissions(Image.image.getImageId(),SessionData.session.getAuthToken(),person.verantwortlicher.getUserID()); + ThriftManager.getSatClient().deleteAllAdditionalImagePermissions(Image.image.getImageId(),SessionData.session.getAuthToken(),person.verantwortlicher.getUserID()); // then, add user permissions as they have been set new for (int i = 0; i < RightsManagement.rightsManagement.getPermittedUserList().size(); i++) @@ -795,7 +791,7 @@ public class FTPEditUploader_GUI extends JFrame implements + RightsManagement.rightsManagement.getPermittedUserList().size()); */ - client.writeAdditionalImageRights(Image.image.getImageId(), + ThriftManager.getSatClient().writeAdditionalImageRights(Image.image.getImageId(), RightsManagement.rightsManagement.getPermittedUserList().get(i).getUserID(), RightsManagement.rightsManagement.getPermittedUserList().get(i).isImageRead(), RightsManagement.rightsManagement.getPermittedUserList().get(i).isImageWrite(), diff --git a/dozentenmodul/src/main/java/gui/image/FTPSearchDownloader_GUI.java b/dozentenmodul/src/main/java/gui/image/FTPSearchDownloader_GUI.java index 823d8894..0cb63429 100644 --- a/dozentenmodul/src/main/java/gui/image/FTPSearchDownloader_GUI.java +++ b/dozentenmodul/src/main/java/gui/image/FTPSearchDownloader_GUI.java @@ -42,10 +42,9 @@ import models.person; import org.apache.log4j.Logger; import org.apache.thrift.TException; -import org.openslx.sat.thrift.iface.Server.Client; import org.openslx.sat.thrift.iface.User; -import thrift.ThriftConnection; +import thrift.ThriftManager; import util.OpenLinks; import config.Config; import ftp.DownloadTask; @@ -81,8 +80,6 @@ public class FTPSearchDownloader_GUI extends JFrame implements long bytesread; JLabel lblZeit; boolean taskrun = false; - ThriftConnection con = new ThriftConnection(); - Client client = models.Client.clientcon.getClient(); JButton btnZurck = new JButton("Zurück"); JButton btnDownloadStarten = new JButton("Download starten"); JButton btnMainMenu = new JButton("Hauptmenü"); @@ -122,16 +119,15 @@ public class FTPSearchDownloader_GUI extends JFrame implements if (choice == 0) { try { - client.DeleteFtpUser(user.userName,SessionData.session.getAuthToken()); + ThriftManager.getSatClient().DeleteFtpUser(user.userName,SessionData.session.getAuthToken()); try { - client.setSessionInvalid(SessionData.session.getAuthToken()); + ThriftManager.getSatClient().setSessionInvalid(SessionData.session.getAuthToken()); } catch (TException e1) { // TODO Auto-generated catch block e1.printStackTrace(); } - con.closeThriftConnection(); try { - client.setSessionInvalid(SessionData.session.getAuthToken()); + ThriftManager.getSatClient().setSessionInvalid(SessionData.session.getAuthToken()); } catch (TException e1) { // TODO Auto-generated catch block e1.printStackTrace(); @@ -147,7 +143,7 @@ public class FTPSearchDownloader_GUI extends JFrame implements } else { // no download running, close window try { - client.setSessionInvalid(SessionData.session.getAuthToken()); + ThriftManager.getSatClient().setSessionInvalid(SessionData.session.getAuthToken()); } catch (TException e1) { // TODO Auto-generated catch block e1.printStackTrace(); @@ -432,7 +428,7 @@ public class FTPSearchDownloader_GUI extends JFrame implements isAborted = true; // set flag try { - client.DeleteFtpUser(user.userName,SessionData.session.getAuthToken()); + ThriftManager.getSatClient().DeleteFtpUser(user.userName,SessionData.session.getAuthToken()); LOGGER.info("Deleted FTP user."); } catch (TException e1) { // TODO Auto-generated catch block @@ -472,7 +468,7 @@ public class FTPSearchDownloader_GUI extends JFrame implements if (choice == 0) { task.cancel(true); try { - client.DeleteFtpUser(user.userName,SessionData.session.getAuthToken()); + ThriftManager.getSatClient().DeleteFtpUser(user.userName,SessionData.session.getAuthToken()); } catch (TException e1) { // TODO Auto-generated catch block e1.printStackTrace(); @@ -534,11 +530,11 @@ public class FTPSearchDownloader_GUI extends JFrame implements // Klick btnDownloadStarten.setText("Bitte warten"); try { - user = client.getFtpUser(SessionData.session.getAuthToken()); + user = ThriftManager.getSatClient().getFtpUser(SessionData.session.getAuthToken()); downloadFile = user.path + "/" - + client.getPathOfImage(Image.image.getImageId(), + + ThriftManager.getSatClient().getPathOfImage(Image.image.getImageId(), Image.image.getVersion(),SessionData.session.getAuthToken()); } catch (TException e) { diff --git a/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java b/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java index 7ebd604d..3ad45213 100644 --- a/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java +++ b/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java @@ -61,9 +61,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; //import models.person; @@ -116,10 +115,6 @@ public class SearchEditImage_GUI extends JFrame { + "Klicken Sie auf \"Weiter\" um das Image für weitere Schritte auszuwählen." + "</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) { @@ -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<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++) { @@ -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<org.openslx.sat.thrift.iface.Image> 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<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")))); @@ -850,7 +843,7 @@ public class SearchEditImage_GUI extends JFrame { textAreadesc.setText(res.get("desc")); res.clear(); - 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++) { @@ -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." +
"</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++)
{
|