Changeset 67 for trunk/src/org/expeditee/gui/MouseEventRouter.java

Timestamp:

05/19/08 12:03:18 (16 years ago)

Author:

ra33

Message:

Fixed a bunch of problems with rectangles and resizing the window, as well as adding some more unit tests etc.

File:

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

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

@@ -95 +95 @@
                                 forwardToExpiditee = true;
                         } else if (DisplayIO.getCurrentFrame() != null) { // is mouse over
-                                                                                                                                // a specific
-                                                                                                                                // expeditee
-                                                                                                                                // item?
+                                // a specific
+                                // expeditee
+                                // item?
                                 // NOTE: Do not use FrameUtils.getCurrentItem() - thats relevent
                                 // for old mouse position only
@@ -110 +110 @@
                                                 .getCurrentFrame(), containerPoint.x, containerPoint.y) != null);
                         }
-                        
+
                         if (forwardToExpiditee) {
 
@@ -125 +125 @@
                                 MouseEvent expediteeEvent = SwingUtilities.convertMouseEvent(e
                                                 .getComponent(), e, _contentPane);
-                                
+
                                 switch (e.getID()) {
                                 case MouseEvent.MOUSE_MOVED:
@@ -131 +131 @@
 
                                         // Ensure that expiditee has focus only if no popups exist
-                                        if (!Browser._theBrowser.getContentPane().isFocusOwner()
-                                                        && !isPopupVisible()) {
-                                                Browser._theBrowser.getContentPane().requestFocus();
+                                        if (Browser._theBrowser.getContentPane() != null) {
+                                                if (!Browser._theBrowser.getContentPane()
+                                                                .isFocusOwner()
+                                                                && !isPopupVisible()) {
+                                                        Browser._theBrowser.getContentPane().requestFocus();
+                                                }
                                         }