altoslib: Switch preserved state format to JSON

This is much easier to debug than the icky strings with backslashes everywhere.

Signed-off-by: Keith Packard <keithp@keithp.com>

1 files changed, 22 insertions, 4 deletions

diff --git a/altoslib/AltosParse.java b/altoslib/AltosParse.java
index fbd049ae..45ef7dac 100644
--- a/altoslib/AltosParse.java
+++ b/altoslib/AltosParse.java
@@ -49,9 +49,23 @@ public class AltosParse {
 		}
 	}
 
-	static NumberFormat nf_locale = NumberFormat.getInstance();
+	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 = NumberFormat.getInstance(Locale.ROOT);
+	static NumberFormat nf_net = get_nf_net();
 
 	public static double parse_double_locale(String str) throws ParseException {
 		try {
@@ -67,14 +81,18 @@ public class AltosParse {
 
 	public static double parse_double_net(String str) throws ParseException {
 		try {
-			return nf_net.parse(str.trim()).doubleValue();
+			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) {
-		return nf_net.format(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 {