X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FAltosParse.java;h=77cf969df33fa357390bc7c011ac0d8806f6d556;hp=e938a177e6b3967926e3f5ffd756cc1200653974;hb=d1d98e408311c5ba18138a18f4c88448e4254626;hpb=20bc23ddb90f8a6da1f7ea70f02cf3a038059d32

diff --git a/altoslib/AltosParse.java b/altoslib/AltosParse.java
index e938a177..77cf969d 100644
--- a/altoslib/AltosParse.java
+++ b/altoslib/AltosParse.java
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,8 +16,9 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.AltosLib;
+package org.altusmetrum.altoslib_12;
 
+import java.util.*;
 import java.text.*;
 
 public class AltosParse {
@@ -25,6 +27,14 @@ public class AltosParse {
 	}
 
 	public static int parse_int(String v) throws ParseException {
+		try {
+			return (int) AltosLib.fromdec(v);
+		} catch (NumberFormatException e) {
+			throw new ParseException("error parsing int " + v, 0);
+		}
+	}
+
+	public static long parse_long(String v) throws ParseException {
 		try {
 			return AltosLib.fromdec(v);
 		} catch (NumberFormatException e) {
@@ -40,14 +50,52 @@ public class AltosParse {
 		}
 	}
 
-	public static double parse_double(String v) throws ParseException {
+	static NumberFormat get_nf_locale() {
+		NumberFormat nf = NumberFormat.getInstance();
+		nf.setParseIntegerOnly(false);
+		nf.setGroupingUsed(false);
+		return nf;
+	}
+
+	static NumberFormat nf_locale = get_nf_locale();
+
+	static NumberFormat get_nf_net() {
+		NumberFormat nf = NumberFormat.getInstance(Locale.ROOT);
+		nf.setParseIntegerOnly(false);
+		nf.setGroupingUsed(false);
+		return nf;
+	}
+
+	static NumberFormat nf_net = get_nf_net();
+
+	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 String format_double_locale(double number) {
+		return nf_locale.format(number);
+	}
+
+	public static double parse_double_net(String str) throws ParseException {
+		try {
+			String t = str.trim();
+//			System.out.printf("Parse string \"%s\" trim \"%s\"\n", str, t);
+			return nf_net.parse(t).doubleValue();
+		} catch (ParseException pe) {
+			throw new ParseException("error parsing double " + str, 0);
 		}
 	}
 
+	public static String format_double_net(double number) {
+		String ret = nf_net.format(number);
+//		System.out.printf("format double %f \"%s\"\n", number, ret);
+		return ret;
+	}
+
 	public static double parse_coord(String coord) throws ParseException {
 		String[]	dsf = coord.split("\\D+");