altoslib: Get rid of manual JSON encoding stuff

[fw/altos] / altoslib / AltosGPSSat.java

diff --git a/altoslib/AltosGPSSat.java b/altoslib/AltosGPSSat.java
index 8cdeed0e073e51e38cdbe7a9e32f77f207c29c30..8b95c150a4e6a594eb986892db2dd84e332da557 100644 (file)
--- a/altoslib/AltosGPSSat.java
+++ b/altoslib/AltosGPSSat.java
@@ -22,7 +22,7 @@ import java.text.*;
 import java.util.*;
 import java.util.concurrent.*;
 
-public class AltosGPSSat implements AltosJsonable {
+public class AltosGPSSat {
        public int      svid;
        public int      c_n0;
 
@@ -33,28 +33,5 @@ public class AltosGPSSat implements AltosJsonable {
 
        public AltosGPSSat() {
        }
-
-       public AltosJson json() {
-               AltosJson j = new AltosJson();
-               j.put("svid", svid);
-               j.put("c_n0", c_n0);
-               return j;
-       }
-
-       private AltosGPSSat(AltosJson j) {
-               svid = j.get_int("svid", 0);
-               c_n0 = j.get_int("c_n0", 0);
-       }
-
-       static public AltosGPSSat[] json_array(AltosJson j) {
-               if (j == null)
-                       return null;
-
-               int size = j.size();
-               AltosGPSSat[] sats = new AltosGPSSat[size];
-               for (int i = 0; i < size; i++)
-                       sats[i] = new AltosGPSSat(j.get(i));
-               return sats;
-       }
 }