Bump java lib versions to 13

[fw/altos] / altoslib / AltosCompanion.java

diff --git a/altoslib/AltosCompanion.java b/altoslib/AltosCompanion.java
index 2db8ea1b3d8b8845197f93e0f04ef3f8c5cf6745..1e1bad98b25330d27261ce239517b467df4a01e6 100644 (file)
--- a/altoslib/AltosCompanion.java
+++ b/altoslib/AltosCompanion.java
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,11 +16,11 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_11;
+package org.altusmetrum.altoslib_13;
 
 import java.io.*;
 
-public class AltosCompanion implements AltosJsonable {
+public class AltosCompanion {
        public final static int board_id_telescience = 0x0a;
        public final static int MAX_CHANNELS = 12;
 
@@ -38,29 +39,8 @@ public class AltosCompanion implements AltosJsonable {
                companion_data = new int[channels];
        }
 
-       public AltosJson json() {
-               AltosJson j = new AltosJson();
-
-               j.put("tick", tick);
-               j.put("board_id", board_id);
-               j.put("update_period", update_period);
-               j.put("channels", channels);
-               j.put("companion_data", companion_data);
-               return j;
-       }
-
-       public AltosCompanion(AltosJson j) {
-               tick = j.get_int("tick", tick);
-               board_id = j.get_int("board_id", board_id);
-               update_period = j.get_int("update_period", update_period);
-               channels = j.get_int("channels", channels);
-               companion_data = j.get_int_array("companion_data", new int[channels]);
-       }
-
-       public static AltosCompanion fromJson(AltosJson j, AltosCompanion def) {
-               if (j == null)
-                       return def;
-
-               return new AltosCompanion(j);
+       public AltosCompanion() {
+               channels = 0;
+               companion_data = new int[0];
        }
 }