diff options
author | Keith Packard <keithp@keithp.com> | 2016-06-15 22:52:08 -0700 |
---|---|---|
committer | Keith Packard <keithp@keithp.com> | 2016-06-15 22:52:08 -0700 |
commit | f7e2f7f430e612c682bf55478860054ce94b995f (patch) | |
tree | d8274c9fdc2b3731e4b8a2438a7e453a7cd23b37 /altoslib/AltosGPSSat.java | |
parent | 1b5ea911049a8afae6af475a4a2bf62a6e3aa57b (diff) |
altoslib: Remove AltosHashSet code
Everything has switched to JSON now.
Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'altoslib/AltosGPSSat.java')
-rw-r--r-- | altoslib/AltosGPSSat.java | 56 |
1 files changed, 0 insertions, 56 deletions
diff --git a/altoslib/AltosGPSSat.java b/altoslib/AltosGPSSat.java index 319fe7f1..8cdeed0e 100644 --- a/altoslib/AltosGPSSat.java +++ b/altoslib/AltosGPSSat.java @@ -34,13 +34,6 @@ public class AltosGPSSat implements AltosJsonable { public AltosGPSSat() { } - public AltosHashSet hashSet() { - AltosHashSet h = new AltosHashSet(); - h.putInt("svid", svid); - h.putInt("c_n0", c_n0); - return h; - } - public AltosJson json() { AltosJson j = new AltosJson(); j.put("svid", svid); @@ -48,22 +41,11 @@ public class AltosGPSSat implements AltosJsonable { return j; } - private AltosGPSSat(AltosHashSet h) { - svid = h.getInt("svid", 0); - c_n0 = h.getInt("c_n0", 0); - } - private AltosGPSSat(AltosJson j) { svid = j.get_int("svid", 0); c_n0 = j.get_int("c_n0", 0); } - static public AltosGPSSat fromHashSet(AltosHashSet h, AltosGPSSat def) { - if (h == null) - return def; - return new AltosGPSSat(h); - } - static public AltosGPSSat[] json_array(AltosJson j) { if (j == null) return null; @@ -74,43 +56,5 @@ public class AltosGPSSat implements AltosJsonable { sats[i] = new AltosGPSSat(j.get(i)); return sats; } - - static public AltosGPSSat[] array(String string) { - - if (string == null) - return null; - - try { - StringReader reader = new StringReader(string); - ArrayList<AltosGPSSat> array = new ArrayList<AltosGPSSat>(); - String element; - - while ((element = AltosHashSet.get_token(reader)) != null) { - AltosGPSSat sat = AltosGPSSat.fromHashSet(AltosHashSet.fromString(element), null); - if (sat != null) - array.add(sat); - } - return array.toArray(new AltosGPSSat[0]); - } catch (IOException ie) { - return null; - } - } - - public static String toString(AltosGPSSat[] sats) { - if (sats == null) - return null; - - try { - StringWriter writer = new StringWriter(); - - for (AltosGPSSat g : sats) { - String element = g.hashSet().toString(); - AltosHashSet.put_token(writer, element); - } - return writer.toString(); - } catch (IOException ie) { - return null; - } - } } |