Changeset 13050 in josm for trunk/src/org/openstreetmap/josm/tools/JosmDecimalFormatSymbolsProvider.java

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

trunk/src/org/openstreetmap/josm/tools/JosmDecimalFormatSymbolsProvider.java

@@ -2 +2 @@
 package org.openstreetmap.josm.tools;
 
+import java.text.DecimalFormat;
 import java.text.DecimalFormatSymbols;
+import java.text.NumberFormat;
 import java.text.spi.DecimalFormatSymbolsProvider;
 import java.util.Locale;
@@ -28 +30 @@
         return I18n.getAvailableTranslations();
     }
+
+    /**
+     * Returns a new {@code double} initialized to the value represented by the specified {@code String},
+     * allowing both dot and comma decimal separators.
+     *
+     * @param  s   the string to be parsed.
+     * @return the {@code double} value represented by the string argument.
+     * @throws NullPointerException  if the string is null
+     * @throws NumberFormatException if the string does not contain a parsable {@code double}.
+     * @see    Double#parseDouble(String)
+     * @since 13050
+     */
+    public static double parseDouble(String s) throws NumberFormatException {
+        String text = s;
+        NumberFormat format = DecimalFormat.getInstance();
+        if (format instanceof DecimalFormat) {
+            char decimalSeparator = ((DecimalFormat) format).getDecimalFormatSymbols().getDecimalSeparator();
+            text = text.replace('.', decimalSeparator).replace(',', decimalSeparator);
+        }
+        return Double.parseDouble(text);
+    }
 }