Changeset 1436 for trunk/src/org/expeditee/gio/swing

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?

Location:

trunk/src/org/expeditee/gio/swing

Files:

• SwingClipboardManager.java (modified) (4 diffs)
• SwingDragAndDropManager.java (modified) (4 diffs)

trunk/src/org/expeditee/gio/swing/SwingClipboardManager.java

@@ -5 +5 @@
 import java.awt.datatransfer.Transferable;
 import java.awt.datatransfer.UnsupportedFlavorException;
+import java.io.File;
 import java.io.IOException;
 import java.util.LinkedList;
@@ -10 +11 @@
 
 import org.expeditee.core.Image;
+import org.expeditee.core.Point;
 import org.expeditee.gio.ClipboardManager;
+import org.expeditee.gio.DragAndDropManager;
+import org.expeditee.gio.EcosystemManager;
+import org.expeditee.gui.DisplayController;
 
 /** TODO: Comment. cts16 */
@@ -21 +26 @@
                         SwingClipboardManager.expediteeDataFlavour,
                         DataFlavor.imageFlavor,
-                        DataFlavor.stringFlavor
+                        DataFlavor.stringFlavor, 
+                        DataFlavor.javaFileListFlavor
         };
         
@@ -82 +88 @@
                 } else if (DataFlavor.stringFlavor.equals(flavour)) {
                         out.stringRepresentation = (String) content.getTransferData(flavour);
+                } else if (DataFlavor.javaFileListFlavor.equals(flavour)) {
+                        @SuppressWarnings("unchecked")
+                        List<File> transferData = (List<File>) content.getTransferData(flavour);
+                        out.fileRepresentation = transferData;
                 }
-        }
+        }
         
         private Image handleGetImage(Transferable content) throws IOException, UnsupportedFlavorException

trunk/src/org/expeditee/gio/swing/SwingDragAndDropManager.java

@@ -115 +115 @@
 
                                                 if (str != null && str.length() > 0) {
-                                                        importString(str, expediteeDropPoint);
+                                                        importString(str, expediteeDropPoint, false);
                                                         return true;
                                                 }
@@ -125 +125 @@
                                                 List<? extends File> files = (List<? extends File>) support.getTransferable().getTransferData(DataFlavor.javaFileListFlavor);
 
-                                                importFileList(files, expediteeDropPoint);
+                                                importFileList(files, expediteeDropPoint, false);
 
                                                 return true;
@@ -136 +136 @@
                                                 List<File> files = textURIListToFileList(data);
 
-                                                importFileList(files, expediteeDropPoint);
+                                                importFileList(files, expediteeDropPoint, false);
 
                                                 return true;
@@ -148 +148 @@
                                                 List<File> files = textURIListToFileList(uriString);
 
-                                                importFileList(files, expediteeDropPoint);
+                                                importFileList(files, expediteeDropPoint, false);
 
                                                 return true;