Changeset 454 for trunk/src/org/expeditee/gui/FrameUtils.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/FrameUtils.java (modified) (11 diffs)

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

@@ -27 +27 @@
 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.Picture;
 import org.expeditee.items.Text;
@@ -912 +913 @@
                 boolean filledPoints = true;
 
-                Permission permission = toParse.getPermission();
+                UserAppliedPermission permission = toParse.getUserAppliedPermission();
                 toParse.clearAnnotations();
 
@@ -953 +954 @@
                                                                 && i.getLink() != null) {
                                                         if (!i.getAbsoluteLink().equals(toParse.getName()))
-                                                                addVector(vectors, Permission.none, permission,
+                                                                addVector(vectors, UserAppliedPermission.none, permission,
                                                                                 i);
                                                 } else if (!FrameGraphics.isXRayMode()
@@ -960 +961 @@
                                                                 && i.getLink() != null) {
                                                         if (!i.getAbsoluteLink().equals(toParse.getName()))
-                                                                addVector(vectors, Permission.followLinks,
+                                                                addVector(vectors, UserAppliedPermission.followLinks,
                                                                                 permission, i);
                                                 }
@@ -985 +986 @@
                                                                                         overlayFrame) == null)
                                                                 overlays.add(new Overlay(overlayFrame,
-                                                                                Permission.none));
+                                                                                UserAppliedPermission.none));
                                                 }
                                                 // check for ACTIVE_OVERLAY items
@@ -1015 +1016 @@
 
                                                         // get level if specified
-                                                        String level = new AttributeValuePair(i.getText())
-                                                                        .getValue();
+                                                        String level = new AttributeValuePair(i.getText()).getValue();
                                                         // default permission (if none is specified)
-                                                        Permission permissionLevel = Permission
-                                                                        .getPermission(level,
-                                                                                        Permission.followLinks);
+                                                        PermissionPair permissionLevel 
+                                                                = new PermissionPair(level,UserAppliedPermission.followLinks);
 
                                                         if (overlayFrame != null) {
                                                                 Overlay existingOverlay = Overlay.getOverlay(
                                                                                 overlays, overlayFrame);
-                                                                // If it wasnt in the list create it and add it.
+                                                                // If it wasn't in the list create it and add it.
                                                                 if (existingOverlay == null) {
                                                                         Overlay newOverlay = new Overlay(
-                                                                                        overlayFrame, permissionLevel);
+                                                                                        overlayFrame, permissionLevel.getPermission(overlayFrame.getOwner()));
                                                                         i.setOverlay(newOverlay);
                                                                         overlays.add(newOverlay);
@@ -1133 +1132 @@
          */
         private static void addVector(List<Vector> vectors,
-                        Permission defaultPermission, Permission framePermission, Item i) {
+                        UserAppliedPermission defaultPermission, UserAppliedPermission framePermission, Item i) {
                 // TODO It is possible to get into an infinate loop if a
                 // frame contains an @ao which leads to a frame with an
@@ -1140 +1139 @@
 
                 // Get the permission from off the vector frame
-                Permission vectorPermission = Permission.getPermission(vector
+                UserAppliedPermission vectorPermission = UserAppliedPermission.getPermission(vector
                                 .getAnnotationValue("permission"), defaultPermission);
                 // If the frame permission is lower, use that
-                vectorPermission = Permission.min(vectorPermission, framePermission);
+                vectorPermission = UserAppliedPermission.min(vectorPermission, framePermission);
                 // Highest permissable permission for vectors is copy
-                vectorPermission = Permission.min(vectorPermission, Permission.copy);
+                vectorPermission = UserAppliedPermission.min(vectorPermission, UserAppliedPermission.copy);
                 if (vector != null) {
                         String scaleString = new AttributeValuePair(i.getText()).getValue();
@@ -1192 +1191 @@
                                 if (message != null) {
                                         if (message.contains(x, y)) {
-                                                message.setPermission(Permission.copy);
+                                                message.setPermission(UserAppliedPermission.copy);
                                                 possibles.add(message);
                                         } else {
@@ -1205 +1204 @@
                         if (MessageBay.getMessageLink() != null) {
                                 if (MessageBay.getMessageLink().contains(x, y)) {
-                                        MessageBay.getMessageLink().setPermission(Permission.copy);
+                                        MessageBay.getMessageLink().setPermission(UserAppliedPermission.copy);
                                         possibles.add(MessageBay.getMessageLink());
                                 }
@@ -1221 +1220 @@
                                                 && LastEdited.getParent().getItems().contains(
                                                                 LastEdited)) {
-                                        LastEdited.setPermission(Permission.full);
+                                        LastEdited.setPermission(UserAppliedPermission.full);
                                         return LastEdited;
                                 } else if (bResetLastEdited) {