altoslib: Clarify terms in Mega pyro config

[fw/altos] / altoslib / AltosGPSSat.java

diff --git a/altoslib/AltosGPSSat.java b/altoslib/AltosGPSSat.java
index ad7a864702323efa1c5a109b230c682df08d8c48..8d3b316af45d3dfc4cecf50c925ac7712d125c89 100644 (file)
--- a/altoslib/AltosGPSSat.java
+++ b/altoslib/AltosGPSSat.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,7 +16,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_11;
+package org.altusmetrum.altoslib_12;
 
 import java.io.*;
 import java.text.*;
@@ -33,61 +34,5 @@ public class AltosGPSSat {
 
        public AltosGPSSat() {
        }
-
-       public AltosHashSet hashSet() {
-               AltosHashSet h = new AltosHashSet();
-               h.putInt("svid", svid);
-               h.putInt("c_n0", c_n0);
-               return h;
-       }
-
-       private AltosGPSSat(AltosHashSet h) {
-               svid = h.getInt("svid", 0);
-               c_n0 = h.getInt("c_n0", 0);
-       }
-
-       static public AltosGPSSat fromHashSet(AltosHashSet h, AltosGPSSat def) {
-               if (h == null)
-                       return def;
-               return new AltosGPSSat(h);
-       }
-
-       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;
-               }
-       }
 }