X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FAltosState.java;fp=altoslib%2FAltosState.java;h=93586e8c4465223f65143f94a1f4330842a267e9;hp=26cedce9b99180966d82ad861ff51ce5c8f12d09;hb=7175774c4f60ed3efd54417f2035b50ea0108c7b;hpb=8df6afe843e184e98e5d965cee3af562dfa30a3b

diff --git a/altoslib/AltosState.java b/altoslib/AltosState.java
index 26cedce9..93586e8c 100644
--- a/altoslib/AltosState.java
+++ b/altoslib/AltosState.java
@@ -315,7 +315,7 @@ public class AltosState implements Cloneable, AltosJsonable {
 			computed.finish_update();
 		}
 
-		AltosCValue() {
+		public AltosCValue() {
 			measured = new AltosIValue();
 			computed = new AltosIValue();
 		}
@@ -1638,16 +1638,27 @@ public class AltosState implements Cloneable, AltosJsonable {
 		AltosState s = new AltosState();
 		s.copy(this);
 
+		/* Code to test state save/restore. Enable only for that purpose
+		 */
 		if (false) {
-			AltosJson	json = json();
+			AltosJson	json = new AltosJson(this);
 			String		onetrip = json.toPrettyString();
 			AltosJson	back = AltosJson.fromString(onetrip);
-			AltosState	tripstate = AltosState.fromJson(back);
-			AltosJson	tripjson = tripstate.json();
+			AltosState	tripstate = (AltosState) back.make(this.getClass());
+			AltosJson	tripjson = new AltosJson(tripstate);
 			String		twotrip = tripjson.toPrettyString();
 
 			if (!onetrip.equals(twotrip)) {
-				System.out.printf("one:\n%s\ntwo:\n%s\n", onetrip, twotrip);
+				try {
+					FileWriter one_file = new FileWriter("one.json", true);
+					one_file.write(onetrip);
+					one_file.flush();
+					FileWriter two_file = new FileWriter("two.json", true);
+					two_file.write(twotrip);
+					two_file.flush();
+				} catch (Exception e) {
+				}
+				System.out.printf("json error\n");
 				System.exit(1);
 			}
 		}