Changeset 1109 for trunk/src/org/expeditee/importer/ImageImporter.java

Timestamp:

09/05/18 14:29:09 (6 years ago)

Author:

bln4

Message:

org.expeditee.importer.ImageImporter ->

Now when dragging and dropping a image that is contained within Expeditee.home's images directory, the resulting @i is generated to use a relative address.

File:

• trunk/src/org/expeditee/importer/ImageImporter.java (modified) (3 diffs)

trunk/src/org/expeditee/importer/ImageImporter.java

@@ -21 +21 @@
 import java.io.File;
 import java.io.IOException;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.Collection;
 import java.util.HashSet;
@@ -30 +32 @@
 import org.expeditee.gio.gesture.StandardGestureActions;
 import org.expeditee.gui.DisplayController;
+import org.expeditee.gui.FrameIO;
 import org.expeditee.gui.FrameUtils;
 import org.expeditee.items.Item;
@@ -83 +86 @@
                         StandardGestureActions.deleteItems(enclosure, false);
                 }
-
-                Text source = DragAndDropManager.importString("@i: " + fullPath + size, location);
+                Text source; 
+                final Path imagePath = Paths.get(fullPath);
+                final Path imagesPath = Paths.get(FrameIO.IMAGES_PATH);
+                if(imagePath.startsWith(imagesPath))
+                        source = DragAndDropManager.importString("@i: " + imagePath.getFileName() + size, location);
+                else source = DragAndDropManager.importString("@i: " + fullPath + size, location);
                 source.setThickness(thickness);
                 source.setBorderColor(borderColor);