diff options
author | Keith Packard <keithp@keithp.com> | 2017-05-09 00:13:16 -0700 |
---|---|---|
committer | Keith Packard <keithp@keithp.com> | 2017-05-09 00:14:12 -0700 |
commit | 975751b604784e86b2ddb944a72b55ca3f14cf63 (patch) | |
tree | 9f194c295fa0631c8f12595f46335bb39f60e415 /altoslib/AltosConfigData.java | |
parent | 08da6f2100c0241c70554427e53b7e237dfda16c (diff) |
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 <keithp@keithp.com>
Diffstat (limited to 'altoslib/AltosConfigData.java')
-rw-r--r-- | altoslib/AltosConfigData.java | 9 |
1 files changed, 4 insertions, 5 deletions
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<String> { public int altitude_32; /* Strings returned */ - public LinkedList<String> lines; + public LinkedList<String> __lines; /* Config information */ /* HAS_FLIGHT*/ @@ -143,7 +143,7 @@ public class AltosConfigData implements Iterable<String> { } public Iterator<String> iterator() { - return lines.iterator(); + return __lines.iterator(); } public int log_space() { @@ -233,7 +233,7 @@ public class AltosConfigData implements Iterable<String> { } public void reset() { - lines = new LinkedList<String>(); + __lines = new LinkedList<String>(); manufacturer = "unknown"; product = "unknown"; @@ -289,7 +289,7 @@ public class AltosConfigData implements Iterable<String> { } 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<String> { break; } } - } |