Changeset 9576 in josm for trunk/src/org/openstreetmap/josm/gui/widgets

Timestamp:

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

Author:

Don-vip

Message:

code refactoring for unit tests / headless mode

File:

• trunk/src/org/openstreetmap/josm/gui/widgets/JosmComboBox.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/widgets/JosmComboBox.java

@@ -4 +4 @@
 import java.awt.Component;
 import java.awt.Dimension;
-import java.awt.GraphicsEnvironment;
-import java.awt.Toolkit;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
@@ -24 +22 @@
 import javax.swing.plaf.basic.ComboPopup;
 import javax.swing.text.JTextComponent;
+
+import org.openstreetmap.josm.gui.util.GuiHelper;
 
 /**
@@ -167 +167 @@
         if (prototype != null) {
             setPrototypeDisplayValue(prototype);
-            int screenHeight = GraphicsEnvironment.isHeadless() ? 600 : Toolkit.getDefaultToolkit().getScreenSize().height;
+            int screenHeight = GuiHelper.getScreenSize().height;
             // Compute maximum number of visible items based on the preferred size of the combo box.
             // This assumes that items have the same height as the combo box, which is not granted by the look and feel