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

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/actions/ImageryAdjustAction.java (modified) (2 diffs)

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

@@ -39 +39 @@
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.JosmDecimalFormatSymbolsProvider;
 import org.openstreetmap.josm.tools.Logging;
 
@@ -263 +264 @@
             if (layer != null && semicolon >= 0 && semicolon + 1 < ostr.length()) {
                 try {
-                    // here we assume that Double.parseDouble() needs '.' as a decimal separator
-                    String easting = ostr.substring(0, semicolon).trim().replace(',', '.');
-                    String northing = ostr.substring(semicolon + 1).trim().replace(',', '.');
-                    double dx = Double.parseDouble(easting);
-                    double dy = Double.parseDouble(northing);
+                    String easting = ostr.substring(0, semicolon).trim();
+                    String northing = ostr.substring(semicolon + 1).trim();
+                    double dx = JosmDecimalFormatSymbolsProvider.parseDouble(easting);
+                    double dy = JosmDecimalFormatSymbolsProvider.parseDouble(northing);
                     tempOffset.setDisplacement(new EastNorth(dx, dy));
                     layer.getDisplaySettings().setOffsetBookmark(tempOffset);