Changeset 13050 in josm for trunk/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java

Timestamp:

2017-10-29T14:57:41+01:00 (7 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/widgets/BoundingBoxSelectionPanel.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java

@@ -20 +20 @@
 import org.openstreetmap.josm.data.coor.conversion.DecimalDegreesCoordinateFormat;
 import org.openstreetmap.josm.tools.GBC;
+import org.openstreetmap.josm.tools.JosmDecimalFormatSymbolsProvider;
+import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.OsmUrlToBounds;
 
@@ -99 +101 @@
         double minlon, minlat, maxlon, maxlat;
         try {
-            minlat = Double.parseDouble(tfLatLon[0].getText().trim());
-            minlon = Double.parseDouble(tfLatLon[1].getText().trim());
-            maxlat = Double.parseDouble(tfLatLon[2].getText().trim());
-            maxlon = Double.parseDouble(tfLatLon[3].getText().trim());
+            minlat = JosmDecimalFormatSymbolsProvider.parseDouble(tfLatLon[0].getText().trim());
+            minlon = JosmDecimalFormatSymbolsProvider.parseDouble(tfLatLon[1].getText().trim());
+            maxlat = JosmDecimalFormatSymbolsProvider.parseDouble(tfLatLon[2].getText().trim());
+            maxlon = JosmDecimalFormatSymbolsProvider.parseDouble(tfLatLon[3].getText().trim());
         } catch (NumberFormatException e) {
+            Logging.trace(e);
             return null;
         }
         if (!LatLon.isValidLon(minlon) || !LatLon.isValidLon(maxlon)
-                || !LatLon.isValidLat(minlat) || !LatLon.isValidLat(maxlat))
+         || !LatLon.isValidLat(minlat) || !LatLon.isValidLat(maxlat))
             return null;
         if (minlon > maxlon)
@@ -145 +148 @@
             double value = 0;
             try {
-                value = Double.parseDouble(getComponent().getText());
+                value = JosmDecimalFormatSymbolsProvider.parseDouble(getComponent().getText());
             } catch (NumberFormatException ex) {
                 feedbackInvalid(tr("The string ''{0}'' is not a valid double value.", getComponent().getText()));
+                Logging.trace(ex);
                 return;
             }
@@ -160 +164 @@
         public boolean isValid() {
             try {
-                return LatLon.isValidLat(Double.parseDouble(getComponent().getText()));
-            } catch (NumberFormatException ex) {
+                return LatLon.isValidLat(JosmDecimalFormatSymbolsProvider.parseDouble(getComponent().getText()));
+            } catch (NumberFormatException ex) {
+                Logging.trace(ex);
                 return false;
             }
@@ -181 +186 @@
             double value = 0;
             try {
-                value = Double.parseDouble(getComponent().getText());
+                value = JosmDecimalFormatSymbolsProvider.parseDouble(getComponent().getText());
             } catch (NumberFormatException ex) {
                 feedbackInvalid(tr("The string ''{0}'' is not a valid double value.", getComponent().getText()));
+                Logging.trace(ex);
                 return;
             }
@@ -196 +202 @@
         public boolean isValid() {
             try {
-                return LatLon.isValidLon(Double.parseDouble(getComponent().getText()));
-            } catch (NumberFormatException ex) {
+                return LatLon.isValidLon(JosmDecimalFormatSymbolsProvider.parseDouble(getComponent().getText()));
+            } catch (NumberFormatException ex) {
+                Logging.trace(ex);
                 return false;
             }