diff options
Diffstat (limited to 'dozentenmodul/src/main/java')
9 files changed, 215 insertions, 181 deletions
diff --git a/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java b/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java index 9d65d42e..af126285 100644 --- a/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java +++ b/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java @@ -115,7 +115,7 @@ public class FTPCreateUploader_GUI extends JFrame implements /** * Create the frame. */ - public FTPCreateUploader_GUI(final Component formerGUI) { + public FTPCreateUploader_GUI(Component formerGUI) { final Object[] options = { "Beenden", "Abbrechen" }; @@ -466,13 +466,12 @@ public class FTPCreateUploader_GUI extends JFrame implements "Abbrechen und zurück", JOptionPane.YES_NO_OPTION); if (selectedOption == JOptionPane.YES_OPTION) { - System.out.println("CreateUploader X:"+formerGUI.getLocation().getX()); - System.out.println("CreateUploader X:"+formerGUI.getLocation().getY()); - dispose(); - PermissionCreateImage_GUI m = new PermissionCreateImage_GUI(formerGUI); - m.setLocationRelativeTo(formerGUI); - + //System.out.println("CreateUploader X:"+formerGUI.getLocation().getX()); + //System.out.println("CreateUploader X:"+formerGUI.getLocation().getY()); + PermissionCreateImage_GUI m = new PermissionCreateImage_GUI(c); + //m.setLocationRelativeTo(formerGUI); m.setVisible(true); + dispose(); } else { // for actions if "no" is selected. tbd. diff --git a/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java b/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java index 89be34ca..9f2d59c4 100644 --- a/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java +++ b/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java @@ -38,6 +38,7 @@ import javax.swing.SwingConstants; import javax.swing.UIManager; import javax.swing.UnsupportedLookAndFeelException; import javax.swing.border.EmptyBorder; +import javax.swing.filechooser.FileNameExtensionFilter; import models.Image; import models.Links; @@ -180,6 +181,8 @@ public class FTPEditUploader_GUI extends JFrame implements public void actionPerformed(ActionEvent arg0) { fc = new JFileChooser(Config.getLastUploadPath()); fc.setFileSelectionMode(JFileChooser.FILES_ONLY); + FileNameExtensionFilter filter = new FileNameExtensionFilter("VMDK-Container", "vmdk"); + fc.setFileFilter(filter); fc.showOpenDialog(getParent()); File file = fc.getSelectedFile(); @@ -476,13 +479,10 @@ public class FTPEditUploader_GUI extends JFrame implements menuItem.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) { // TODO Auto-generated catch block e.printStackTrace(); @@ -497,13 +497,10 @@ public class FTPEditUploader_GUI extends JFrame implements menuItem_1.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) { // TODO Auto-generated catch block e.printStackTrace(); diff --git a/dozentenmodul/src/main/java/gui/image/PermissionCreateImage_GUI.java b/dozentenmodul/src/main/java/gui/image/PermissionCreateImage_GUI.java index a877cc59..f68b9926 100644 --- a/dozentenmodul/src/main/java/gui/image/PermissionCreateImage_GUI.java +++ b/dozentenmodul/src/main/java/gui/image/PermissionCreateImage_GUI.java @@ -1,8 +1,8 @@ package gui.image; import gui.intro.About_GUI; -import gui.intro.Login_GUI; import gui.intro.MainMenue_GUI; + import java.awt.Color; import java.awt.Component; import java.awt.FlowLayout; @@ -22,6 +22,7 @@ import java.net.URISyntaxException; import java.util.ArrayList; import java.util.Iterator; import java.util.List; + import javax.swing.AbstractButton; import javax.swing.DefaultComboBoxModel; import javax.swing.JButton; @@ -49,26 +50,24 @@ import javax.swing.table.JTableHeader; import javax.swing.table.TableCellRenderer; import javax.swing.table.TableColumn; import javax.swing.table.TableColumnModel; + 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.Person; import server.generated.Server.Client; -import util.GuiOrganizer; - +import util.CheckIntegrity; import util.OpenLinks; -import java.beans.PropertyChangeListener; -import java.beans.PropertyChangeEvent; @SuppressWarnings("serial") public class PermissionCreateImage_GUI extends JFrame { - private final static Logger LOGGER = Logger.getLogger(Login_GUI.class); + private final static Logger LOGGER = Logger.getLogger(PermissionCreateImage_GUI.class); Client client = models.Client.clientcon.getClient(); private final JPanel contentPanel = new JPanel(); String[] result; @@ -108,8 +107,6 @@ public class PermissionCreateImage_GUI extends JFrame { private JLabel lblWriteDesc; private JLabel lblAdminDesc; private JLabel lblLinkallowedDesc; - private JCheckBox chckbxFrAlleSichtbar; - private JLabel lblFuerAlleSichtbar; private static final String HELP_MESSAGE = "<html><div align=\"center\">" + "Legen Sie fest, welche Personen welche Rechte an Ihrem Image haben.<br />" + "Sie können die Rechte read, write, link und admin vergeben.<br />" + @@ -144,10 +141,10 @@ public class PermissionCreateImage_GUI extends JFrame { //System.out.println("formergui X oben:"+formerGUI.getLocation().getX()); //System.out.println("formergui Y oben:"+formerGUI.getLocation().getY()); - System.out.println("this oben: "+this.getLocation().getX()); - System.out.println("this oben: "+this.getLocation().getY()); + //System.out.println("this oben: "+this.getLocation().getX()); + //System.out.println("this oben: "+this.getLocation().getY()); - System.out.println("------------------------------------------"); + //System.out.println("------------------------------------------"); getContentPane().setLayout(null); { @@ -182,27 +179,31 @@ public class PermissionCreateImage_GUI extends JFrame { panel_1.setBackground(SystemColor.menu); panel_1.setBorder(new TitledBorder(null, "Berechtigungen", TitledBorder.LEADING, TitledBorder.TOP, null, null)); - panel_1.setBounds(10, 228, 557, 292); + panel_1.setBounds(10, 202, 557, 318); contentPanel.add(panel_1); panel_1.setLayout(null); JScrollPane scrollPane = new JScrollPane(); scrollPane .setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); - scrollPane.setBounds(10, 21, 537, 170); + scrollPane.setBounds(10, 21, 537, 195); panel_1.add(scrollPane); table = new JTable(); - table.addMouseListener(new MouseAdapter() { + table.addMouseListener(new MouseAdapter() + { @Override - public void mouseClicked(MouseEvent e) { - System.out.println("Mouse clicked"); + public void mouseClicked(MouseEvent e) + { + checkIntegrity(-1); } + }); table.setModel(model); table.setSelectionForeground(Color.WHITE); + // invisible attribute userID for identifying selected user table.getColumnModel().getColumn(5).setWidth(0); table.getColumnModel().getColumn(5).setMinWidth(0); @@ -315,7 +316,7 @@ public class PermissionCreateImage_GUI extends JFrame { panel.setBorder(new TitledBorder(null, "Freigabe", TitledBorder.LEADING, TitledBorder.TOP, null, null)); panel.setBackground(SystemColor.menu); - panel.setBounds(10, 201, 537, 80); + panel.setBounds(10, 227, 537, 80); panel_1.add(panel); JLabel label = new JLabel("Freigabemodus:"); @@ -386,7 +387,7 @@ public class PermissionCreateImage_GUI extends JFrame { panel_2.setBackground(SystemColor.menu); panel_2.setBorder(new TitledBorder(null, "Beschreibung", TitledBorder.LEADING, TitledBorder.TOP, null, null)); - panel_2.setBounds(10, 67, 557, 150); + panel_2.setBounds(10, 67, 557, 124); contentPanel.add(panel_2); panel_2.setLayout(null); @@ -425,14 +426,6 @@ public class PermissionCreateImage_GUI extends JFrame { "Erzeugung einer Veranstaltung auf ein Image ist erlaubt."); lblLinkallowedDesc.setBounds(120, 58, 380, 20); panel_2.add(lblLinkallowedDesc); - - chckbxFrAlleSichtbar = new JCheckBox(""); - chckbxFrAlleSichtbar.setBounds(115, 119, 21, 23); - panel_2.add(chckbxFrAlleSichtbar); - - lblFuerAlleSichtbar = new JLabel("Für alle sichtbar"); - lblFuerAlleSichtbar.setBounds(20, 120, 90, 20); - panel_2.add(lblFuerAlleSichtbar); { JPanel buttonPane = new JPanel(); buttonPane.setBounds(0, 640, 597, 33); @@ -458,6 +451,13 @@ public class PermissionCreateImage_GUI extends JFrame { JButton continueButton = new JButton("Weiter"); continueButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { + + //before save, check integrity to avoid dblClick errors of rights + for(int i = 0; i < table.getRowCount(); i++) + { + checkIntegrity(i); //check integrity of each line again + System.out.println("in auto-correct"); + } saveTableToList(); @@ -565,6 +565,36 @@ public class PermissionCreateImage_GUI extends JFrame { //System.out.println("this on screen unten X: "+this.getLocationOnScreen().getX()); //System.out.println("this on screen unten Y: "+this.getLocationOnScreen().getY()); } + + private void checkIntegrity(int row) + { + + int selectedRow; + + if(row == -1) + { + selectedRow = table.getSelectedRow(); + } + else + { + selectedRow = row; + } + + boolean isRead, isWrite, isLink, isAdmin; + + //collect all row data + isRead = (boolean) table.getValueAt(selectedRow, 1); + isWrite = (boolean) table.getValueAt(selectedRow, 2); + isLink = (boolean) table.getValueAt(selectedRow, 3); + isAdmin = (boolean) table.getValueAt(selectedRow, 4); + + boolean[] checkedVals = CheckIntegrity.isIntegre(isRead, isWrite, isLink, isAdmin); + + table.setValueAt(checkedVals[0], selectedRow, 1); + table.setValueAt(checkedVals[1], selectedRow, 2); + table.setValueAt(checkedVals[2], selectedRow, 3); + table.setValueAt(checkedVals[3], selectedRow, 4); + } // Read column class MyItemListener1 implements ItemListener { diff --git a/dozentenmodul/src/main/java/gui/image/PermissionEditImage_GUI.java b/dozentenmodul/src/main/java/gui/image/PermissionEditImage_GUI.java index a8ddaf03..de7e4129 100644 --- a/dozentenmodul/src/main/java/gui/image/PermissionEditImage_GUI.java +++ b/dozentenmodul/src/main/java/gui/image/PermissionEditImage_GUI.java @@ -146,14 +146,14 @@ public class PermissionEditImage_GUI extends JFrame { panel_1.setBackground(SystemColor.menu); panel_1.setBorder(new TitledBorder(null, "Berechtigungen", TitledBorder.LEADING, TitledBorder.TOP, null, null)); - panel_1.setBounds(10, 228, 557, 292); + panel_1.setBounds(10, 202, 557, 318); contentPanel.add(panel_1); panel_1.setLayout(null); JScrollPane scrollPane = new JScrollPane(); scrollPane .setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); - scrollPane.setBounds(10, 21, 537, 170); + scrollPane.setBounds(10, 21, 537, 195); panel_1.add(scrollPane); table = new JTable(); @@ -201,7 +201,7 @@ public class PermissionEditImage_GUI extends JFrame { panel_2.setLayout(null); panel_2.setBorder(new TitledBorder(null, "Freigabe", TitledBorder.LEADING, TitledBorder.TOP, null, null)); panel_2.setBackground(SystemColor.menu); - panel_2.setBounds(10, 201, 537, 80); + panel_2.setBounds(10, 227, 537, 80); panel_1.add(panel_2); JLabel label_7 = new JLabel("Freigabemodus:"); @@ -266,7 +266,7 @@ public class PermissionEditImage_GUI extends JFrame { contentPanel.add(comboBox); JPanel panel = new JPanel(); - panel.setBounds(10, 67, 557, 150); + panel.setBounds(10, 67, 557, 124); contentPanel.add(panel); panel.setLayout(null); panel.setBorder(new TitledBorder(null, "Beschreibung", @@ -306,14 +306,6 @@ public class PermissionEditImage_GUI extends JFrame { lblvolleRechteRead = new JLabel("<HTML>Volle Rechte: read, write, löschen, Link und<br>Berechtigungen für andere Benutzer festlegen.</HTML>"); lblvolleRechteRead.setBounds(120, 78, 380, 40); panel.add(lblvolleRechteRead); - - JLabel label_4 = new JLabel("Für alle sichtbar"); - label_4.setBounds(20, 120, 90, 20); - panel.add(label_4); - - JCheckBox checkBox = new JCheckBox(""); - checkBox.setBounds(115, 120, 21, 23); - panel.add(checkBox); { JPanel buttonPane = new JPanel(); buttonPane.setBounds(0, 640, 597, 33); diff --git a/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java b/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java index b4e39134..e92b04b0 100644 --- a/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java +++ b/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java @@ -941,7 +941,7 @@ public class SearchEditImage_GUI extends JFrame { labelName.setText(res.get("name")); labelOS.setText(res.get("os")); labelUpdate.setText(out.format(in.parse(res.get("lastupdate")))); - labelVerantwortlicher.setText(res.get("owner")); + labelVerantwortlicher.setText(res.get("owner") + " (" + res.get("mail") + ")"); labelWeitereVerantwortliche.setText("Noch nicht Verfügbar"); if (res.get("template").equals("true")) { labelVorlage.setText("Ja"); diff --git a/dozentenmodul/src/main/java/gui/lecture/CreateLectureAllgemein_GUI.java b/dozentenmodul/src/main/java/gui/lecture/CreateLectureAllgemein_GUI.java index a46431bc..be4a25a4 100644 --- a/dozentenmodul/src/main/java/gui/lecture/CreateLectureAllgemein_GUI.java +++ b/dozentenmodul/src/main/java/gui/lecture/CreateLectureAllgemein_GUI.java @@ -388,8 +388,6 @@ public class CreateLectureAllgemein_GUI extends JFrame { Lecture.lecture.setDesc(description.getText()); Lecture.lecture.setEnddate(dateChooserend.getDate()); Lecture.lecture.setStartdate(dateChooserstart.getDate()); - Image.image.setImagename(txtFldVeranstaltungsname - .getText()); MainMenue_GUI sr = new MainMenue_GUI(c); sr.setVisible(true); @@ -471,9 +469,6 @@ public class CreateLectureAllgemein_GUI extends JFrame { Lecture.lecture.setStartdate(dateChooserstart .getDate()); - Image.image.setImagename(txtFldVeranstaltungsname - .getText()); - PermissionCreateLecture_GUI ev = new PermissionCreateLecture_GUI(c); ev.setVisible(true); dispose(); diff --git a/dozentenmodul/src/main/java/gui/lecture/PermissionCreateLecture_GUI.java b/dozentenmodul/src/main/java/gui/lecture/PermissionCreateLecture_GUI.java index 74df74ff..d449ddcf 100644 --- a/dozentenmodul/src/main/java/gui/lecture/PermissionCreateLecture_GUI.java +++ b/dozentenmodul/src/main/java/gui/lecture/PermissionCreateLecture_GUI.java @@ -51,16 +51,21 @@ import javax.swing.table.TableCellRenderer; import javax.swing.table.TableColumn; import javax.swing.table.TableColumnModel; +import org.apache.log4j.Logger; + import models.Links; import util.OpenLinks; @SuppressWarnings("serial") public class PermissionCreateLecture_GUI extends JFrame { + // Logger for this class + private final static Logger LOGGER = Logger.getLogger(PermissionCreateLecture_GUI.class); + private final JPanel contentPanel = new JPanel(); String[] result; - private JTable table; private Class[] classes; + private JTable table; Object[] titles = { "Name","Read", "Write","Admin"}; Component c = null; private static final String HELP_MESSAGE = "<html><div align=\"center\">" + @@ -92,7 +97,6 @@ public class PermissionCreateLecture_GUI extends JFrame { }; private JTextField textField; - private JTable table_1; private final ButtonGroup buttonGroup = new ButtonGroup(); public PermissionCreateLecture_GUI(Component formerGUI) { @@ -142,28 +146,11 @@ public class PermissionCreateLecture_GUI extends JFrame { contentPanel.setBorder(new EmptyBorder(5, 5, 5, 5)); getContentPane().add(contentPanel); contentPanel.setLayout(null); - - JPanel panel_1 = new JPanel(); - panel_1.setBackground(SystemColor.menu); - panel_1.setBorder(new TitledBorder(null, "Suite-Berechtigungen", TitledBorder.LEADING, TitledBorder.TOP, null, null)); - panel_1.setBounds(10, 207, 311, 313); - contentPanel.add(panel_1); - panel_1.setLayout(null); - - JScrollPane scrollPane = new JScrollPane(); - scrollPane.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); - scrollPane.setBounds(10, 21, 291, 249); - panel_1.add(scrollPane); - - table = new JTable(); - table.setModel(model); - table.setSelectionForeground(Color.WHITE); Object[] rowdata={"Max Mustermann", new Boolean(false),new Boolean(false),new Boolean(false),new Boolean(false)}; model.addRow(rowdata); - - TableCellRenderer rend=table.getTableHeader().getDefaultRenderer(); - + // table wird hier nie initialisiert und ist entsprechend null + if (table == null) LOGGER.error("NPE incoming..."); TableColumn tc1 = table.getColumnModel().getColumn(1); tc1.setCellEditor(table.getDefaultEditor(Boolean.class)); tc1.setCellRenderer(table.getDefaultRenderer(Boolean.class)); @@ -178,23 +165,10 @@ public class PermissionCreateLecture_GUI extends JFrame { tc3.setCellEditor(table.getDefaultEditor(Boolean.class)); tc3.setCellRenderer(table.getDefaultRenderer(Boolean.class)); tc3.setHeaderRenderer(new CheckBoxHeader(new MyItemListener3(),(String) titles[3])); - /* - TableColumn tc4 = table.getColumnModel().getColumn(4); - tc4.setCellEditor(table.getDefaultEditor(Boolean.class)); - tc4.setCellRenderer(table.getDefaultRenderer(Boolean.class)); - tc4.setHeaderRenderer(new CheckBoxHeader(new MyItemListener4(),(String) titles[4])); - */ - scrollPane.setViewportView(table); - - JButton btnHinzufgen_1 = new JButton("Hinzufügen"); - btnHinzufgen_1.setEnabled(false); - btnHinzufgen_1.setBounds(10, 279, 89, 23); - panel_1.add(btnHinzufgen_1); - - JButton btnLschen_1 = new JButton("Löschen"); - btnLschen_1.setEnabled(false); - btnLschen_1.setBounds(109, 279, 89, 23); - panel_1.add(btnLschen_1); + + tc1.setHeaderRenderer(new CheckBoxHeader(new MyItemListener1(),(String) titles[1])); + tc2.setHeaderRenderer(new CheckBoxHeader(new MyItemListener2(),(String) titles[2])); + tc3.setHeaderRenderer(new CheckBoxHeader(new MyItemListener3(),(String) titles[3])); JLabel lblHauptmen = new JLabel("Hauptmenü"); lblHauptmen.addMouseListener(new MouseAdapter() { @@ -246,7 +220,7 @@ public class PermissionCreateLecture_GUI extends JFrame { contentPanel.add(comboBox); JPanel panel = new JPanel(); - panel.setBounds(10, 67, 557, 129); + panel.setBounds(10, 67, 557, 148); contentPanel.add(panel); panel.setLayout(null); panel.setBorder(new TitledBorder(null, "Beschreibung", TitledBorder.LEADING, TitledBorder.TOP, null, null)); @@ -276,42 +250,69 @@ public class PermissionCreateLecture_GUI extends JFrame { lblvolleRechteRead.setBounds(120, 78, 380, 40); panel.add(lblvolleRechteRead); + JCheckBox checkBox = new JCheckBox(""); + checkBox.setBounds(115, 118, 21, 23); + panel.add(checkBox); + + JLabel label_4 = new JLabel("Für alle sichtbar"); + label_4.setBounds(20, 119, 90, 20); + panel.add(label_4); + + JPanel panel_1 = new JPanel(); + panel_1.setLayout(null); + panel_1.setBorder(new TitledBorder(null, "Suite-Berechtigungen", TitledBorder.LEADING, TitledBorder.TOP, null, null)); + panel_1.setBackground(SystemColor.menu); + panel_1.setBounds(10, 226, 311, 294); + contentPanel.add(panel_1); + + JScrollPane scrollPane = new JScrollPane(); + scrollPane.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); + scrollPane.setBounds(10, 28, 291, 223); + panel_1.add(scrollPane); + + JButton button = new JButton("Hinzufügen"); + button.setEnabled(false); + button.setBounds(10, 260, 89, 23); + panel_1.add(button); + + JButton button_1 = new JButton("Löschen"); + button_1.setEnabled(false); + button_1.setBounds(109, 260, 89, 23); + panel_1.add(button_1); + JPanel panel_2 = new JPanel(); - panel_2.setBounds(331, 207, 236, 313); - contentPanel.add(panel_2); panel_2.setLayout(null); panel_2.setBorder(new TitledBorder(null, "Sichtbarkeit im VMChooser", TitledBorder.LEADING, TitledBorder.TOP, null, null)); panel_2.setBackground(SystemColor.menu); + panel_2.setBounds(331, 226, 236, 294); + contentPanel.add(panel_2); - final JScrollPane scrollPane_1 = new JScrollPane(); - scrollPane_1.setEnabled(false); + JScrollPane scrollPane_1 = new JScrollPane(); scrollPane_1.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); - scrollPane_1.setBounds(23, 83, 203, 185); + scrollPane_1.setEnabled(false); + scrollPane_1.setBounds(23, 88, 203, 161); panel_2.add(scrollPane_1); - table_1 = new JTable(); - scrollPane_1.setViewportView(table_1); - - JRadioButton rdbtnAlle = new JRadioButton("Sichtbar für alle"); - rdbtnAlle.setSelected(true); - buttonGroup.add(rdbtnAlle); - rdbtnAlle.setBounds(6, 27, 109, 23); - panel_2.add(rdbtnAlle); - - JRadioButton rdbtnIndividuell = new JRadioButton("Individuell"); - buttonGroup.add(rdbtnIndividuell); - rdbtnIndividuell.setBounds(6, 53, 109, 23); - panel_2.add(rdbtnIndividuell); - - final JButton btnAddVmUser = new JButton("Hinzufügen"); - btnAddVmUser.setEnabled(false); - btnAddVmUser.setBounds(23, 279, 89, 23); - panel_2.add(btnAddVmUser); - - final JButton btnDelVmUser = new JButton("Löschen"); - btnDelVmUser.setEnabled(false); - btnDelVmUser.setBounds(122, 279, 89, 23); - panel_2.add(btnDelVmUser); + JRadioButton radioButton = new JRadioButton("Sichtbar für alle"); + radioButton.setSelected(true); + radioButton.setEnabled(false); + radioButton.setBounds(6, 32, 109, 23); + panel_2.add(radioButton); + + JRadioButton radioButton_1 = new JRadioButton("Individuell"); + radioButton_1.setEnabled(false); + radioButton_1.setBounds(6, 58, 109, 23); + panel_2.add(radioButton_1); + + JButton button_2 = new JButton("Hinzufügen"); + button_2.setEnabled(false); + button_2.setBounds(23, 260, 89, 23); + panel_2.add(button_2); + + JButton button_3 = new JButton("Löschen"); + button_3.setEnabled(false); + button_3.setBounds(122, 260, 89, 23); + panel_2.add(button_3); { JPanel buttonPane = new JPanel(); buttonPane.setBounds(0, 640, 597, 33); @@ -350,22 +351,6 @@ public class PermissionCreateLecture_GUI extends JFrame { } } - rdbtnAlle.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - scrollPane_1.setEnabled(false); - btnAddVmUser.setEnabled(false); - btnDelVmUser.setEnabled(false); - } - }); - - rdbtnIndividuell.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - scrollPane_1.setEnabled(true); - btnAddVmUser.setEnabled(true); - btnDelVmUser.setEnabled(true); - } - }); - JSeparator separator = new JSeparator(); separator.setBounds(0, 78, 597, 2); getContentPane().add(separator); diff --git a/dozentenmodul/src/main/java/gui/lecture/PermissionEditLecture_GUI.java b/dozentenmodul/src/main/java/gui/lecture/PermissionEditLecture_GUI.java index c146d42b..f0a1231e 100644 --- a/dozentenmodul/src/main/java/gui/lecture/PermissionEditLecture_GUI.java +++ b/dozentenmodul/src/main/java/gui/lecture/PermissionEditLecture_GUI.java @@ -48,6 +48,7 @@ import javax.swing.table.TableColumn; import models.Links; import util.OpenLinks; +import javax.swing.JCheckBox; @SuppressWarnings("serial") public class PermissionEditLecture_GUI extends JFrame { @@ -140,7 +141,7 @@ public class PermissionEditLecture_GUI extends JFrame { panel.setLayout(null); panel.setBorder(new TitledBorder(null, "Beschreibung", TitledBorder.LEADING, TitledBorder.TOP, null, null)); panel.setBackground(SystemColor.menu); - panel.setBounds(10, 67, 557, 129); + panel.setBounds(10, 67, 557, 148); contentPanel.add(panel); JLabel label = new JLabel("Read"); @@ -167,16 +168,24 @@ public class PermissionEditLecture_GUI extends JFrame { label_7.setBounds(120, 78, 380, 40); panel.add(label_7); + JLabel label_8 = new JLabel("Für alle sichtbar"); + label_8.setBounds(20, 119, 90, 20); + panel.add(label_8); + + JCheckBox checkBox = new JCheckBox(""); + checkBox.setBounds(115, 118, 21, 23); + panel.add(checkBox); + JPanel panel_1 = new JPanel(); panel_1.setBackground(SystemColor.menu); panel_1.setBorder(new TitledBorder(null, "Suite-Berechtigungen", TitledBorder.LEADING, TitledBorder.TOP, null, null)); - panel_1.setBounds(10, 207, 311, 313); + panel_1.setBounds(10, 226, 311, 294); contentPanel.add(panel_1); panel_1.setLayout(null); JScrollPane scrollPane = new JScrollPane(); scrollPane.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); - scrollPane.setBounds(10, 21, 291, 249); + scrollPane.setBounds(10, 28, 291, 223); panel_1.add(scrollPane); table = new JTable(); @@ -212,12 +221,12 @@ public class PermissionEditLecture_GUI extends JFrame { JButton button = new JButton("Hinzufügen"); button.setEnabled(false); - button.setBounds(10, 279, 89, 23); + button.setBounds(10, 260, 89, 23); panel_1.add(button); JButton button_1 = new JButton("Löschen"); button_1.setEnabled(false); - button_1.setBounds(109, 279, 89, 23); + button_1.setBounds(109, 260, 89, 23); panel_1.add(button_1); JLabel lblHauptmen = new JLabel("Hauptmenü"); @@ -273,34 +282,34 @@ public class PermissionEditLecture_GUI extends JFrame { panel_2.setLayout(null); panel_2.setBorder(new TitledBorder(null, "Sichtbarkeit im VMChooser", TitledBorder.LEADING, TitledBorder.TOP, null, null)); panel_2.setBackground(SystemColor.menu); - panel_2.setBounds(331, 207, 236, 313); + panel_2.setBounds(331, 226, 236, 294); contentPanel.add(panel_2); final JScrollPane scrollPane_1 = new JScrollPane(); scrollPane_1.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); scrollPane_1.setEnabled(false); - scrollPane_1.setBounds(23, 83, 203, 185); + scrollPane_1.setBounds(23, 88, 203, 161); panel_2.add(scrollPane_1); JRadioButton rdbtnAlle = new JRadioButton("Sichtbar für alle"); rdbtnAlle.setSelected(true); rdbtnAlle.setEnabled(false); - rdbtnAlle.setBounds(6, 27, 109, 23); + rdbtnAlle.setBounds(6, 32, 109, 23); panel_2.add(rdbtnAlle); JRadioButton rdbtnIndividuell = new JRadioButton("Individuell"); rdbtnIndividuell.setEnabled(false); - rdbtnIndividuell.setBounds(6, 53, 109, 23); + rdbtnIndividuell.setBounds(6, 58, 109, 23); panel_2.add(rdbtnIndividuell); final JButton btnAddVmUser = new JButton("Hinzufügen"); btnAddVmUser.setEnabled(false); - btnAddVmUser.setBounds(23, 279, 89, 23); + btnAddVmUser.setBounds(23, 260, 89, 23); panel_2.add(btnAddVmUser); final JButton btnDelVmUser = new JButton("Löschen"); btnDelVmUser.setEnabled(false); - btnDelVmUser.setBounds(122, 279, 89, 23); + btnDelVmUser.setBounds(122, 260, 89, 23); panel_2.add(btnDelVmUser); { JPanel buttonPane = new JPanel(); diff --git a/dozentenmodul/src/main/java/util/CheckIntegrity.java b/dozentenmodul/src/main/java/util/CheckIntegrity.java index d87a8579..bb5becbd 100644 --- a/dozentenmodul/src/main/java/util/CheckIntegrity.java +++ b/dozentenmodul/src/main/java/util/CheckIntegrity.java @@ -2,46 +2,73 @@ package util; public class CheckIntegrity { - private static boolean isFine = false; + //private static boolean isFine = false; - // integrety check on permissions put by user - public static boolean[] isIntegre(boolean isRead, boolean isWrite, - boolean isLink, boolean isAdmin) { + // integrity check on permissions put by user + public static boolean[] isIntegre(boolean isRead, boolean isWrite,boolean isLink, boolean isAdmin) + { + // boolean array for the correct result values boolean[] rights = new boolean[4]; rights[0] = isRead; rights[1] = isWrite; rights[2] = isLink; rights[3] = isAdmin; + + System.out.println("*****************************"); + System.out.println(isRead+" "+isWrite+" "+isLink+" "+isAdmin); + - // do all checks and only change wrong settings - if (isAdmin == true) { - // set true for everything + if(isRead) //if read is allowed, only read is allowed + { + rights[0] = true; //read allowed + } + else //if read is not allowed, nothing is allowed + { + rights[0] = false; + rights[1] = false; + rights[2] = false; + rights[3] = false; + } + + if(isWrite) //if write was selected + { + rights[0] = true; + rights[1] = true; + } + else //if write was unselected + { + //rights[0] = false; + rights[1] = false; + } + + if(isLink) //if link was selected, read and link are allowed + { + rights[0] = true; + rights[2] = true; + } + else //if link is unselected, link is not allowed + { + rights[2] = false; + } + + if(isAdmin) //if admin is selected, anything is allowed + { rights[0] = true; rights[1] = true; rights[2] = true; rights[3] = true; - return rights; - } else { - if(isRead == false){ - //if user may not read, then he may not do anything - rights[0] = false; - rights[1] = false; - rights[2] = false; - rights[3] = false; - } - if (isWrite == true) { - // if user can write, then he must also be allowed to read - rights[0] = true; - } - - if (isLink == true) { - // if user may link, then he may also read - - } } - + else //if admin is unselected, admin is not allowed + { + rights[3] = false; + } + + System.out.println(">-------------<"); + System.out.println(rights[0]+" "+rights[1]+" "+rights[2]+" "+rights[3]); + return rights; + } } |