diff options
Diffstat (limited to 'dozentenmodul/src/main/java/gui/lecture/EditLectureSearch_GUI.java')
| -rw-r--r-- | dozentenmodul/src/main/java/gui/lecture/EditLectureSearch_GUI.java | 30 |
1 files changed, 9 insertions, 21 deletions
diff --git a/dozentenmodul/src/main/java/gui/lecture/EditLectureSearch_GUI.java b/dozentenmodul/src/main/java/gui/lecture/EditLectureSearch_GUI.java index a3119b79..3f2da363 100644 --- a/dozentenmodul/src/main/java/gui/lecture/EditLectureSearch_GUI.java +++ b/dozentenmodul/src/main/java/gui/lecture/EditLectureSearch_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; @SuppressWarnings("serial") @@ -89,8 +88,6 @@ public class EditLectureSearch_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(); private static final String HELP_MESSAGE = "<html><div align=\"center\">" + "Suchen Sie hier Ihre Veranstaltungen und wählen Sie sie für weitere Schritte aus.<br />" + "Klicken Sie anschließend auf \"Weiter\", um die Details der Veranstaltung sowie die Berechtigungen zu ändern." @@ -105,7 +102,7 @@ public class EditLectureSearch_GUI extends JFrame { final TableRowSorter<TableModel> rowSorterMyLectures = new TableRowSorter<TableModel>( modelMyLectures); - RowFilter rf = null; + RowFilter<Object, Object> rf = null; List<RowFilter<Object, Object>> filters = new ArrayList<RowFilter<Object, Object>>( 2); @@ -123,12 +120,11 @@ public class EditLectureSearch_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); } @@ -392,8 +388,6 @@ public class EditLectureSearch_GUI extends JFrame { JButton btnContinue = new JButton("Weiter"); btnContinue.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { - String username = person.verantwortlicher.getName() - + " " + person.verantwortlicher.getVorname(); // check if a row is selected if (tablemyLectures.getSelectedRow() != -1) { @@ -598,14 +592,11 @@ public class EditLectureSearch_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) { @@ -619,14 +610,11 @@ public class EditLectureSearch_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) { @@ -670,10 +658,10 @@ public class EditLectureSearch_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.getLectureListPermissionWrite(SessionData.session.getAuthToken()); + lectures = ThriftManager.getSatClient().getLectureListPermissionWrite(SessionData.session.getAuthToken()); } Iterator<org.openslx.sat.thrift.iface.Lecture> i = lectures.iterator(); @@ -732,7 +720,7 @@ public class EditLectureSearch_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")); @@ -750,7 +738,7 @@ public class EditLectureSearch_GUI extends JFrame { try { // get values from server and set them in model - map = client.getItemOwner(lectureid,SessionData.session.getAuthToken()); + map = ThriftManager.getSatClient().getItemOwner(lectureid,SessionData.session.getAuthToken()); ItemOwner.itemOwner.setUserID(map.get("userID")); ItemOwner.itemOwner.setUsername(map.get("loginName")); |