Changeset 1402 for trunk/src/org/expeditee/gui/FrameUtils.java

Timestamp:

06/04/19 14:29:49 (5 years ago)

Author:

bln4

Message:

Permission is now a triple rather than a pair. The new second bit is not yet used but will be used for group level permissions.

gazumpts

File:

• trunk/src/org/expeditee/gui/FrameUtils.java (modified) (4 diffs)

trunk/src/org/expeditee/gui/FrameUtils.java

@@ -71 +71 @@
 import org.expeditee.items.JSItem;
 import org.expeditee.items.Line;
-import org.expeditee.items.PermissionPair;
+import org.expeditee.items.PermissionTriple;
 import org.expeditee.items.Picture;
 import org.expeditee.items.Text;
@@ -491 +491 @@
                 }
 
-                final PermissionPair framePermissions = toDisplay.getPermission();
+                final PermissionTriple framePermissions = toDisplay.getPermission();
                 if (framePermissions != null
-                                && framePermissions.getPermission(toDisplay.getOwner()) == UserAppliedPermission.denied) {
+                                && framePermissions.getPermission(toDisplay.getOwner(), new ArrayList<String>()) == UserAppliedPermission.denied) {
                         MessageBay.errorMessage("Insufficient permissions to navigate to frame: " + toDisplay.getName());
                         return;
@@ -1020 +1020 @@
                                                         String level = new AttributeValuePair(i.getText()).getValue();
                                                         // default permission (if none is specified)
-                                                        PermissionPair permissionLevel = new PermissionPair(level,
+                                                        PermissionTriple permissionLevel = new PermissionTriple(level,
                                                                         UserAppliedPermission.followLinks);
 
@@ -1029 +1029 @@
                                                                 if (existingOverlay == null) {
                                                                         Overlay newOverlay = new Overlay(overlayFrame,
-                                                                                        permissionLevel.getPermission(overlayFrame.getOwner()));
+                                                                                        permissionLevel.getPermission(overlayFrame.getOwner(), new ArrayList<String>()));
                                                                         i.setOverlay(newOverlay);
                                                                         overlays.add(newOverlay);