Changeset 738

Timestamp:

01/22/14 15:05:26 (10 years ago)

Author:

jts21

Message:

Implement carrying items between Expeditee windows. Currently doesn't work well on edges where the windows are overlapping (it works, but only if you move the mouse very slowly so it correctly gets a MOUSE_EXITED event)

Location:

trunk/src/org/expeditee

Files:

• gui/Browser.java (modified) (4 diffs)
• gui/FrameMouseActions.java (modified) (3 diffs)
• gui/MouseEventRouter.java (modified) (5 diffs)
• io/ItemSelection.java (modified) (2 diffs)

trunk/src/org/expeditee/gui/Browser.java

@@ -10 +10 @@
 import java.awt.RenderingHints;
 import java.awt.Toolkit;
+import java.awt.datatransfer.Clipboard;
+import java.awt.datatransfer.Transferable;
 import java.awt.event.ComponentEvent;
 import java.awt.event.ComponentListener;
@@ -21 +23 @@
 import java.util.Collection;
 import java.util.LinkedList;
+import java.util.List;
 
 import javax.swing.JFrame;
@@ -31 +34 @@
 import org.expeditee.agents.mail.MailSession;
 import org.expeditee.importer.FrameDNDTransferHandler;
+import org.expeditee.io.ExpClipReader;
 import org.expeditee.io.ItemSelection;
 import org.expeditee.io.ProxyAuth;
+import org.expeditee.io.ItemSelection.ExpDataHandler;
 import org.expeditee.items.Item;
+import org.expeditee.items.ItemUtils;
 import org.expeditee.items.widgets.WidgetCacheManager;
 import org.expeditee.network.FrameShare;
@@ -431 +437 @@
 
         public void windowActivated(WindowEvent e) {
-                // System.out.println("Activated");
         }
 
         public void windowDeactivated(WindowEvent e) {
-                ItemSelection.cut(FreeItems.getInstance());
         }
 

trunk/src/org/expeditee/gui/FrameMouseActions.java

@@ -1 +1 @@
 package org.expeditee.gui;
 
+import java.awt.Image;
 import java.awt.Point;
 import java.awt.Rectangle;
+import java.awt.Toolkit;
+import java.awt.datatransfer.Clipboard;
+import java.awt.datatransfer.DataFlavor;
+import java.awt.datatransfer.StringSelection;
+import java.awt.datatransfer.Transferable;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -28 +34 @@
 import org.expeditee.actions.Misc;
 import org.expeditee.actions.Navigation;
+import org.expeditee.io.ExpClipReader;
+import org.expeditee.io.ItemSelection;
+import org.expeditee.io.ItemSelection.ExpDataHandler;
 import org.expeditee.items.Circle;
 import org.expeditee.items.Constraint;
@@ -1657 +1666 @@
         }
 
+        private static boolean inWindow = false;
+        /**
+         * event called when mouse exits window
+         * (can't use MouseListener callback since that callback doesn't
+         *  correctly receive all mouse exit events) 
+         */
+        public static void mouseExitedWindow(MouseEvent e) {
+                inWindow = false;
+                // System.out.println("Left window");
+                if(FreeItems.itemsAttachedToCursor())
+                        ItemSelection.cut(FreeItems.getInstance());
+        }
+        
         public void mouseEntered(MouseEvent e) {
+                // check if we are entering the window from outside of the window, or if we were just over a widget
+                if(!inWindow) {
+                        inWindow = true;
+                        // if there is expeditee data on the clipboard that has not yet been autoPasted, autoPaste it
+                Clipboard c = Toolkit.getDefaultToolkit().getSystemClipboard();
+                Transferable content = c.getContents(null);
+                try {
+                        if(content.isDataFlavorSupported(ItemSelection.expDataFlavor)) {        // Expeditee data
+                                ExpDataHandler expData = (ExpDataHandler)content.getTransferData(ItemSelection.expDataFlavor);
+                                if(expData.autoPaste) {
+                                        List<Item> items = new ExpClipReader(FrameMouseActions.getX(), FrameMouseActions.getY()).read(expData.items);
+                                        // generate new IDs and pickup
+                                        FrameMouseActions.pickup(ItemUtils.CopyItems(items));
+                                        // update the clipboard contents so they won't be autoPasted again
+                                        expData.autoPaste = false;
+                                        String stringData = "";
+                                        Image imageData = null;
+                                        if(content.isDataFlavorSupported(DataFlavor.stringFlavor)) {
+                                                stringData = (String) content.getTransferData(DataFlavor.stringFlavor);
+                                        }
+                                        if(content.isDataFlavorSupported(DataFlavor.imageFlavor)) {
+                                                imageData = (Image) content.getTransferData(DataFlavor.imageFlavor);
+                                        }
+                                        c.setContents(new ItemSelection(stringData, imageData, expData), null);
+                                }
+                        }
+                } catch(Exception ex) {
+                        ex.printStackTrace(); 
+                }
+                }
         }
 

trunk/src/org/expeditee/gui/MouseEventRouter.java

@@ -4 +4 @@
 import java.awt.Component;
 import java.awt.Container;
+import java.awt.Image;
 import java.awt.Point;
 import java.awt.Toolkit;
+import java.awt.datatransfer.Clipboard;
+import java.awt.datatransfer.DataFlavor;
+import java.awt.datatransfer.Transferable;
 import java.awt.event.AWTEventListener;
 import java.awt.event.MouseEvent;
@@ -20 +24 @@
 import javax.swing.SwingUtilities;
 
+import org.expeditee.io.ExpClipReader;
+import org.expeditee.io.ItemSelection;
+import org.expeditee.io.ItemSelection.ExpDataHandler;
 import org.expeditee.items.Item;
+import org.expeditee.items.ItemUtils;
 
 /**
@@ -141 +149 @@
          */
         private void routeMouseEvent(MouseEvent e) {
-
                 _currentMouseEvent = e;
 
@@ -147 +154 @@
                 Point containerPoint = SwingUtilities.convertPoint(e.getComponent(), e
                                 .getPoint(), _contentPane);
+                
+                // TODO: Find a reliable way of detecting when the mouse moved onto a window that isn't a child of ours
+                if(e.getID() == MouseEvent.MOUSE_EXITED) {
+                        // System.out.println(e.getComponent());
+                        if(e.getSource() instanceof Browser || e.getComponent() instanceof Browser ||
+                                        e.getX() <= 0 || e.getX() >= _contentPane.getWidth() ||
+                                        e.getY() <= 0 || e.getY() >= _contentPane.getHeight()) {
+                                FrameMouseActions.mouseExitedWindow(e);
+                        }
+                }
 
                 if (containerPoint.y < 0) { // not in the content pane
@@ -272 +289 @@
                                         break;
                                 case MouseEvent.MOUSE_ENTERED:
+                                        withExtensions = duplicateMouseEvent(expediteeEvent, e
+                                                        .getModifiers()
+                                                        | e.getModifiersEx());
                                         for (MouseListener listener : _mouseListeners) {
                                                 listener.mouseEntered(withExtensions);

trunk/src/org/expeditee/io/ItemSelection.java

@@ -9 +9 @@
 import java.awt.datatransfer.UnsupportedFlavorException;
 import java.awt.image.BufferedImage;
-import java.awt.image.DataBuffer;
-import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.IOException;
-import java.io.ObjectOutputStream;
 import java.io.Serializable;
 import java.util.Arrays;
@@ -46 +43 @@
                 
                 private static final long serialVersionUID = 1L;
+
+                // whether this should be automatically picked up
+                public boolean autoPaste = true;
                 
                 // exp save data