Changeset 1402
- Timestamp:
- 06/04/19 14:29:49 (5 years ago)
- Location:
- trunk/src/org/expeditee
- Files:
-
- 10 edited
- 1 moved
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/expeditee/auth/account/Create.java
r1393 r1402 38 38 import org.expeditee.io.ExpReader; 39 39 import org.expeditee.items.Item; 40 import org.expeditee.items.Permission Pair;40 import org.expeditee.items.PermissionTriple; 41 41 import org.expeditee.items.Text; 42 42 import org.expeditee.items.UserAppliedPermission; … … 222 222 for (Text t: textItems) { 223 223 if (t.getText().equals("Secrets")) { 224 t.setPermission(new Permission Pair(UserAppliedPermission.followLinks, UserAppliedPermission.denied));224 t.setPermission(new PermissionTriple(UserAppliedPermission.followLinks, UserAppliedPermission.denied, UserAppliedPermission.denied)); 225 225 break; 226 226 } -
trunk/src/org/expeditee/gui/AttributeUtils.java
r1398 r1402 33 33 import org.expeditee.items.Item; 34 34 import org.expeditee.items.Justification; 35 import org.expeditee.items.Permission Pair;35 import org.expeditee.items.PermissionTriple; 36 36 import org.expeditee.items.Text; 37 37 import org.expeditee.simple.IncorrectTypeException; … … 146 146 Class<?>[] pIntArray = { int[].class }; 147 147 Class<?>[] pJustification = { Justification.class }; 148 Class<?>[] pPermission = { Permission Pair.class };148 Class<?>[] pPermission = { PermissionTriple.class }; 149 149 Class<?>[] pDotType = { DotType.class }; 150 150 Class<?>[] pEncPermission = { EncryptionPermissionTriple.class }; -
trunk/src/org/expeditee/gui/Frame.java
r1374 r1402 55 55 import org.expeditee.items.ItemUtils; 56 56 import org.expeditee.items.Line; 57 import org.expeditee.items.Permission Pair;57 import org.expeditee.items.PermissionTriple; 58 58 import org.expeditee.items.Text; 59 59 import org.expeditee.items.UserAppliedPermission; … … 100 100 private int _version = 0; 101 101 102 private Permission Pair _permissionPair= null;102 private PermissionTriple _permissionTriple = null; 103 103 104 104 private EncryptionPermissionTriple _encPermissionTriple = null; … … 747 747 * The protection to use for this Frame. 748 748 */ 749 public void setPermission(PermissionPair permission) 750 { 751 if (_permissionPair != null && !_permissionPair.getPermission(this._owner).equals(permission.getPermission(this._owner))) { 749 public void setPermission(PermissionTriple permission) { 750 List<String> groupMembers = new ArrayList<String>(); 751 752 if (_permissionTriple != null && !_permissionTriple.getPermission(this._owner, groupMembers).equals(permission.getPermission(this._owner, groupMembers))) { 752 753 _protectionChanged = true; 753 754 } 754 755 755 _permission Pair = new PermissionPair(permission);756 _permissionTriple = new PermissionTriple(permission); 756 757 757 758 if (_body.size() > 0) { 758 refreshItemPermissions(permission.getPermission(_owner ));759 refreshItemPermissions(permission.getPermission(_owner, groupMembers)); 759 760 } 760 761 } … … 1192 1193 } 1193 1194 1194 public Permission PairgetPermission()1195 { 1196 return _permission Pair;1195 public PermissionTriple getPermission() 1196 { 1197 return _permissionTriple; 1197 1198 } 1198 1199 … … 1204 1205 public UserAppliedPermission getUserAppliedPermission(UserAppliedPermission defaultPermission) 1205 1206 { 1206 if (_permission Pair== null) {1207 if (_permissionTriple == null) { 1207 1208 return defaultPermission; 1208 1209 } 1209 1210 1210 return _permission Pair.getPermission(_owner);1211 return _permissionTriple.getPermission(_owner, new ArrayList<String>()); 1211 1212 } 1212 1213 … … 2725 2726 } 2726 2727 2727 public void moveItemFromBodyHiddenDueToPermission(Item i, Permission PairnewPermission) {2728 public void moveItemFromBodyHiddenDueToPermission(Item i, PermissionTriple newPermission) { 2728 2729 if (_bodyHiddenDueToPermissions.contains(i)) { 2729 2730 _bodyHiddenDueToPermissions.remove(i); -
trunk/src/org/expeditee/gui/FrameIO.java
r1399 r1402 67 67 import org.expeditee.items.ItemUtils; 68 68 import org.expeditee.items.Justification; 69 import org.expeditee.items.Permission Pair;69 import org.expeditee.items.PermissionTriple; 70 70 import org.expeditee.items.Text; 71 71 import org.expeditee.items.UserAppliedPermission; … … 1330 1330 original.setFrameset(oldFramesetName); 1331 1331 original.setFrameNumber(nextnum); 1332 original.setPermission(new Permission Pair(UserAppliedPermission.copy));1332 original.setPermission(new PermissionTriple(UserAppliedPermission.copy)); 1333 1333 original.change(); 1334 1334 SaveFrame(original, false, false); -
trunk/src/org/expeditee/gui/FrameUtils.java
r1393 r1402 71 71 import org.expeditee.items.JSItem; 72 72 import org.expeditee.items.Line; 73 import org.expeditee.items.Permission Pair;73 import org.expeditee.items.PermissionTriple; 74 74 import org.expeditee.items.Picture; 75 75 import org.expeditee.items.Text; … … 491 491 } 492 492 493 final Permission PairframePermissions = toDisplay.getPermission();493 final PermissionTriple framePermissions = toDisplay.getPermission(); 494 494 if (framePermissions != null 495 && framePermissions.getPermission(toDisplay.getOwner() ) == UserAppliedPermission.denied) {495 && framePermissions.getPermission(toDisplay.getOwner(), new ArrayList<String>()) == UserAppliedPermission.denied) { 496 496 MessageBay.errorMessage("Insufficient permissions to navigate to frame: " + toDisplay.getName()); 497 497 return; … … 1020 1020 String level = new AttributeValuePair(i.getText()).getValue(); 1021 1021 // default permission (if none is specified) 1022 Permission Pair permissionLevel = new PermissionPair(level,1022 PermissionTriple permissionLevel = new PermissionTriple(level, 1023 1023 UserAppliedPermission.followLinks); 1024 1024 … … 1029 1029 if (existingOverlay == null) { 1030 1030 Overlay newOverlay = new Overlay(overlayFrame, 1031 permissionLevel.getPermission(overlayFrame.getOwner() ));1031 permissionLevel.getPermission(overlayFrame.getOwner(), new ArrayList<String>())); 1032 1032 i.setOverlay(newOverlay); 1033 1033 overlays.add(newOverlay); -
trunk/src/org/expeditee/io/DefaultFrameReader.java
r1398 r1402 41 41 import org.expeditee.items.Justification; 42 42 import org.expeditee.items.Line; 43 import org.expeditee.items.Permission Pair;43 import org.expeditee.items.PermissionTriple; 44 44 import org.expeditee.items.Text; 45 45 … … 69 69 protected static Class[] pItem = { Item.class }; 70 70 protected static Class[] pJustification = { Justification.class }; 71 protected static Class[] pPermission = { Permission Pair.class };71 protected static Class[] pPermission = { PermissionTriple.class }; 72 72 protected static Class[] pDotType = { DotType.class }; 73 73 protected static Class[] pEncPermission = { EncryptionPermissionTriple.class }; -
trunk/src/org/expeditee/items/Circle.java
r1143 r1402 313 313 314 314 @Override 315 public void setPermission(Permission PairpermissionPair) {315 public void setPermission(PermissionTriple permissionPair) { 316 316 super.setPermission(permissionPair); 317 317 _center.setPermission(permissionPair); -
trunk/src/org/expeditee/items/Item.java
r1398 r1402 217 217 private List<String> _actionLeaveFrame = null; 218 218 219 private Permission Pair _permissionPair= null;219 private PermissionTriple _permissionTriple = null; 220 220 221 221 private UserAppliedPermission _overlayPermission = null; … … 494 494 } 495 495 496 public void setPermission(Permission PairpermissionPair)497 { 498 _permission Pair= permissionPair;499 if (_permission Pair.getPermission(_owner) == UserAppliedPermission.denied) {496 public void setPermission(PermissionTriple permissionPair) 497 { 498 _permissionTriple = permissionPair; 499 if (_permissionTriple.getPermission(_owner, new ArrayList<String>()) == UserAppliedPermission.denied) { 500 500 this.getParent().moveItemToBodyHiddenDueToPermission(this); 501 501 } 502 502 } 503 503 504 public Permission PairgetPermission() {505 return _permission Pair;504 public PermissionTriple getPermission() { 505 return _permissionTriple; 506 506 } 507 507 508 508 public UserAppliedPermission getUserAppliedPermission() { 509 509 String owner = _owner != null ? _owner : _parent != null ? _parent.getOwner() : null; 510 if(_permission Pair != null) return _permissionPair.getPermission(owner);510 if(_permissionTriple != null) return _permissionTriple.getPermission(owner, new ArrayList<String>()); 511 511 if(_overlayPermission != null) return _overlayPermission; 512 512 if(_parent != null) return _parent.getUserAppliedPermission(); -
trunk/src/org/expeditee/items/Line.java
r1143 r1402 1223 1223 1224 1224 @Override 1225 public void setPermission(Permission PairpermissionPair) {1225 public void setPermission(PermissionTriple permissionPair) { 1226 1226 _start.setPermission(permissionPair); 1227 1227 _end.setPermission(permissionPair); -
trunk/src/org/expeditee/items/PermissionTriple.java
r1401 r1402 19 19 package org.expeditee.items; 20 20 21 import java.util.Arrays; 22 import java.util.List; 23 21 24 import org.expeditee.settings.UserSettings; 22 25 23 public class Permission Pair{26 public class PermissionTriple { 24 27 25 28 private UserAppliedPermission ownerPermission; 26 private UserAppliedPermission notOwnerPermission; 29 private UserAppliedPermission groupPermission; 30 private UserAppliedPermission otherPermission; 27 31 28 public Permission Pair(String permissionCode, UserAppliedPermission defaultPermission) {32 public PermissionTriple(String permissionCode, UserAppliedPermission defaultPermission) { 29 33 ownerPermission = defaultPermission; 30 notOwnerPermission = defaultPermission; 34 groupPermission = defaultPermission; 35 otherPermission = defaultPermission; 36 37 if (permissionCode != null && permissionCode.length() > 0) { 38 permissionCode = permissionCode.trim().toLowerCase(); 39 40 int numberOfMinuses = permissionCode.chars().reduce(0, (a, b) -> b == '-' ? a + 1 : a); 41 String[] codes = new String[3]; 42 Arrays.fill(codes, ""); 43 if (permissionCode.length() == 1 + numberOfMinuses) { 44 codes[0] = permissionCode; 45 } else { 46 int i = 0; 47 for (char c : permissionCode.toCharArray()) { 48 try { 49 int asInt = Integer.parseInt(c + ""); 50 codes[i] += asInt + ""; 51 i++; 52 } catch (NumberFormatException e) { 53 if (c == '-') { 54 codes[i] += c + ""; 55 } 56 } 57 } 58 } 31 59 32 if (permissionCode != null) { 33 34 permissionCode = permissionCode.trim().toLowerCase(); 35 if (permissionCode.length() != 0) { 36 37 if (permissionCode.length() == 1 || (permissionCode.length() == 2 && permissionCode.startsWith("-"))) { 38 // replicate it to cover ifOwner/ifNotOwner 39 permissionCode += permissionCode; 40 } 41 42 final int ownerPermissionIndexStart = 0; 43 final int ownerPermissionIndexEnd = permissionCode.charAt(ownerPermissionIndexStart) == '-' ? 44 ownerPermissionIndexStart + 2 : ownerPermissionIndexStart + 1; 45 final int notOwnerPermissionIndexStart = ownerPermissionIndexEnd; 46 final int notOwnerPermissionIndexEnd = permissionCode.charAt(notOwnerPermissionIndexStart) == '-' ? 47 notOwnerPermissionIndexStart + 2 : notOwnerPermissionIndexStart + 1; 48 final String ownerPermissionCode = permissionCode.substring(ownerPermissionIndexStart, ownerPermissionIndexEnd); 49 final String notOwnerPermissionCode = permissionCode.substring(notOwnerPermissionIndexStart, notOwnerPermissionIndexEnd); 50 ownerPermission = UserAppliedPermission.getPermission(ownerPermissionCode, defaultPermission); 51 notOwnerPermission = UserAppliedPermission.getPermission(notOwnerPermissionCode, defaultPermission); 60 this.ownerPermission = UserAppliedPermission.getPermission(codes[0], this.ownerPermission); 61 if (codes[1].length() == 0) { // If there is only a permission code for owner. 62 this.groupPermission = UserAppliedPermission.getPermission(codes[0], this.groupPermission); 63 this.otherPermission = UserAppliedPermission.getPermission(codes[0], this.otherPermission); 64 } else if (codes[2].length() == 0) { // If there is only two of three permission codes specified. 65 this.groupPermission = UserAppliedPermission.getPermission(codes[1], this.groupPermission); 66 this.otherPermission = UserAppliedPermission.getPermission(codes[1], this.otherPermission); 67 } else { // If all permission codes are specified. 68 this.groupPermission = UserAppliedPermission.getPermission(codes[1], this.groupPermission); 69 this.otherPermission = UserAppliedPermission.getPermission(codes[2], this.otherPermission); 52 70 } 53 71 } 54 72 } 55 73 56 public Permission Pair(UserAppliedPermission ownerPermission, UserAppliedPermission notOwnerPermission) {74 public PermissionTriple(UserAppliedPermission ownerPermission, UserAppliedPermission groupPermission, UserAppliedPermission otherPermission) { 57 75 this.ownerPermission = ownerPermission; 58 this.notOwnerPermission = notOwnerPermission; 76 this.groupPermission = groupPermission; 77 this.otherPermission = otherPermission; 59 78 } 60 79 61 public Permission Pair(UserAppliedPermission ownerPermissionForBoth) {62 this( ownerPermissionForBoth, ownerPermissionForBoth);80 public PermissionTriple(UserAppliedPermission permissionForAll) { 81 this(permissionForAll, permissionForAll, permissionForAll); 63 82 } 64 83 65 public PermissionPair(PermissionPair pp) { 66 ownerPermission = pp.ownerPermission; 67 notOwnerPermission = pp.notOwnerPermission; 84 public PermissionTriple(PermissionTriple pt) { 85 this.ownerPermission = pt.ownerPermission; 86 this.groupPermission = pt.groupPermission; 87 this.otherPermission = pt.otherPermission; 68 88 } 69 89 70 public UserAppliedPermission getPermission(String ownerOfItem) { 71 90 public UserAppliedPermission getPermission(String ownerOfItem, List<String> group) { 72 91 if (UserSettings.UserName.get().equals(ownerOfItem)) { 73 92 return ownerPermission; 93 } else if (group.contains(UserSettings.UserName.get())) { 94 return groupPermission; 74 95 } else { 75 return notOwnerPermission;96 return otherPermission; 76 97 } 77 98 } … … 86 107 * defined in Item 87 108 */ 88 public static PermissionPair convertString(String permissionCode) { 89 PermissionPair pp = new PermissionPair(permissionCode, UserAppliedPermission.full); 90 91 return pp; 109 public static PermissionTriple convertString(String permissionCode) { 110 PermissionTriple pt = new PermissionTriple(permissionCode, UserAppliedPermission.full); 111 return pt; 92 112 } 93 113 94 114 public String getCode() { 95 return Integer.toString(ownerPermission.getCode()) + Integer.toString( notOwnerPermission.getCode());115 return Integer.toString(ownerPermission.getCode()) + Integer.toString(groupPermission.getCode()) + Integer.toString(otherPermission.getCode()); 96 116 } 97 117 98 118 @Override 99 119 public String toString() { 100 return ownerPermission .toString() + ":" + notOwnerPermission.toString();120 return ownerPermission + ":" + groupPermission + ":" + otherPermission; 101 121 } 102 122 } -
trunk/src/org/expeditee/items/XRayable.java
r1258 r1402 320 320 321 321 @Override 322 public void setPermission(Permission PairpermissionPair) {322 public void setPermission(PermissionTriple permissionPair) { 323 323 _source.setPermission(permissionPair); 324 324 }
Note:
See TracChangeset
for help on using the changeset viewer.