X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosParse.java;h=a8b02b5652611433420350294e35c2e5725fc825;hb=29edc37a8de56cb6eb028e3bf3f56aa70f109eba;hp=5137fef8caddc1c34da4bccb2c47e0771e822074;hpb=b89fb51a963635e2effe3a31f803bfc29c2c46b7;p=fw%2Faltos

diff --git a/altoslib/AltosParse.java b/altoslib/AltosParse.java
index 5137fef8..a8b02b56 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_3;
+package org.altusmetrum.altoslib_6;
 
+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);
 		}
 	}