Changeset 244

Timestamp:

08/21/08 11:21:14 (16 years ago)

Author:

ra33

Message:

 

Location:

trunk/src/org/expeditee/dnd

Files:

• . (added)
• FileImporter.java (copied) (copied from trunk/src/org/expeditee/io/FileImporter.java ) (1 diff)
• FilePathImporter.java (copied) (copied from trunk/src/org/expeditee/io/FilePathImporter.java ) (2 diffs)
• FrameDNDTransferHandler.java (copied) (copied from trunk/src/org/expeditee/FrameDNDTransferHandler.java ) (6 diffs)

trunk/src/org/expeditee/dnd/FileImporter.java

@@ -1 @@
-package org.expeditee.io;
+package org.expeditee.importer;
 
 import java.awt.Point;

trunk/src/org/expeditee/dnd/FilePathImporter.java

@@ -1 @@
-package org.expeditee.io;
+package org.expeditee.importer;
 
 import java.awt.Point;
@@ -5 +5 @@
 import java.io.IOException;
 
-import org.expeditee.FrameDNDTransferHandler;
 
 /**

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

@@ -1 @@
-package org.expeditee;
+package org.expeditee.importer;
 
 import java.awt.Point;
@@ -16 +16 @@
 import org.expeditee.gui.Browser;
 import org.expeditee.gui.DisplayIO;
+import org.expeditee.gui.FrameGraphics;
 import org.expeditee.gui.MessageBay;
-import org.expeditee.io.FileImporter;
-import org.expeditee.io.FilePathImporter;
 import org.expeditee.items.Text;
 
@@ -49 +48 @@
                 
                 // TODO: Image
+                _standardFileImporters.add(new ImageImporter());
                 _standardFileImporters.add(new FilePathImporter()); // Filepath importer as last resort
         
@@ -207 +207 @@
          *              The location in the current ecpeditee frame of where to drop the text item.
          */
-        public static void importString(String text, Point expediteeDropPoint) {
+        public static Text importString(String text, Point expediteeDropPoint) {
                 
                 assert(DisplayIO.getCurrentFrame() != null);
@@ -216 +216 @@
                 
                 DisplayIO.getCurrentFrame().addItem(importedTextItem);
-                
-        }
-        
-        private void importFileList(List<? extends File> files, Point expediteeDropPoint) throws IOException {
+                FrameGraphics.requestRefresh(true);
+                
+                return importedTextItem;
+        }
+        
+        public void importFileList(List<? extends File> files, Point expediteeDropPoint) throws IOException {
         
                 Point currentPoint = expediteeDropPoint.getLocation();
@@ -227 +229 @@
                         importFile(fileToImport, currentPoint);
                         
-                        currentPoint.y += 30;
+                        currentPoint.y += 30; //TODO this needs to relate to the bottom of the item that was created
                         
                         // TODO: Better placement strategy