Changeset 166

Timestamp:

07/28/08 16:51:26 (16 years ago)

Author:

bjn8

Message:

Improvements for widgets and popups

File:

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

trunk/src/org/expeditee/FrameDNDTransferHandler.java

@@ -36 +36 @@
         
         // GNOME and KDE desktops have a specialized way of DNDing files
-        private DataFlavor _URIListDataflavor;
+        private DataFlavor _URIListDataflavorString;
+        private DataFlavor _URIListDataflavorCharArray;
         
         private static FrameDNDTransferHandler _instance = new FrameDNDTransferHandler();
@@ -51 +52 @@
         
                 try {
-                        _URIListDataflavor = new DataFlavor("text/uri-list;class=java.lang.String");
+                        _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
                         e.printStackTrace();
-                        _URIListDataflavor = null;
-                }
-                assert(_URIListDataflavor != null);
+                        _URIListDataflavorString = null;
+                }
+                assert(_URIListDataflavorString != null);
+                assert(_URIListDataflavorCharArray != null);
+                
         }
         
@@ -74 +78 @@
                 if (!_customFileImporters.contains(importer))
                         _customFileImporters.add(importer);
+
         }
         
@@ -100 +105 @@
             if (support.isDataFlavorSupported(DataFlavor.stringFlavor)
                         || support.isDataFlavorSupported(DataFlavor.javaFileListFlavor)
-                        || support.isDataFlavorSupported(_URIListDataflavor)) {
+                        || support.isDataFlavorSupported(_URIListDataflavorString)
+                        || support.isDataFlavorSupported(_URIListDataflavorCharArray)) {
 
                     // check if the source actions (a bitwise-OR of supported actions)
@@ -132 +138 @@
                         // data flavor recognized.
                         for (DataFlavor df : support.getTransferable().getTransferDataFlavors()) {
+                                
+                                System.out.println(df);
+                                
 
                                 if (df == DataFlavor.stringFlavor) { // import as text item
@@ -153 +162 @@
                                         
                                 // Usually GNOME and KDE enviroments
-                                } else if (df.equals(_URIListDataflavor)) {
+                                } else if (df.equals(_URIListDataflavorString)) {
                                         
                                         String data = (String)support.getTransferable().getTransferData(
-                                                        _URIListDataflavor);
+                                                        _URIListDataflavorString);
                                         
                                         List<File> files = textURIListToFileList(data);
@@ -164 +173 @@
                                         return true;
 
+                                } else if (df.equals(_URIListDataflavorCharArray)) {
+                                        
+                                        char[] data = (char[])support.getTransferable().getTransferData(
+                                                        _URIListDataflavorCharArray);
+                                        
+                                        String uriString = new String(data);
+                                        
+                                        List<File> files = textURIListToFileList(uriString);
+                                        
+                                        importFileList(files, expediteeDropPoint);
+                                        
+                                        return true;
                                 } 
-                                
                         }
                         
@@ -240 +260 @@
 
         private boolean performFileImport(List<FileImporter> importers, File f, Point expediteeDropPoint) throws IOException {
-                
+
                 for (FileImporter fi : importers) {
                         if (fi.importFile(f, expediteeDropPoint)) return true;