Changeset 9576 in josm for trunk/src/org/openstreetmap/josm/tools

Timestamp:

2016-01-23T04:49:01+01:00 (9 years ago)

Author:

Don-vip

Message:

code refactoring for unit tests / headless mode

Location:

trunk/src/org/openstreetmap/josm/tools

Files:

• OsmUrlToBounds.java (modified) (3 diffs)
• WindowGeometry.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/tools/OsmUrlToBounds.java

@@ -4 +4 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
-import java.awt.HeadlessException;
-import java.awt.Toolkit;
+import java.awt.Dimension;
 import java.util.HashMap;
 import java.util.Map;
@@ -13 +12 @@
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.projection.Ellipsoid;
+import org.openstreetmap.josm.gui.util.GuiHelper;
 
 public final class OsmUrlToBounds {
@@ -191 +191 @@
     public static Bounds positionToBounds(final double lat, final double lon, final int zoom) {
         int tileSizeInPixels = 256;
-        int height;
-        int width;
-        try {
-            height = Toolkit.getDefaultToolkit().getScreenSize().height;
-            width = Toolkit.getDefaultToolkit().getScreenSize().width;
-            if (Main.isDisplayingMapView()) {
-                height = Main.map.mapView.getHeight();
-                width = Main.map.mapView.getWidth();
-            }
-        } catch (HeadlessException he) {
-            // in headless mode, when running tests
-            height = 480;
-            width = 640;
+        Dimension screenSize = GuiHelper.getScreenSize();
+        int height = screenSize.height;
+        int width = screenSize.width;
+        if (Main.isDisplayingMapView()) {
+            height = Main.map.mapView.getHeight();
+            width = Main.map.mapView.getWidth();
         }
         double scale = (1 << zoom) * tileSizeInPixels / (2 * Math.PI * Ellipsoid.WGS84.a);

trunk/src/org/openstreetmap/josm/tools/WindowGeometry.java

@@ -12 +12 @@
 import java.awt.Point;
 import java.awt.Rectangle;
-import java.awt.Toolkit;
 import java.awt.Window;
 import java.util.regex.Matcher;
@@ -20 +19 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.gui.util.GuiHelper;
 
 /**
@@ -468 +468 @@
      */
     public static Rectangle getFullScreenInfo() {
-        return new Rectangle(new Point(0, 0), Toolkit.getDefaultToolkit().getScreenSize());
+        return new Rectangle(new Point(0, 0), GuiHelper.getScreenSize());
     }