Changeset 1102 for trunk/src/org/expeditee/importer/FrameDNDTransferHandler.java

Timestamp:

05/10/18 16:04:51 (6 years ago)

Author:

davidb

Message:

Reworking of the code-base to separate logic from graphics. This version of Expeditee now supports a JFX graphics as an alternative to SWING

File:

• trunk/src/org/expeditee/importer/FrameDNDTransferHandler.java (modified) (20 diffs)

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

@@ -19 +19 @@
 package org.expeditee.importer;
 
-import java.awt.Point;
 import java.awt.datatransfer.DataFlavor;
 import java.awt.datatransfer.UnsupportedFlavorException;
@@ -32 +31 @@
 import javax.swing.TransferHandler;
 
+import org.expeditee.core.Point;
+import org.expeditee.gio.swing.SwingConversions;
 import org.expeditee.gui.DisplayIO;
 import org.expeditee.gui.FrameGraphics;
@@ -65 +66 @@
         }
 
-        private FrameDNDTransferHandler() {
-
+        private FrameDNDTransferHandler()
+        {
                 // Add standard file importers - order from most ideal to last resort
                 // (if competing)
@@ -74 +75 @@
                 _standardFileImporters.add(new pdfImporter());
                 _standardFileImporters.add(new TextImporter());
-                _standardFileImporters.add(new FilePathImporter()); // Filepath importer
-                // as last resort
+                _standardFileImporters.add(new FilePathImporter()); // Filepath importer as last resort
 
                 try {
-                        _URIListDataflavorString = new DataFlavor(
-                                        "text/uri-list;class=java.lang.String");
-                        _URIListDataflavorCharArray = new DataFlavor(
-                                        "text/uri-list;class=\"[C\"");
-                } catch (ClassNotFoundException e) { // This would never happen,
-                        // java.lang.String is always
-                        // present
+                        _URIListDataflavorString = new DataFlavor("text/uri-list;class=java.lang.String");
+                        _URIListDataflavorCharArray = new DataFlavor("text/uri-list;class=\"[C\"");
+                        
+                // This would never happen, java.lang.String is always present
+                } catch (ClassNotFoundException e) {
                         e.printStackTrace();
                         _URIListDataflavorString = null;
@@ -104 +102 @@
          *             if importer is null.
          */
-        public void addCustomFileImporter(FileImporter importer) {
-                if (importer == null)
-                        throw new NullPointerException("importer");
-                if (!_customFileImporters.contains(importer))
+        public void addCustomFileImporter(FileImporter importer)
+        {
+                if (importer == null) throw new NullPointerException("importer");
+                
+                if (!_customFileImporters.contains(importer)) {
                         _customFileImporters.add(importer);
+                }
 
         }
@@ -121 +121 @@
          *             if importer is null.
          */
-        public void removeCustomFileImporter(FileImporter importer) {
-                if (importer == null)
-                        throw new NullPointerException("importer");
+        public void removeCustomFileImporter(FileImporter importer)
+        {
+                if (importer == null) throw new NullPointerException("importer");
+                
                 _customFileImporters.remove(importer);
         }
@@ -135 +136 @@
 
                 // we only import Strings
-                if (support.isDataFlavorSupported(DataFlavor.stringFlavor)
-                                || support.isDataFlavorSupported(DataFlavor.javaFileListFlavor)
-                                || support.isDataFlavorSupported(_URIListDataflavorString)
-                                || support.isDataFlavorSupported(_URIListDataflavorCharArray)) {
-
+                if (    support.isDataFlavorSupported(DataFlavor.stringFlavor) ||
+                                support.isDataFlavorSupported(DataFlavor.javaFileListFlavor) ||
+                                support.isDataFlavorSupported(_URIListDataflavorString) ||
+                                support.isDataFlavorSupported(_URIListDataflavorCharArray))
+                {
                         // check if the source actions (a bitwise-OR of supported actions)
                         // contains the COPY action
@@ -154 +155 @@
 
         @Override
-        public boolean importData(TransferSupport support) {
-
-                if (!canImport(support) || DisplayIO.getCurrentFrame() == null)
-                        return false;
-
-                // Get the drop location of where to lot the import
+        public boolean importData(TransferSupport support)
+        {
+                if (!canImport(support) || DisplayIO.getCurrentFrame() == null) return false;
+
+                // Get the location of where to drop the import
                 DropLocation location = support.getDropLocation();
 
-                // Covert it into expeditee space
-                Point expediteeDropPoint = location.getDropPoint();
+                // Convert it into expeditee space
+                Point expediteeDropPoint = SwingConversions.fromSwingPoint(location.getDropPoint());
 
                 try {
@@ -170 +170 @@
                         // keep trying until first
                         // data flavor recognized.
-                        for (DataFlavor df : support.getTransferable()
-                                        .getTransferDataFlavors()) {
+                        for (DataFlavor df : support.getTransferable().getTransferDataFlavors()) {
 
                                 System.out.println(df);
@@ -177 +176 @@
                                 if (df == DataFlavor.stringFlavor) { // import as text item
 
-                                        String str = (String) support.getTransferable()
-                                                        .getTransferData(DataFlavor.stringFlavor);
+                                        String str = (String) support.getTransferable().getTransferData(DataFlavor.stringFlavor);
 
                                         if (str != null && str.length() > 0) {
@@ -185 +183 @@
                                         }
 
-                                        // Usually Windows and MAC enviroments
-                                } else if (df == DataFlavor.javaFileListFlavor
-                                                || df.getSubType().equals("x-java-file-list")) { // Windows
-                                        // has
-                                        // other
-                                        // random
-                                        // types...
-
-                                        List<? extends File> files = (List<? extends File>) support
-                                                        .getTransferable().getTransferData(
-                                                                        DataFlavor.javaFileListFlavor);
+                                // Usually Windows and MAC enviroments
+                                // Windows has other random types...
+                                } else if (df == DataFlavor.javaFileListFlavor || df.getSubType().equals("x-java-file-list")) {
+
+                                        List<? extends File> files = (List<? extends File>) support.getTransferable().getTransferData(DataFlavor.javaFileListFlavor);
 
                                         importFileList(files, expediteeDropPoint);
@@ -201 +193 @@
                                         return true;
 
-                                        // Usually GNOME and KDE enviroments
+                                // Usually GNOME and KDE enviroments
                                 } else if (df.equals(_URIListDataflavorString)) {
 
-                                        String data = (String) support.getTransferable()
-                                                        .getTransferData(_URIListDataflavorString);
+                                        String data = (String) support.getTransferable().getTransferData(_URIListDataflavorString);
 
                                         List<File> files = textURIListToFileList(data);
@@ -215 +206 @@
                                 } else if (df.equals(_URIListDataflavorCharArray)) {
 
-                                        char[] data = (char[]) support.getTransferable()
-                                                        .getTransferData(_URIListDataflavorCharArray);
+                                        char[] data = (char[]) support.getTransferable().getTransferData(_URIListDataflavorCharArray);
 
                                         String uriString = new String(data);
@@ -229 +219 @@
 
                 } catch (UnsupportedFlavorException e) {
-                        MessageBay
-                                        .displayMessage("Drag and drop for that type of data is not supported");
+                        MessageBay.displayMessage("Drag and drop for that type of data is not supported");
                 } catch (IOException e) {
                         e.printStackTrace();
@@ -246 +235 @@
          * 
          * @param expediteeDropPoint
-         *            The location in the current ecpeditee frame of where to drop
+         *            The location in the current expeditee frame of where to drop
          *            the text item.
          */
-        public static Text importString(String text, Point expediteeDropPoint) {
-
+        public static Text importString(String text, Point expediteeDropPoint)
+        {
                 assert (DisplayIO.getCurrentFrame() != null);
                 assert (text != null && text.length() > 0);
 
-                Text importedTextItem = new Text(DisplayIO.getCurrentFrame()
-                                .getNextItemID(), text);
+                Text importedTextItem = new Text(DisplayIO.getCurrentFrame().getNextItemID(), text);
                 importedTextItem.setPosition(expediteeDropPoint);
 
@@ -264 +252 @@
         }
 
-        public void importFileList(List<? extends File> files,
-                        Point expediteeDropPoint) throws IOException {
-
-                Point currentPoint = expediteeDropPoint.getLocation();
-
-                for (File fileToImport : files) { // import files one by one
+        public void importFileList(List<? extends File> files, Point expediteeDropPoint) throws IOException
+        {
+                Point currentPoint = new Point(expediteeDropPoint);
+
+                 // import files one by one
+                for (File fileToImport : files) {
 
                         Item lastItem = importFile(fileToImport, currentPoint);
@@ -296 +284 @@
          * @throws IOException
          */
-        public Item importFile(File f, Point expediteeDropPoint) throws IOException {
+        public Item importFile(File f, Point expediteeDropPoint) throws IOException
+        {
                 assert (f != null);
 
@@ -302 +291 @@
                 // importing routines...
                 Item lastCreatedItem;
-                if (null == (lastCreatedItem = performFileImport(_customFileImporters,
-                                f, expediteeDropPoint))) {
-
+                if (null == (lastCreatedItem = performFileImport(_customFileImporters, f, expediteeDropPoint))) {
                         // Standard file importing
-                        lastCreatedItem = performFileImport(_standardFileImporters, f,
-                                        expediteeDropPoint);
-
-                }
+                        lastCreatedItem = performFileImport(_standardFileImporters, f, expediteeDropPoint);
+                }
+                
                 return lastCreatedItem;
         }
 
-        private Item performFileImport(List<FileImporter> importers, File f,
-                        Point expediteeDropPoint) throws IOException {
-
+        private Item performFileImport(List<FileImporter> importers, File f, Point expediteeDropPoint) throws IOException
+        {
                 for (FileImporter fi : importers) {
                         Item lastCreated = fi.importFile(f, expediteeDropPoint);
-                        if (lastCreated != null)
-                                return lastCreated;
+                        
+                        if (lastCreated != null) return lastCreated;
                 }
 
@@ -326 +311 @@
 
         /**
+         * Converts a string formatted as a list of URIs into a list of Files.
+         * 
          * Code adopted from SUN - java BUG ID 4899516 workaround for KDE/GNOME
          * Desktops
@@ -334 +321 @@
          * @return The list of FILES in the uriListString. Never null.
          */
-        private List<File> textURIListToFileList(String uriListString) {
-
+        private List<File> textURIListToFileList(String uriListString)
+        {
                 List<File> fileList = new LinkedList<File>();
 
-                for (StringTokenizer st = new StringTokenizer(uriListString, "\r\n"); st
-                                .hasMoreTokens();) {
+                for (StringTokenizer st = new StringTokenizer(uriListString, "\r\n"); st.hasMoreTokens();) {
 
                         String s = st.nextToken();