Changeset 1407
- Timestamp:
- 06/05/19 14:34:23 (5 years ago)
- Location:
- trunk/src/org/expeditee
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/expeditee/gui/Frame.java
r1406 r1407 31 31 import java.util.Map; 32 32 import java.util.Stack; 33 import java.util.stream.Collectors; 34 import java.util.stream.Stream; 33 35 34 36 import org.expeditee.actions.Simple; … … 751 753 */ 752 754 public void setPermission(PermissionTriple permission) { 753 List<String> groupMembers = new ArrayList<String>();755 List<String> groupMembers = getGroupMembers(); 754 756 755 757 if (_permissionTriple != null && !_permissionTriple.getPermission(this._owner, groupMembers).equals(permission.getPermission(this._owner, groupMembers))) { … … 1196 1198 } 1197 1199 1198 public PermissionTriple getPermission() 1199 { 1200 public PermissionTriple getPermission() { 1200 1201 return _permissionTriple; 1201 1202 } 1202 1203 1203 public UserAppliedPermission getUserAppliedPermission() 1204 { 1204 public UserAppliedPermission getUserAppliedPermission() { 1205 1205 return getUserAppliedPermission(UserAppliedPermission.full); 1206 1206 } 1207 1207 1208 public UserAppliedPermission getUserAppliedPermission(UserAppliedPermission defaultPermission) 1209 { 1208 public UserAppliedPermission getUserAppliedPermission(UserAppliedPermission defaultPermission) { 1210 1209 if (_permissionTriple == null) { 1211 1210 return defaultPermission; 1212 1211 } 1213 1212 1214 return _permissionTriple.getPermission(_owner, new ArrayList<String>());1213 return _permissionTriple.getPermission(_owner, getGroupMembers()); 1215 1214 } 1216 1215 … … 2808 2807 this._groupFrame = frame; 2809 2808 } 2809 2810 public List<String> getGroupMembers() { 2811 List<String> members = new ArrayList<String>(); 2812 if (getGroupFrame() != null) { 2813 Collection<Text> textItems = getGroupFrame().getTextItems(); 2814 Stream<Text> memberLists = textItems.stream().filter(t -> 2815 t.getText().toLowerCase().startsWith("@owner: ") || 2816 t.getText().toLowerCase().startsWith("@members: ")); 2817 for(Text t: memberLists.collect(Collectors.toList())) { 2818 if (t.getText().toLowerCase().startsWith("@owner: ")) { 2819 members.add(t.getText().substring(8)); 2820 } else if (t.getText().toLowerCase().startsWith("@members: ")) { 2821 //10 2822 String[] split = t.getText().substring(10).split(","); 2823 for (String m: split) { 2824 members.add(m.trim()); 2825 } 2826 } 2827 } 2828 } 2829 return members; 2830 } 2810 2831 2811 2832 private static final class History { -
trunk/src/org/expeditee/gui/FrameUtils.java
r1406 r1407 503 503 final PermissionTriple framePermissions = toDisplay.getPermission(); 504 504 if (framePermissions != null 505 && framePermissions.getPermission(toDisplay.getOwner(), new ArrayList<String>()) == UserAppliedPermission.denied) {505 && framePermissions.getPermission(toDisplay.getOwner(), toDisplay.getGroupMembers()) == UserAppliedPermission.denied) { 506 506 MessageBay.errorMessage("Insufficient permissions to navigate to frame: " + toDisplay.getName()); 507 507 return; … … 1039 1039 if (existingOverlay == null) { 1040 1040 Overlay newOverlay = new Overlay(overlayFrame, 1041 permissionLevel.getPermission(overlayFrame.getOwner(), new ArrayList<String>()));1041 permissionLevel.getPermission(overlayFrame.getOwner(), overlayFrame.getGroupMembers())); 1042 1042 i.setOverlay(newOverlay); 1043 1043 overlays.add(newOverlay); -
trunk/src/org/expeditee/items/Item.java
r1402 r1407 494 494 } 495 495 496 public void setPermission(PermissionTriple permissionPair) 497 {496 public void setPermission(PermissionTriple permissionPair) { 497 List<String> groupMembers = getParent() != null ? getParent().getGroupMembers() : new ArrayList<String>(); 498 498 _permissionTriple = permissionPair; 499 if (_permissionTriple.getPermission(_owner, new ArrayList<String>()) == UserAppliedPermission.denied) {499 if (_permissionTriple.getPermission(_owner, groupMembers) == UserAppliedPermission.denied) { 500 500 this.getParent().moveItemToBodyHiddenDueToPermission(this); 501 501 } … … 507 507 508 508 public UserAppliedPermission getUserAppliedPermission() { 509 List<String> groupMembers = getParent() != null ? getParent().getGroupMembers() : new ArrayList<String>(); 509 510 String owner = _owner != null ? _owner : _parent != null ? _parent.getOwner() : null; 510 if(_permissionTriple != null) return _permissionTriple.getPermission(owner, new ArrayList<String>());511 if(_permissionTriple != null) return _permissionTriple.getPermission(owner, groupMembers); 511 512 if(_overlayPermission != null) return _overlayPermission; 512 513 if(_parent != null) return _parent.getUserAppliedPermission();
Note:
See TracChangeset
for help on using the changeset viewer.