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

Timestamp:

2014-05-08T02:40:40+02:00 (9 years ago)

Author:

Don-vip

Message:

Robustness to allow to run more unit tests in headless mode

Location:

trunk/src/org/openstreetmap/josm/tools

Files:

• ImageProvider.java (modified) (4 diffs)
• PlatformHookUnixoid.java (modified) (2 diffs)

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

@@ -8 +8 @@
 import java.awt.Graphics;
 import java.awt.Graphics2D;
-import java.awt.GraphicsConfiguration;
 import java.awt.GraphicsEnvironment;
 import java.awt.Image;
@@ -14 +13 @@
 import java.awt.RenderingHints;
 import java.awt.Toolkit;
-import java.awt.Transparency;
 import java.awt.image.BufferedImage;
 import java.io.ByteArrayInputStream;
@@ -793 +791 @@
             img = overlay(img, ImageProvider.get("cursor/modifier/" + overlay), OverlayPosition.SOUTHEAST);
         }
+        if (GraphicsEnvironment.isHeadless()) {
+            Main.warn("Cursors are not available in headless mode. Returning null for '"+name+"'");
+            return null;
+        }
         return Toolkit.getDefaultToolkit().createCustomCursor(img.getImage(),
                 "crosshair".equals(name) ? new Point(10, 10) : new Point(3, 2), "Cursor");
@@ -808 +810 @@
      */
     public static ImageIcon overlay(Icon ground, Icon overlay, OverlayPosition pos) {
-        GraphicsConfiguration conf = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice()
-                .getDefaultConfiguration();
         int w = ground.getIconWidth();
         int h = ground.getIconHeight();
         int wo = overlay.getIconWidth();
         int ho = overlay.getIconHeight();
-        BufferedImage img = conf.createCompatibleImage(w, h, Transparency.TRANSLUCENT);
+        BufferedImage img = new BufferedImage(w, h, BufferedImage.TYPE_INT_ARGB);
         Graphics g = img.createGraphics();
         ground.paintIcon(null, g, 0, 0);

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

@@ -99 +99 @@
     @Override
     public boolean canFullscreen() {
-        return GraphicsEnvironment.getLocalGraphicsEnvironment()
+        return !GraphicsEnvironment.isHeadless() &&
+                GraphicsEnvironment.getLocalGraphicsEnvironment()
         .getDefaultScreenDevice().isFullScreenSupported();
     }
@@ -328 +329 @@
     }
 
-    // Method kept because strings have already been translated. To enable for Java 8 migration somewhere in 2016 
+    // Method kept because strings have already been translated. To enable for Java 8 migration somewhere in 2016
     protected void askUpdateJava(final String version, final String url) {
         GuiHelper.runInEDTAndWait(new Runnable() {