diff options
6 files changed, 108 insertions, 52 deletions
diff --git a/dozentenmodul/src/main/java/gui/image/PermissionCreateImage_GUI.java b/dozentenmodul/src/main/java/gui/image/PermissionCreateImage_GUI.java index 239b5a0f..827c5e8d 100644 --- a/dozentenmodul/src/main/java/gui/image/PermissionCreateImage_GUI.java +++ b/dozentenmodul/src/main/java/gui/image/PermissionCreateImage_GUI.java @@ -578,7 +578,7 @@ public class PermissionCreateImage_GUI extends JFrame { isLink = (boolean) table.getValueAt(selectedRow, 3); isAdmin = (boolean) table.getValueAt(selectedRow, 4); - boolean[] checkedVals = CheckIntegrity.isIntegre(isRead, isWrite, + boolean[] checkedVals = CheckIntegrity.isIntegreForImage(isRead, isWrite, isLink, isAdmin); table.setValueAt(checkedVals[0], selectedRow, 1); diff --git a/dozentenmodul/src/main/java/gui/image/PermissionEditImage_GUI.java b/dozentenmodul/src/main/java/gui/image/PermissionEditImage_GUI.java index 8de41289..c80d5a52 100644 --- a/dozentenmodul/src/main/java/gui/image/PermissionEditImage_GUI.java +++ b/dozentenmodul/src/main/java/gui/image/PermissionEditImage_GUI.java @@ -634,7 +634,7 @@ public class PermissionEditImage_GUI extends JFrame { isLink = (boolean) table.getValueAt(selectedRow, 3); isAdmin = (boolean) table.getValueAt(selectedRow, 4); - boolean[] checkedVals = CheckIntegrity.isIntegre(isRead, isWrite, + boolean[] checkedVals = CheckIntegrity.isIntegreForImage(isRead, isWrite, isLink, isAdmin); table.setValueAt(checkedVals[0], selectedRow, 1); diff --git a/dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java b/dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java index 478c1bc0..af2ef7e6 100644 --- a/dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java +++ b/dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java @@ -521,8 +521,8 @@ public class EditLectureLink_GUI extends JFrame { buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT)); getContentPane().add(buttonPane); { - JButton okButton = new JButton("Zurück"); - okButton.addActionListener(new ActionListener() { + JButton btnBack = new JButton("Zurück"); + btnBack.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { PermissionEditLecture_GUI el = new PermissionEditLecture_GUI( @@ -531,14 +531,14 @@ public class EditLectureLink_GUI extends JFrame { dispose(); } }); - okButton.setActionCommand("OK"); - buttonPane.add(okButton); - getRootPane().setDefaultButton(okButton); + btnBack.setActionCommand("OK"); + buttonPane.add(btnBack); + getRootPane().setDefaultButton(btnBack); } { - JButton cancelButton = new JButton( + JButton btnFinish = new JButton( "Veranstaltung ändern und abschließen"); - cancelButton.addActionListener(new ActionListener() { + btnFinish.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { String username = person.verantwortlicher.getName() + " " + person.verantwortlicher.getVorname(); @@ -607,7 +607,12 @@ public class EditLectureLink_GUI extends JFrame { + "/" + RightsManagement.rightsManagement .getPermittedUserList() - .size()); + .size() + +", r="+RightsManagement.rightsManagement.getPermittedUserList().get(i).isLecture_read() + +", w="+RightsManagement.rightsManagement.getPermittedUserList().get(i).isLecture_write() + +", a="+RightsManagement.rightsManagement.getPermittedUserList().get(i).isLecture_admin() + ); + client.writeAdditionalLectureRights( Lecture.lecture.getName(), RightsManagement.rightsManagement @@ -615,13 +620,13 @@ public class EditLectureLink_GUI extends JFrame { .get(i).getUserID(), // userID RightsManagement.rightsManagement .getPermittedUserList() - .get(i).isImageRead(),// read + .get(i).isLecture_read(),// read RightsManagement.rightsManagement .getPermittedUserList() - .get(i).isImageWrite(),// write + .get(i).isLecture_write(),// write RightsManagement.rightsManagement .getPermittedUserList() - .get(i).isImageAdmin()// admin + .get(i).isLecture_admin()// admin ); }// end for @@ -883,8 +888,8 @@ public class EditLectureLink_GUI extends JFrame { } }); - cancelButton.setActionCommand("Cancel"); - buttonPane.add(cancelButton); + btnFinish.setActionCommand("Cancel"); + buttonPane.add(btnFinish); } } diff --git a/dozentenmodul/src/main/java/gui/lecture/PermissionCreateLecture_GUI.java b/dozentenmodul/src/main/java/gui/lecture/PermissionCreateLecture_GUI.java index 378273b3..d4d49ec2 100644 --- a/dozentenmodul/src/main/java/gui/lecture/PermissionCreateLecture_GUI.java +++ b/dozentenmodul/src/main/java/gui/lecture/PermissionCreateLecture_GUI.java @@ -562,12 +562,11 @@ public class PermissionCreateLecture_GUI extends JFrame { isWrite = (boolean) tablePermittedUsers.getValueAt(selectedRow, 2); isAdmin = (boolean) tablePermittedUsers.getValueAt(selectedRow, 3); - boolean[] checkedVals = CheckIntegrity.isIntegre(isRead, isWrite,isAdmin, false); + boolean[] checkedVals = CheckIntegrity.isIntegreForLecture(isRead, isWrite,isAdmin); tablePermittedUsers.setValueAt(checkedVals[0], selectedRow, 1); tablePermittedUsers.setValueAt(checkedVals[1], selectedRow, 2); - tablePermittedUsers.setValueAt(checkedVals[3], selectedRow, 3); - // tablePermittedUsers.setValueAt(checkedVals[3], selectedRow, 4); + tablePermittedUsers.setValueAt(checkedVals[2], selectedRow, 3); }// end checkIntegrity() // Column 0 == Concat user name @@ -711,8 +710,6 @@ class CheckBoxHeader extends JCheckBox implements TableCellRenderer, } } setColumn(column); - // rendererComponent.setText("Check All"); - // setBorder(UIManager.getBorder("TableHeader.cellBorder")); return rendererComponent; } diff --git a/dozentenmodul/src/main/java/gui/lecture/PermissionEditLecture_GUI.java b/dozentenmodul/src/main/java/gui/lecture/PermissionEditLecture_GUI.java index cb01d824..05b7959e 100644 --- a/dozentenmodul/src/main/java/gui/lecture/PermissionEditLecture_GUI.java +++ b/dozentenmodul/src/main/java/gui/lecture/PermissionEditLecture_GUI.java @@ -203,6 +203,13 @@ public class PermissionEditLecture_GUI extends JFrame { panel_1.add(scrollPane); table = new JTable(); + table.addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent e) { + checkIntegrity(-1); + } + }); + table.setModel(model); table.setSelectionForeground(Color.WHITE); @@ -573,11 +580,11 @@ public class PermissionEditLecture_GUI extends JFrame { isWrite = (boolean) table.getValueAt(selectedRow, 2); isAdmin = (boolean) table.getValueAt(selectedRow, 3); - boolean[] checkedVals = CheckIntegrity.isIntegre(isRead, isWrite,isAdmin, false); + boolean[] checkedVals = CheckIntegrity.isIntegreForLecture(isRead, isWrite,isAdmin); table.setValueAt(checkedVals[0], selectedRow, 1); table.setValueAt(checkedVals[1], selectedRow, 2); - table.setValueAt(checkedVals[3], selectedRow, 3); + table.setValueAt(checkedVals[2], selectedRow, 3); }// end checkIntegrity() // save the entered rights into the model and prepare them to be written to diff --git a/dozentenmodul/src/main/java/util/CheckIntegrity.java b/dozentenmodul/src/main/java/util/CheckIntegrity.java index bb5becbd..faded054 100644 --- a/dozentenmodul/src/main/java/util/CheckIntegrity.java +++ b/dozentenmodul/src/main/java/util/CheckIntegrity.java @@ -2,73 +2,120 @@ package util; public class CheckIntegrity { - //private static boolean isFine = false; + // private static boolean isFine = false; + + // integrity check on permissions put by user for an image + public static boolean[] isIntegreForImage(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); + System.out.println("*****************************"); + System.out.println(isRead + " " + isWrite + " " + isLink + " " + + isAdmin); - if(isRead) //if read is allowed, only read is allowed + 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] = 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 + + if (isWrite) // if write was selected { rights[0] = true; rights[1] = true; - } - else //if write was unselected + } else // if write was unselected { - //rights[0] = false; + // rights[0] = false; rights[1] = false; } - - if(isLink) //if link was selected, read and link are allowed + + 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 + } else // if link is unselected, link is not allowed { rights[2] = false; } - - if(isAdmin) //if admin is selected, anything is allowed + + if (isAdmin) // if admin is selected, anything is allowed { rights[0] = true; rights[1] = true; rights[2] = true; rights[3] = true; - } - else //if admin is unselected, admin is not allowed + } 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; + + }// end isIntegreForImage() + + + // integrity check on permissions put by user for a lecture + public static boolean[] isIntegreForLecture(boolean isRead, boolean isWrite, boolean isAdmin) { + + // boolean array for the correct result values + boolean[] rights = new boolean[4]; + rights[0] = isRead; + rights[1] = isWrite; + rights[2] = isAdmin; + + System.out.println("*****************************"); + System.out.println(isRead + " " + isWrite + " " + isAdmin); + + 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; + } + + if (isWrite) // if write was selected + { + rights[0] = true; + rights[1] = true; + } else // if write was unselected + { + // rights[0] = false; + rights[1] = false; + } + + if (isAdmin) // if admin is selected, anything is allowed + { + rights[0] = true; + rights[1] = true; + rights[2] = true; + } else // if admin is unselected, admin is not allowed + { + rights[2] = false; + } + System.out.println(">-------------<"); - System.out.println(rights[0]+" "+rights[1]+" "+rights[2]+" "+rights[3]); - + System.out.println(rights[0] + " " + rights[1] + " " + rights[2]); + return rights; - - } + + }// end isIntegreForLecture() } |