Changeset 10164 in josm for trunk/src

Timestamp:

2016-04-29T11:03:45+02:00 (9 years ago)

Author:

Don-vip

Message:

add more unit tests

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/downloadtasks/ChangesetHeaderDownloadTask.java (modified) (1 diff)
• gui/util/GuiHelper.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/actions/downloadtasks/ChangesetHeaderDownloadTask.java

@@ -149 +149 @@
             ids.add(cs.getId());
         }
-        if (parent == null)
-            return new ChangesetHeaderDownloadTask(ids);
-        else
-            return new ChangesetHeaderDownloadTask(parent, ids);
+        return new ChangesetHeaderDownloadTask(parent, ids);
     }
 }

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

@@ -16 +16 @@
 import java.awt.GraphicsEnvironment;
 import java.awt.GridBagLayout;
+import java.awt.HeadlessException;
 import java.awt.Image;
 import java.awt.Stroke;
@@ -522 +523 @@
      */
     public static Frame getFrameForComponent(Component parentComponent) {
-        if (parentComponent == null && GraphicsEnvironment.isHeadless()) {
+        try {
+            return JOptionPane.getFrameForComponent(parentComponent);
+        } catch (HeadlessException e) {
+            if (Main.isDebugEnabled()) {
+                Main.debug(e.getMessage());
+            }
             return null;
         }
-        return JOptionPane.getFrameForComponent(parentComponent);
     }
 }