X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosParse.java;h=de79c2fb16a7b6dbb9703c29ca72ca4d804bdd86;hb=7975d088a4ac44c0943134fa41d0e3b88f50b98f;hp=66bbeed5eb185f5b101b54a1bfad369d1fb44a0b;hpb=bf88c5f829ea5d32043431945e862a9f6c96740a;p=fw%2Faltos

diff --git a/altoslib/AltosParse.java b/altoslib/AltosParse.java
index 66bbeed5..de79c2fb 100644
--- a/altoslib/AltosParse.java
+++ b/altoslib/AltosParse.java
@@ -15,8 +15,9 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_1;
+package org.altusmetrum.altoslib_7;
 
+import java.util.*;
 import java.text.*;
 
 public class AltosParse {
@@ -40,11 +41,23 @@ public class AltosParse {
 		}
 	}
 
-	public static double parse_double(String v) throws ParseException {
+	static NumberFormat nf_locale = NumberFormat.getInstance();
+
+	static NumberFormat nf_net = NumberFormat.getInstance(Locale.ROOT);
+
+	public static double parse_double_locale(String str) throws ParseException {
 		try {
-			return Double.parseDouble(v);
-		} catch (NumberFormatException e) {
-			throw new ParseException("error parsing double " + v, 0);
+			return nf_locale.parse(str.trim()).doubleValue();
+		} catch (ParseException pe) {
+			throw new ParseException("error parsing double " + str, 0);
+		}
+	}
+
+	public static double parse_double_net(String str) throws ParseException {
+		try {
+			return nf_net.parse(str.trim()).doubleValue();
+		} catch (ParseException pe) {
+			throw new ParseException("error parsing double " + str, 0);
 		}
 	}