Changeset 1193 for trunk/src/org/expeditee/gui

Timestamp:

11/05/18 16:32:46 (6 years ago)

Author:

bln4

Message:

org.expeditee.gui.Frame ->
org.expeditee.gui.FrameUtils ->
org.expeditee.items.Permission ->
org.expeditee.items.PermissionPair ->
org.expeditee.items.UserAppliedPermission ->
The beginnings of the new denied level of permissions. A frame with a denied level of permission cannot be navigated too. Denied level permission for items coming soon.

Location:

trunk/src/org/expeditee/gui

Files:

• Frame.java (modified) (1 diff)
• FrameUtils.java (modified) (4 diffs)

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

@@ -733 +733 @@
         public void setPermission(PermissionPair permission)
         {
-                if (_permissionPair != null && _permissionPair.getPermission(this._owner).equals(permission)) {
+                if (_permissionPair != null && !_permissionPair.getPermission(this._owner).equals(permission.getPermission(this._owner))) {
                         _protectionChanged = true;
                 }

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

@@ -48 +48 @@
 import org.expeditee.items.Circle;
 import org.expeditee.items.Dot;
-import org.expeditee.items.DotType;
 import org.expeditee.items.FrameBitmap;
 import org.expeditee.items.FrameImage;
@@ -493 +492 @@
                         return;
                 }
+                
+                final PermissionPair framePermissions = toDisplay.getPermission();
+                if (framePermissions != null && framePermissions.getPermission(toDisplay.getOwner()) == UserAppliedPermission.denied) {
+                        MessageBay.errorMessage("Insufficient permissions to navigate to frame: " + toDisplay.getName());
+                        return;
+                }
 
                 Frame current = DisplayController.getCurrentFrame();
@@ -931 +936 @@
                 }
 
-                DotType pointtype = DotType.square;
-                boolean filledPoints = true;
+                //DotType pointtype = DotType.square;
+                //boolean filledPoints = true;
 
                 UserAppliedPermission permission = toParse.getUserAppliedPermission();
@@ -961 +966 @@
                                                                                         .indexOf(" ") + 1);
                                                                         if (fill.startsWith("nofill")) {
-                                                                                filledPoints = false;
+                                                                                //filledPoints = false;
                                                                         } else {
-                                                                                filledPoints = true;
+                                                                                //filledPoints = true;
                                                                         }
                                                                 }
 
                                                                 if (line.startsWith("circle")) {
-                                                                        pointtype = DotType.circle;
+                                                                        //pointtype = DotType.circle;
                                                                 } else {
-                                                                        pointtype = DotType.square;
+                                                                        //pointtype = DotType.square;
                                                                 }
                                                         }