From 0ed4549c028e2523534a09fd6e41c49c9d178ec1 Mon Sep 17 00:00:00 2001 From: Michael Wilson Date: Mon, 27 Oct 2014 18:13:20 +0100 Subject: Sämtliche Logik und Grafiken zur Vergabe und Verwaltung von Berechtigungen eingeführt. Kleinere Bugs sind bekannt, werden aktuell behoben --- .../java/gui/image/PermissionEditImage_GUI.java | 90 +++++++++++----------- 1 file changed, 45 insertions(+), 45 deletions(-) (limited to 'dozentenmodul/src/main/java/gui/image/PermissionEditImage_GUI.java') diff --git a/dozentenmodul/src/main/java/gui/image/PermissionEditImage_GUI.java b/dozentenmodul/src/main/java/gui/image/PermissionEditImage_GUI.java index 9ab70a5f..8de41289 100644 --- a/dozentenmodul/src/main/java/gui/image/PermissionEditImage_GUI.java +++ b/dozentenmodul/src/main/java/gui/image/PermissionEditImage_GUI.java @@ -1,6 +1,7 @@ package gui.image; import gui.intro.About_GUI; +import gui.intro.ListAllOtherUsers_GUI; import gui.intro.MainMenue_GUI; import java.awt.Color; @@ -25,7 +26,6 @@ import java.util.List; import javax.swing.AbstractButton; import javax.swing.DefaultComboBoxModel; import javax.swing.JButton; -import javax.swing.JCheckBox; import javax.swing.JComboBox; import javax.swing.JFrame; import javax.swing.JLabel; @@ -37,7 +37,6 @@ import javax.swing.JPanel; import javax.swing.JScrollPane; import javax.swing.JSeparator; import javax.swing.JTable; -import javax.swing.JTextField; import javax.swing.JTextPane; import javax.swing.ScrollPaneConstants; import javax.swing.UIManager; @@ -48,21 +47,24 @@ import javax.swing.table.DefaultTableModel; import javax.swing.table.TableCellRenderer; import javax.swing.table.TableColumn; -import org.apache.thrift.TException; - import models.Image; import models.Links; import models.RightsManagement; import models.person; + +import org.apache.log4j.Logger; +import org.apache.thrift.TException; + import server.generated.Person; import server.generated.Server.Client; import util.CheckIntegrity; -import util.GuiOrganizer; import util.OpenLinks; @SuppressWarnings("serial") public class PermissionEditImage_GUI extends JFrame { - + + private final static Logger LOGGER = Logger + .getLogger(PermissionCreateImage_GUI.class); Client client = models.Client.clientcon.getClient(); private final JPanel contentPanel = new JPanel(); String[] result; @@ -156,7 +158,7 @@ public class PermissionEditImage_GUI extends JFrame { JPanel panel_1 = new JPanel(); panel_1.setBackground(SystemColor.menu); - panel_1.setBorder(new TitledBorder(null, "Berechtigungen", + panel_1.setBorder(new TitledBorder(null, "Weitere Berechtigungen", TitledBorder.LEADING, TitledBorder.TOP, null, null)); panel_1.setBounds(10, 170, 557, 354); contentPanel.add(panel_1); @@ -165,7 +167,7 @@ public class PermissionEditImage_GUI extends JFrame { JScrollPane scrollPane = new JScrollPane(); scrollPane .setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); - scrollPane.setBounds(10, 21, 537, 228); + scrollPane.setBounds(10, 21, 537, 185); panel_1.add(scrollPane); table = new JTable(); @@ -314,6 +316,39 @@ public class PermissionEditImage_GUI extends JFrame { comboBox_1.setSelectedIndex(Image.image.getShareMode()); comboBox_1.setBounds(270, 30, 250, 20); panel_2.add(comboBox_1); + + JButton btnAddUser = new JButton("Hinzufügen..."); + btnAddUser.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + //show list of all other relevant users + ListAllOtherUsers_GUI lu = new ListAllOtherUsers_GUI(c, table, 5); //give access to the table model and inform that the userID is position 5 in the model + lu.setVisible(true); + + } + }); + btnAddUser.setBounds(10, 217, 113, 23); + panel_1.add(btnAddUser); + + JButton btnDeleteUser = new JButton("Löschen"); + btnDeleteUser.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + + + // delete selected users from table + int[] deletableRows= table.getSelectedRows(); + int pointerCorrection=0; //after deleting a row, the length of selected rows is reduced by 1. This pointer counts the already deleted rows and correct the offset of i + LOGGER.info("deletabelRows.length="+deletableRows.length); + + for (int i=0; i