Changeset 14052 in josm for trunk/src/org/openstreetmap/josm/gui/MapViewState.java

Timestamp:

2018-07-26T22:01:31+02:00 (6 years ago)

Author:

Don-vip

Message:

see #16010 - use JMockit to enable more extensive test coverage (patch by ris, modified)

see ​https://github.com/openstreetmap/josm/pull/24/commits for details

File:

• trunk/src/org/openstreetmap/josm/gui/MapViewState.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/MapViewState.java

@@ -3 +3 @@
 
 import java.awt.Container;
-import java.awt.GraphicsEnvironment;
 import java.awt.Point;
 import java.awt.geom.AffineTransform;
@@ -146 +145 @@
 
     private static Point findTopLeftOnScreen(JComponent position) {
-        if (GraphicsEnvironment.isHeadless()) {
-            // in our imaginary universe the window is always (10, 10) from the top left of the screen
-            Point topLeftInWindow = findTopLeftInWindow(position);
-            return new Point(topLeftInWindow.x + 10, topLeftInWindow.y + 10);
-        } else {
-            try {
-                return position.getLocationOnScreen();
-            } catch (JosmRuntimeException | IllegalArgumentException | IllegalStateException e) {
-                throw BugReport.intercept(e).put("position", position).put("parent", position::getParent);
-            }
+        try {
+            return position.getLocationOnScreen();
+        } catch (JosmRuntimeException | IllegalArgumentException | IllegalStateException e) {
+            throw BugReport.intercept(e).put("position", position).put("parent", position::getParent);
         }
     }