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!!! --- .../gui/lecture/PermissionEditLecture_GUI.java | 79 ++-------------------- 1 file changed, 5 insertions(+), 74 deletions(-) (limited to 'dozentenmodul/src/main/java/gui/lecture/PermissionEditLecture_GUI.java') diff --git a/dozentenmodul/src/main/java/gui/lecture/PermissionEditLecture_GUI.java b/dozentenmodul/src/main/java/gui/lecture/PermissionEditLecture_GUI.java index ab53c43d..5eb40b0b 100644 --- a/dozentenmodul/src/main/java/gui/lecture/PermissionEditLecture_GUI.java +++ b/dozentenmodul/src/main/java/gui/lecture/PermissionEditLecture_GUI.java @@ -42,7 +42,6 @@ import javax.swing.UnsupportedLookAndFeelException; import javax.swing.border.EmptyBorder; import javax.swing.border.TitledBorder; import javax.swing.table.DefaultTableModel; -import javax.swing.table.TableCellRenderer; import javax.swing.table.TableColumn; import models.Lecture; @@ -53,8 +52,8 @@ import models.person; import org.apache.thrift.TException; import org.openslx.sat.thrift.iface.Person; -import org.openslx.sat.thrift.iface.Server.Client; +import thrift.ThriftManager; import util.CheckIntegrity; import util.ListAllOtherUsers_GUI; import util.OpenLinks; @@ -62,7 +61,6 @@ import util.OpenLinks; @SuppressWarnings("serial") public class PermissionEditLecture_GUI extends JFrame { - Client client = models.Client.clientcon.getClient(); private final JPanel contentPanel = new JPanel(); String[] result; private JTable table; @@ -102,7 +100,7 @@ public class PermissionEditLecture_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(); @@ -229,7 +227,7 @@ public class PermissionEditLecture_GUI extends JFrame { //System.out.println("Loading data from db"); try { - map = client.getPermissionForUserAndLecture( + map = ThriftManager.getSatClient().getPermissionForUserAndLecture( SessionData.session.getAuthToken(),Lecture.lecture.getid(),person.verantwortlicher.getUserID() ); Iterator i = map.iterator(); @@ -268,9 +266,7 @@ public class PermissionEditLecture_GUI extends JFrame { .getPermittedUserList(); Iterator i = listt.iterator(); - int x = 0; while (i.hasNext()) { - // System.out.println("current pos=" + x); // erzeuge Objekte fuer die Tabelle person temp = i.next(); @@ -286,7 +282,6 @@ public class PermissionEditLecture_GUI extends JFrame { // + temp.isLecture_admin() + ", " + temp.getUserID()); // Fuege diese Objekte der Tabelle hinzu model.addRow(obj); - x++; } }// end set list of permitted users @@ -294,7 +289,6 @@ public class PermissionEditLecture_GUI extends JFrame { // Boolean(false),new Boolean(false),new Boolean(false)}; // model.addRow(rowdata); - TableCellRenderer rend = table.getTableHeader().getDefaultRenderer(); TableColumn tc1 = table.getColumnModel().getColumn(1); tc1.setCellEditor(table.getDefaultEditor(Boolean.class)); @@ -503,14 +497,11 @@ public class PermissionEditLecture_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) { @@ -524,14 +515,11 @@ public class PermissionEditLecture_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) { @@ -593,8 +581,6 @@ public class PermissionEditLecture_GUI extends JFrame { // save the entered rights into the model and prepare them to be written to // the database private void saveTableToList() { - //System.out.println("Saving Table to List"); - List list = new ArrayList(); int seperatorIndex = 0; @@ -608,22 +594,6 @@ public class PermissionEditLecture_GUI extends JFrame { seperatorIndex = table.getModel().getValueAt(i, 0).toString() .indexOf(","); - //LOGGER.info(table.getModel().getValueAt(i, 4).toString() - // + " (userID)\t" - // + Boolean.parseBoolean(table.getModel().getValueAt(i, 3) - // .toString()) - // + "(admin)\t" - // + Boolean.parseBoolean(table.getModel().getValueAt(i, 2) - // .toString()) - // + "(write)\t" - // + Boolean.parseBoolean(table.getModel().getValueAt(i, 1) - // .toString()) - // + "(read)\t" - // + table.getModel().getValueAt(i, 0).toString() - // .substring(0, seperatorIndex) - // + "(Nachname)\t" - // + table.getModel().getValueAt(i, 0).toString() - // .substring(seperatorIndex + 2) + "(Vorname)"); temp.setUserID(table.getModel().getValueAt(i, 4).toString()); // get // userID @@ -651,10 +621,6 @@ public class PermissionEditLecture_GUI extends JFrame { } } - //for (int y = 0; y < list.size(); y++) { - // System.out.println("" + list.get(y).getName()); - //} - RightsManagement.rightsManagement.setPermittedUserList(list); }// end saveTableToList() @@ -712,38 +678,3 @@ public class PermissionEditLecture_GUI extends JFrame { } } } -/* - * class CheckBoxHeader extends JCheckBox implements TableCellRenderer, - * MouseListener { protected CheckBoxHeader rendererComponent; protected int - * column; protected boolean mousePressed = false; - * - * public CheckBoxHeader(ItemListener itemListener ,String text) { - * rendererComponent = this; rendererComponent.addItemListener(itemListener); - * rendererComponent.setText(text); } - * - * public Component getTableCellRendererComponent( JTable table, Object value, - * boolean isSelected, boolean hasFocus, int row, int column) { if (table != - * null) { JTableHeader header = table.getTableHeader(); if (header != null) { - * rendererComponent.setForeground(header.getForeground()); - * rendererComponent.setBackground(header.getBackground()); - * rendererComponent.setFont(header.getFont()); - * rendererComponent.setBorder(header.getBorder()); - * header.addMouseListener(rendererComponent); } } setColumn(column); - * //rendererComponent.setText("Check All"); - * //setBorder(UIManager.getBorder("TableHeader.cellBorder")); - * - * return rendererComponent; } protected void setColumn(int column) { - * this.column = column; } public int getColumn() { return column; } protected - * void handleClickEvent(MouseEvent e) { if (mousePressed) { mousePressed=false; - * JTableHeader header = (JTableHeader)(e.getSource()); JTable tableView = - * header.getTable(); TableColumnModel columnModel = tableView.getColumnModel(); - * int viewColumn = columnModel.getColumnIndexAtX(e.getX()); int column = - * tableView.convertColumnIndexToModel(viewColumn); - * - * if (viewColumn == this.column && e.getClickCount() == 1 && column != -1) { - * doClick(); } } } public void mouseClicked(MouseEvent e) { - * handleClickEvent(e); ((JTableHeader)e.getSource()).repaint(); } public void - * mousePressed(MouseEvent e) { mousePressed = true; } public void - * mouseReleased(MouseEvent e) { } public void mouseEntered(MouseEvent e) { } - * public void mouseExited(MouseEvent e) { } } - */ -- cgit v1.2.3-55-g7522