Changeset 13050 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint

Timestamp:

2017-10-29T14:57:41+01:00 (6 years ago)

Author:

Don-vip

Message:

fix #14602 - allow both dot and comma decimal separator everywhere possible for user-entered values

File:

• trunk/src/org/openstreetmap/josm/gui/mappaint/RenderingCLI.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/gui/mappaint/RenderingCLI.java

@@ -21 +21 @@
 import org.openstreetmap.gui.jmapviewer.OsmMercator;
 import org.openstreetmap.josm.CLIModule;
-import org.openstreetmap.josm.tools.I18n;
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.Bounds;
@@ -37 +36 @@
 import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.spi.preferences.MemoryPreferences;
+import org.openstreetmap.josm.tools.I18n;
+import org.openstreetmap.josm.tools.JosmDecimalFormatSymbolsProvider;
 import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.RightAndLefthandTraffic;
@@ -263 +264 @@
                 case SCALE:
                     try {
-                        argScale = Double.parseDouble(getopt.getOptarg());
+                        argScale = JosmDecimalFormatSymbolsProvider.parseDouble(getopt.getOptarg());
                     } catch (NumberFormatException nfe) {
                         throw new IllegalArgumentException(
@@ -285 +286 @@
                 case WIDTH_M:
                     try {
-                        argWidthM = Double.parseDouble(getopt.getOptarg());
+                        argWidthM = JosmDecimalFormatSymbolsProvider.parseDouble(getopt.getOptarg());
                     } catch (NumberFormatException nfe) {
                         throw new IllegalArgumentException(
@@ -295 +296 @@
                 case HEIGHT_M:
                     try {
-                        argHeightM = Double.parseDouble(getopt.getOptarg());
+                        argHeightM = JosmDecimalFormatSymbolsProvider.parseDouble(getopt.getOptarg());
                     } catch (NumberFormatException nfe) {
                         throw new IllegalArgumentException(