Changeset 13475 in josm for trunk/src

Timestamp:

2018-02-28T20:10:44+01:00 (6 years ago)

Author:

Don-vip

Message:

fix #16030 - call getMousePosition() only when needed

File:

• trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/ButtonMarker.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/ButtonMarker.java

@@ -52 +52 @@
         buttonRectangle.setLocation(screen.x+4, screen.y+2);
         paintIcon(mv, g, screen.x+4, screen.y+2);
-        Border b;
-        Point mousePosition = mv.getMousePosition();
-
-        // mouse is inside the window
-        if (mousePosition != null && mousePressed && containsPoint(mousePosition)) {
-            b = BorderFactory.createBevelBorder(BevelBorder.LOWERED);
-        } else {
-            b = BorderFactory.createBevelBorder(BevelBorder.RAISED);
+        boolean lowered = false;
+        if (mousePressed) {
+            Point mousePosition = mv.getMousePosition(); // slow and can throw NPE, see JDK-6840067
+            // mouse is inside the window
+            lowered = mousePosition != null && containsPoint(mousePosition);
         }
+        Border b = BorderFactory.createBevelBorder(lowered ? BevelBorder.LOWERED : BevelBorder.RAISED);
         Insets inset = b.getBorderInsets(mv);
         Rectangle r = new Rectangle(buttonRectangle);