From 975751b604784e86b2ddb944a72b55ca3f14cf63 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Tue, 9 May 2017 00:13:16 -0700 Subject: altoslib: Hide members from json by prefixing with __ This lets some structures which would otherwise recurse (and crash) get converted to json, assuming the hidden members aren't relevant. Signed-off-by: Keith Packard --- altoslib/AltosConfigData.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'altoslib/AltosConfigData.java') diff --git a/altoslib/AltosConfigData.java b/altoslib/AltosConfigData.java index 6b55cc6f..bd85c2c2 100644 --- a/altoslib/AltosConfigData.java +++ b/altoslib/AltosConfigData.java @@ -35,7 +35,7 @@ public class AltosConfigData implements Iterable { public int altitude_32; /* Strings returned */ - public LinkedList lines; + public LinkedList __lines; /* Config information */ /* HAS_FLIGHT*/ @@ -143,7 +143,7 @@ public class AltosConfigData implements Iterable { } public Iterator iterator() { - return lines.iterator(); + return __lines.iterator(); } public int log_space() { @@ -233,7 +233,7 @@ public class AltosConfigData implements Iterable { } public void reset() { - lines = new LinkedList(); + __lines = new LinkedList(); manufacturer = "unknown"; product = "unknown"; @@ -289,7 +289,7 @@ public class AltosConfigData implements Iterable { } public void parse_line(String line) { - lines.add(line); + __lines.add(line); /* Version replies */ try { manufacturer = get_string(line, "manufacturer"); } catch (Exception e) {} try { product = get_string(line, "product"); } catch (Exception e) {} @@ -719,5 +719,4 @@ public class AltosConfigData implements Iterable { break; } } - } -- cgit v1.2.3