Changeset 10035 in josm for trunk/src/org/openstreetmap/josm/gui/util

Timestamp:

2016-03-23T22:36:15+01:00 (9 years ago)

Author:

Don-vip

Message:

code refactoring to ease creation of unit tests by avoiding as much as possible HeadlessException

File:

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

trunk/src/org/openstreetmap/josm/gui/util/GuiHelper.java

@@ -12 +12 @@
 import java.awt.DisplayMode;
 import java.awt.Font;
+import java.awt.Frame;
 import java.awt.GraphicsDevice;
 import java.awt.GraphicsEnvironment;
@@ -509 +510 @@
         });
     }
+
+    /**
+     * Returns the specified component's <code>Frame</code> without throwing exception in headless mode.
+     *
+     * @param parentComponent the <code>Component</code> to check for a <code>Frame</code>
+     * @return the <code>Frame</code> that contains the component, or <code>getRootFrame</code>
+     *         if the component is <code>null</code>, or does not have a valid <code>Frame</code> parent
+     * @see JOptionPane#getFrameForComponent
+     * @see GraphicsEnvironment#isHeadless
+     * @since 10035
+     */
+    public static Frame getFrameForComponent(Component parentComponent) {
+        if (parentComponent == null && GraphicsEnvironment.isHeadless()) {
+            return null;
+        }
+        return JOptionPane.getFrameForComponent(parentComponent);
+    }
 }