Changeset 35

Timestamp:

05/14/08 10:03:13 (16 years ago)

Author:

ra33

Message:

 

File:

• trunk/src/org/expeditee/gui/MouseEventRouter.java (modified) (4 diffs)

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

@@ -24 +24 @@
  * 
  */
-public class MouseEventRouter extends JComponent implements AWTEventListener{
+public class MouseEventRouter extends JComponent implements AWTEventListener {
 
         private static final long serialVersionUID = 1L;
@@ -94 +94 @@
                                         || Frame.itemAttachedToCursor()) {
                                 forwardToExpiditee = true;
-<<<<<<< .mine
                         } else if (DisplayIO.getCurrentFrame() != null) { // is mouse over
                                                                                                                                 // a specific
@@ -110 +109 @@
                                 forwardToExpiditee = (FrameUtils.onItem(DisplayIO
                                                 .getCurrentFrame(), containerPoint.x, containerPoint.y) != null);
-=======
-                        } else if (DisplayIO.getCurrentFrame() != null) { // is mouse over
-                                // a specific
-                                // expeditee
-                                // item?
-                                // NOTE: Do not use FrameUtils.getCurrentItem() - thats relevent
-                                // for old mouse position only
-                                for (Item i : DisplayIO.getCurrentFrame().getItems()) {
-                                        if (i.getPolygon().contains(containerPoint)) {
-                                                forwardToExpiditee = true;
-                                                break;
-                                        }
-                                }
->>>>>>> .r28
                         }
 
@@ -223 +208 @@
                 return false;
         }
-<<<<<<< .mine
-
-=======
->>>>>>> .r28
+
 }