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

Timestamp:

02/26/12 14:28:27 (12 years ago)

Author:

davidb

Message:

Refactored to use the new PermissionPair and UserAppliedPermission classes

File:

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

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

@@ -26 +26 @@
 import org.expeditee.items.ItemUtils;
 import org.expeditee.items.Line;
-import org.expeditee.items.Permission;
+import org.expeditee.items.PermissionPair;
+import org.expeditee.items.UserAppliedPermission;
 import org.expeditee.items.Text;
 import org.expeditee.items.XRayable;
@@ -51 +52 @@
 
         public boolean isReadOnly() {
-                return !_frameName.hasPermission(Permission.full)
+                return !_frameName.hasPermission(UserAppliedPermission.full)
                                 && !_protectionChanged;
         }
@@ -68 +69 @@
         private int _version = 0;
 
-        private Permission _permission = null;
+        private PermissionPair _permissionPair = null;
 
         private String _owner = null;
@@ -144 +145 @@
 
         public void reset() {
-                refreshItemPermissions(Permission.full);
+                refreshItemPermissions(UserAppliedPermission.full);
                 //System.out.println("Reset");
                 resetDot();
@@ -652 +653 @@
          *            The protection to use for this Frame.
          */
-        public void setPermission(Permission permission) {
-                if (_permission != null && _permission.equals(permission))
+        public void setPermission(PermissionPair permission) {
+                if (_permissionPair != null && _permissionPair.getPermission(this._owner).equals(permission))
                         _protectionChanged = true;
 
-                _permission = permission;
+                _permissionPair = new PermissionPair(permission);
 
                 if (_body.size() > 0)
-                        refreshItemPermissions(permission);
+                        refreshItemPermissions(permission.getPermission(_owner));
         }
 
@@ -990 +991 @@
         }
 
-        public Permission getPermission() {
-                return getPermission(Permission.full);
-        }
-
-        public Permission getPermission(Permission defaultPermission) {
-                if (_permission == null)
+        public PermissionPair getPermission() {
+                return _permissionPair;
+        }
+        
+        public UserAppliedPermission getUserAppliedPermission() {
+                return getUserAppliedPermission(UserAppliedPermission.full);
+        }
+
+        public UserAppliedPermission getUserAppliedPermission(UserAppliedPermission defaultPermission) {
+                if (_permissionPair == null)
                         return defaultPermission;
 
-                return _permission;
-        }
-
+                return _permissionPair.getPermission(_owner);
+        }
+
+        
         public String getOwner() {
                 return _owner;
@@ -1392 +1398 @@
 
                 // Now add the items for this overlay
-                Permission permission = Permission.min(toAdd.Frame.getPermission(),
-                                toAdd.permission);
+                UserAppliedPermission permission = UserAppliedPermission.min(toAdd.Frame.getUserAppliedPermission(),toAdd.permission);
 
                 // Items must be notified that they have been added or removed from this
@@ -1774 +1779 @@
          * 
          */
-        public void refreshItemPermissions(Permission maxPermission) {
+        public void refreshItemPermissions(UserAppliedPermission maxPermission) {
                 if(_frameName == null)
                         return;
                 
-                Permission permission = Permission.min(maxPermission, getPermission());
+                UserAppliedPermission permission = UserAppliedPermission.min(maxPermission, getUserAppliedPermission());
                 _frameName.setPermission(permission);
 
@@ -1806 +1811 @@
 
                 // Only update the permissions if we have to
-                if (_body.size() > 0 && permission.equals(_body.get(0)._permission))
+                if (_body.size() > 0 && permission.equals(_body.get(0).getPermission()))
                         return;
 
@@ -2223 +2228 @@
 
                 for (Item i : _overlayItems) {
-                        if (i.hasPermission(Permission.followLinks)) {
+                        if (i.hasPermission(UserAppliedPermission.followLinks)) {
                                 _interactableItems.add(i);
                         }
@@ -2229 +2234 @@
 
                 for (Item i : _vectorItems) {
-                        if (i.hasPermission(Permission.none)) {
+                        if (i.hasPermission(UserAppliedPermission.none)) {
                                 _interactableItems.add(i);
                         }