Changeset 1436 for trunk/src/org/expeditee/gio/DragAndDropManager.java

Timestamp:

11/05/19 16:16:11 (5 years ago)

Author:

bnemhaus

Message:

Added the ability to copy/paste recognised files (mostly images) into Expeditee. This functionality already existed when drag n dropping, but now also works when using copy/paste.

At this stage, recognised files get imported as a approapriate Text Item. For example, a image will create a @i Text Item and attach it to your cursor. Ideally this would be the image directly. Unfortunately, items attached to the cursor (FreeItems) are not currently parsed. This is something I will discuss with David as there are confounding issues to consider. For example: surrogates...

Attached to the bottom of this commit message are my current thoughts.

Also made it so when creating a @i through DND or Copy/Paste, that @i is as relative as possible. The users image directories setting is used to achieve this.

---

• FreeItems need to be parsed...we would need to deal with primaries/surrogates in them...
• Do we want FreeItems to be parsed? If I attach an item to my cursor and then enter surrogate mode, should it change?
• My gut says no. Both because it would be work, and also because it kind of feels like a free win if we do not.
• But we do want to replace @i with images etc. Therefore, we want an old style parse for FreeItems?

File:

• trunk/src/org/expeditee/gio/DragAndDropManager.java (modified) (8 diffs)

trunk/src/org/expeditee/gio/DragAndDropManager.java

@@ -11 +11 @@
 import org.expeditee.core.Point;
 import org.expeditee.gui.DisplayController;
+import org.expeditee.gui.FreeItems;
 import org.expeditee.importer.FileImporter;
 import org.expeditee.importer.FilePathImporter;
@@ -79 +80 @@
          * @param text
          *            The text content.
-         * 
          * @param expediteeDropPoint
          *            The location in the current expeditee frame of where to drop
          *            the text item.
-         */
-        public static Text importString(String text, Point expediteeDropPoint)
+         * @param attachToFreeItems TODO
+         */
+        public static Text importString(String text, Point expediteeDropPoint, boolean attachToFreeItems)
         {
                 assert (DisplayController.getCurrentFrame() != null);
@@ -92 +93 @@
                 importedTextItem.setPosition(expediteeDropPoint);
 
-                DisplayController.getCurrentFrame().addItem(importedTextItem);
+                if (attachToFreeItems) {
+                        FreeItems.getInstance().add(importedTextItem);
+                        
+                } else {
+                        DisplayController.getCurrentFrame().addItem(importedTextItem);
+                }
                 DisplayController.requestRefresh(true);
 
@@ -98 +104 @@
         }
 
-        /** Imports a list of files into Expeditee's current frame. */
-        public void importFileList(List<? extends File> files, Point expediteeDropPoint) throws IOException
-        {
+        /** Imports a list of files into Expeditee's current frame. 
+         * @param attachToFreeItems TODO*/
+        public void importFileList(List<? extends File> files, Point expediteeDropPoint, boolean attachToFreeItems) throws IOException {
                 Point currentPoint = new Point(expediteeDropPoint);
 
@@ -106 +112 @@
                 for (File fileToImport : files) {
 
-                        Item lastItem = importFile(fileToImport, currentPoint);
-
+                        Item lastItem = importFile(fileToImport, currentPoint, attachToFreeItems);
+                        
                         if (lastItem == null) {
                                 currentPoint.setY(currentPoint.getY() + 30);
@@ -127 +133 @@
          * @param f
          *            The file to import.
-         * 
          * @param expediteeDropPoint
+         * @param attachToFreeItems If true, instead of adding to generated item at {@code expediteeDropPoint}, add to free items.
          * 
          * @throws IOException
          */
-        public Item importFile(File f, Point expediteeDropPoint) throws IOException
+        public Item importFile(File f, Point expediteeDropPoint, boolean attachToFreeItems) throws IOException
         {
                 assert (f != null);
@@ -139 +145 @@
                 // importing routines...
                 Item lastCreatedItem;
-                if (null == (lastCreatedItem = performFileImport(_customFileImporters, f, expediteeDropPoint))) {
+                if (null == (lastCreatedItem = performFileImport(_customFileImporters, f, expediteeDropPoint, attachToFreeItems))) {
                         // Standard file importing
-                        lastCreatedItem = performFileImport(_standardFileImporters, f, expediteeDropPoint);
+                        lastCreatedItem = performFileImport(_standardFileImporters, f, expediteeDropPoint, attachToFreeItems);
                 }
                 
@@ -150 +156 @@
          * Imports a single file into Expeditee's current frame. Importers are given the opportunity to
          * interpret the file in order of their addition to the list.
-         */
-        private Item performFileImport(List<FileImporter> importers, File f, Point expediteeDropPoint) throws IOException
+         * @param attachToFreeItems If true, instead of adding to generated item at {@code expediteeDropPoint}, add to free items.
+         */
+        private Item performFileImport(List<FileImporter> importers, File f, Point expediteeDropPoint, boolean attachToFreeItems) throws IOException
         {
                 for (FileImporter fi : importers) {
-                        Item lastCreated = fi.importFile(f, expediteeDropPoint);
+                        Item lastCreated = fi.importFile(f, expediteeDropPoint, attachToFreeItems);
                         
                         if (lastCreated != null) return lastCreated;