Changeset 450

Timestamp:

02/26/12 14:22:21 (12 years ago)

Author:

davidb

Message:

Refactored to use the new PermissionPair and UserAppliedPermission classes

Location:

trunk/src/org/expeditee/items

Files:

• Circle.java (modified) (1 diff)
• Item.java (modified) (2 diffs)
• ItemParentStateChangedEvent.java (modified) (3 diffs)
• ItemUtils.java (modified) (3 diffs)
• Line.java (modified) (2 diffs)
• XRayable.java (modified) (1 diff)

trunk/src/org/expeditee/items/Circle.java

@@ -320 +320 @@
 
         @Override
-        public void setPermission(Permission p) {
+        public void setPermission(UserAppliedPermission p) {
                 super.setPermission(p);
                 _center.setPermission(p);

trunk/src/org/expeditee/items/Item.java

@@ -304 +304 @@
         private List<String> _actionLeaveFrame = null;
 
-        public Permission _permission = Permission.full;
-
-        public void setPermission(Permission permission) {
+        private UserAppliedPermission _permission = UserAppliedPermission.full;
+
+        public void setPermission(UserAppliedPermission permission) {
                 _permission = permission;
         }
 
-        public boolean hasPermission(Permission permission) {
+        public UserAppliedPermission getPermission() {
+                return _permission;
+        }
+        
+        public boolean hasPermission(UserAppliedPermission permission) {
                 return _permission.ordinal() >= permission.ordinal();
         }
@@ -2006 +2010 @@
         public void setHighlightMode(HighlightMode mode, Color color) {
                 setHighlightColor(color);
-                if (hasPermission(Permission.followLinks)
-                                || getEditTarget().hasPermission(Permission.followLinks)) {
+                if (hasPermission(UserAppliedPermission.followLinks)
+                                || getEditTarget().hasPermission(UserAppliedPermission.followLinks)) {
                         if (_mode != mode) {
                                 _mode = mode;

trunk/src/org/expeditee/items/ItemParentStateChangedEvent.java

@@ -13 +13 @@
         
         private Frame _src;
-        private Permission _overlayLevel;
+        private UserAppliedPermission _overlayLevel;
         private int _eventType;
         
@@ -26 +26 @@
         
         public ItemParentStateChangedEvent(Frame src, int eventType) {
-                this(src, eventType, Permission.none);
+                this(src, eventType, UserAppliedPermission.none);
         }
         
-        public ItemParentStateChangedEvent(Frame src, int eventType, Permission overlayLevel) {
+        public ItemParentStateChangedEvent(Frame src, int eventType, UserAppliedPermission overlayLevel) {
                 _src = src;
                 _overlayLevel = overlayLevel;
@@ -39 +39 @@
          * @return
          */
-        public Permission getOverlayLevel() {
+        public UserAppliedPermission getOverlayLevel() {
                 return _overlayLevel;
         }

trunk/src/org/expeditee/items/ItemUtils.java

@@ -457 +457 @@
                 for (Item i : toCopy) {
                         // Dont copy parts of a vector
-                        if (!i.hasPermission(Permission.copy))
+                        if (!i.hasPermission(UserAppliedPermission.copy))
                                 continue;
 
@@ -947 +947 @@
                 Color defaultForeground = v.Foreground;
                 Color defaultBackground = v.Background;
-                Permission permission = v.permission;
+                UserAppliedPermission permission = v.permission;
                 item.setPermission(permission);
 
@@ -966 +966 @@
                         }
 
-                        if (permission.equals(Permission.none)) {
+                        if (permission.equals(UserAppliedPermission.none)) {
                                 item.setLinkMark(false);
                                 item.setActionMark(false);

trunk/src/org/expeditee/items/Line.java

@@ -537 +537 @@
 
         public Item getEndPointToDisconnect(int x, int y) {
-                if (!hasPermission(Permission.full))
+                if (!hasPermission(UserAppliedPermission.full))
                         return null;
 
@@ -1181 +1181 @@
 
         @Override
-        public boolean hasPermission(Permission p) {
+        public boolean hasPermission(UserAppliedPermission p) {
                 return _start.hasPermission(p);
         }
 
         @Override
-        public void setPermission(Permission p) {
+        public void setPermission(UserAppliedPermission p) {
                 _start.setPermission(p);
                 _end.setPermission(p);

trunk/src/org/expeditee/items/XRayable.java

@@ -236 +236 @@
         
         @Override
-        public boolean hasPermission(Permission p) {
+        public boolean hasPermission(UserAppliedPermission p) {
                 return _source.hasPermission(p);
         }
         
         @Override
-        public void setPermission(Permission p) {
+        public void setPermission(UserAppliedPermission p) {
                 _source.setPermission(p);
         }