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, 20 insertions, 1 deletions

diff --git a/altoslib/AltosFrequency.java b/altoslib/AltosFrequency.java
index f9aa6de6..99828d53 100644
--- a/altoslib/AltosFrequency.java
+++ b/altoslib/AltosFrequency.java
@@ -21,7 +21,7 @@ import java.io.*;
 import java.util.*;
 import java.text.*;
 
-public class AltosFrequency {
+public class AltosFrequency implements AltosJsonable {
 	public double	frequency;
 	public String	description;
 
@@ -66,6 +66,14 @@ public class AltosFrequency {
 		return h;
 	}
 
+	public AltosJson json() {
+		AltosJson	j = new AltosJson();
+
+		j.put("frequency", frequency);
+		j.put("description", description);
+		return j;
+	}
+
 	public AltosFrequency(double f, String d) {
 		frequency = f;
 		description = d;
@@ -81,4 +89,15 @@ public class AltosFrequency {
 			return def;
 		return new AltosFrequency(h);
 	}
+
+	private AltosFrequency(AltosJson j) {
+		frequency = j.get_double("frequency", 0.0);
+		description = j.get_string("description", "");
+	}
+
+	public static AltosFrequency fromJson(AltosJson j, AltosFrequency def) {
+		if (j == null)
+			return def;
+		return new AltosFrequency(j);
+	}
 }