Changeset 1317 for trunk

Timestamp:

04/16/19 11:02:59 (5 years ago)

Author:

bln4

Message:

Alteration to previous commit. Had previously made it so that the owner of a item could inject any property regardless of permission. This has been changed to the owner of the item being able to inject specifically a new permission regardless of permission.

Location:

trunk/src/org/expeditee

Files:

• gio/gesture/StandardGestureActions.java (modified) (2 diffs)
• gui/FrameIO.java (modified) (2 diffs)

trunk/src/org/expeditee/gio/gesture/StandardGestureActions.java

@@ -3698 +3698 @@
         public List<Item> deleteItemsAction(Item item) {
                 List<Item> items = new ArrayList<Item>();
+                Item merger = FreeItems.getItemAttachedToCursor();
+                assert (merger != null);
+                
                 // check permissions
-                if (!item.hasPermission(UserAppliedPermission.full) && !item.getOwner().equals(UserSettings.UserName.get())) {
+                boolean isOwnerPermissionChange = 
+                                item.getOwner().equals(UserSettings.UserName.get()) && merger.getText().startsWith("Permission:");      
+                if (!item.hasPermission(UserAppliedPermission.full) && !isOwnerPermissionChange) {
                         // Items on the message box have parent == null
                         if (item.getParent() != null) {
@@ -3717 +3722 @@
                         }
                 }
-                Item merger = FreeItems.getItemAttachedToCursor();
-                assert (merger != null);
+
                 Collection<Item> left = null;
                 // when anchoring a line end onto a text line end, holding shift

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

@@ -38 +38 @@
 import java.nio.file.StandardCopyOption;
 import java.sql.Time;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -433 +434 @@
          */
         public static List<String> getProfilesList() {
-                List<File> potentialProfiles = Arrays.asList(new File(FrameIO.PROFILE_PATH).listFiles());
+                File[] listFiles = new File(FrameIO.PROFILE_PATH).listFiles();
+                if (listFiles == null) return new ArrayList<String>();
+                List<File> potentialProfiles = Arrays.asList(listFiles);
                 potentialProfiles.removeIf(file -> !file.isDirectory());
                 return potentialProfiles.stream().map(dir -> dir.getName()).collect(Collectors.toList());