Changeset 9917 in josm for trunk/src/org/openstreetmap/josm/actions

Timestamp:

2016-03-03T23:06:36+01:00 (8 years ago)

Author:

Don-vip

Message:

better handling of HelpAwareOptionPane.showOptionDialog in headless mode

Location:

trunk/src/org/openstreetmap/josm/actions

Files:

• AbstractInfoAction.java (modified) (2 diffs)
• SimplifyWayAction.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/actions/AbstractInfoAction.java

@@ -85 +85 @@
                 )
         };
-        int ret = HelpAwareOptionPane.showOptionDialog(
+        return 0 == HelpAwareOptionPane.showOptionDialog(
                 Main.parent,
                 msg,
@@ -95 +95 @@
                 HelpUtil.ht("/WarningMessages#ToManyBrowsersToOpen")
         );
-        return ret == 0;
     }
 

trunk/src/org/openstreetmap/josm/actions/SimplifyWayAction.java

@@ -78 +78 @@
                                 )
         };
-        int ret = HelpAwareOptionPane.showOptionDialog(
+        return 0 == HelpAwareOptionPane.showOptionDialog(
                 Main.parent,
                 tr(
@@ -91 +91 @@
                         HelpUtil.ht("/Action/SimplifyWay#ConfirmSimplifyAll")
                 );
-        return ret == 0;
     }