Changeset 737 for trunk/src/org/expeditee/gui/Frame.java

Timestamp:

01/22/14 13:58:17 (10 years ago)

Author:

jts21

Message:

Enable per-item permission values, and tidy up DefaultFrameWriter a little

File:

• trunk/src/org/expeditee/gui/Frame.java (modified) (3 diffs)

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

@@ -1864 +1864 @@
         /**
          * Sets the item permissions to match the protection for the frame.
+         * No longer sets item permissions, since items can have their own permissions now (but still default to frame permissions) 
          * 
          */
@@ -1871 +1872 @@
                 
                 UserAppliedPermission permission = UserAppliedPermission.min(maxPermission, getUserAppliedPermission());
-                _frameName.setPermission(permission);
 
                 switch (permission) {
@@ -1894 +1894 @@
                 }
 
-                for (Overlay o : getOverlays())
+                for (Overlay o : getOverlays()) {
+                        for(Item i : o.Frame._body) {
+                                i.setOverlayPermission(o.permission);
+                        }
                         o.Frame.refreshItemPermissions(o.permission);
-
-                // Only update the permissions if we have to
-                if (_body.size() > 0 && permission.equals(_body.get(0).getPermission()))
-                        return;
-
-                for (Item i : _body) {
-                        i.setPermission(permission);
-                }
-
+                }
         }