Changeset 1446 for trunk

Timestamp:

11/12/19 13:31:04 (4 years ago)

Author:

bnemhaus

Message:

org.expeditee.gui.managment.ResourceUtil.newImageWithName(Image, String) now handles the generation of new images when copy/pasting images that do not have a file (for example, from a web page or paint program)

Location:

trunk/src/org/expeditee

Files:

• gio/gesture/StandardGestureActions.java (modified) (1 diff)
• gui/management/ResourceUtil.java (modified) (2 diffs)
• io/ItemSelection.java (modified) (3 diffs)

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

@@ -3763 +3763 @@
                 
                 // check permissions
+                boolean isSameOwner = item.getOwner().equals(UserSettings.UserName.get());
                 boolean isOwnerPermissionChange = 
-                                item.getOwner().equals(UserSettings.UserName.get()) && merger.getText().startsWith("Permission:");      
+                                isSameOwner && merger.getText().startsWith("Permission:");      
                 if (!item.hasPermission(UserAppliedPermission.full) && !isOwnerPermissionChange) {
                         // Items on the message box have parent == null

trunk/src/org/expeditee/gui/management/ResourceUtil.java

@@ -1 +1 @@
 package org.expeditee.gui.management;
 
+import java.io.File;
+import java.io.IOException;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.List;
 
+import org.expeditee.core.Image;
+import org.expeditee.gui.DisplayController;
 import org.expeditee.gui.Frame;
 import org.expeditee.gui.FrameIO;
+import org.expeditee.items.Text;
 
 public class ResourceUtil {
@@ -44 +49 @@
                 
                 return null;
+        }
+        
+        public static Text newImageWithName(Image img, String name) throws IOException {
+                ResourceManager.images.getDirectories();// TODO: save this image out to the first directory in list instead of to IMAGES_PATH
+                File out = new File(FrameIO.IMAGES_PATH + name);
+                out.mkdirs();
+                img.writeToDisk("png", out);
+                Text item = DisplayController.getCurrentFrame().createNewText("@i: " + out.getName());
+                return item;
         }
         

trunk/src/org/expeditee/io/ItemSelection.java

@@ -19 +19 @@
 package org.expeditee.io;
 
-import java.io.File;
 import java.io.IOException;
 import java.io.Serializable;
@@ -26 +25 @@
 
 import org.expeditee.core.Image;
-import org.expeditee.core.Point;
 import org.expeditee.gio.ClipboardManager.ClipboardData;
 import org.expeditee.gio.EcosystemManager;
 import org.expeditee.gio.gesture.StandardGestureActions;
 import org.expeditee.gui.DisplayController;
-import org.expeditee.gui.FrameIO;
 import org.expeditee.gui.FreeItems;
 import org.expeditee.gui.MessageBay;
+import org.expeditee.gui.management.ResourceUtil;
 import org.expeditee.items.Item;
 import org.expeditee.items.ItemUtils;
@@ -174 +172 @@
                                 //int hashcode = Arrays.hashCode(img.getData().getPixels(0, 0, img.getWidth(), img.getHeight(), (int[])null));
                                 int hashcode = img.hashCode();
-                                File out = new File(FrameIO.IMAGES_PATH + Integer.toHexString(hashcode) + ".png");
-                                out.mkdirs();
-                                img.writeToDisk("png", out);
-                                Text item = DisplayController.getCurrentFrame().createNewText("@i: " + out.getName());
+                                String name = Integer.toHexString(hashcode) + ".png";
+                                Text item = ResourceUtil.newImageWithName(img, name);
                                 f.add(item);
                                 ExpClipReader.updateItems(f);