Changeset 7075 in josm for trunk/src/org/openstreetmap/josm/gui/ImageryMenu.java

Timestamp:

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

Author:

Don-vip

Message:

Robustness to allow to run more unit tests in headless mode

File:

• trunk/src/org/openstreetmap/josm/gui/ImageryMenu.java (modified) (4 diffs)

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

@@ -6 +6 @@
 
 import java.awt.Component;
+import java.awt.GraphicsEnvironment;
 import java.awt.MenuComponent;
 import java.awt.Toolkit;
@@ -104 +105 @@
         MainMenu.add(subMenu, rectaction);
     }
-    
+
     private void setupMenuScroller() {
-        int screenHeight = Toolkit.getDefaultToolkit().getScreenSize().height;
-        int menuItemHeight = singleOffset.getPreferredSize().height;
-        MenuScroller.setScrollerFor(this, (screenHeight / menuItemHeight)-1);
+        if (!GraphicsEnvironment.isHeadless()) {
+            int screenHeight = Toolkit.getDefaultToolkit().getScreenSize().height;
+            int menuItemHeight = singleOffset.getPreferredSize().height;
+            MenuScroller.setScrollerFor(this, (screenHeight / menuItemHeight)-1);
+        }
     }
 
@@ -234 +237 @@
 
     /**
-     * Collection to store temporary menu items. They will be deleted 
+     * Collection to store temporary menu items. They will be deleted
      * (and possibly recreated) when refreshImageryMenu() is called.
      * @since 5803
      */
     private List <Object> dynamicItems = new ArrayList<>(20);
-    
+
     /**
      * Remove all the items in @field dynamicItems collection
@@ -264 +267 @@
         add(s);
     }
-    
+
     private void addDynamic(Action a) {
         dynamicItems.add( this.add(a) );
     }
-    
+
     private void addDynamic(JMenuItem it) {
         dynamicItems.add( this.add(it) );