X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FAltosGPSSat.java;h=8d3b316af45d3dfc4cecf50c925ac7712d125c89;hp=319fe7f17f93e4cb98f64b06afcbc798083b0845;hb=6e244a73d8c2a475416480f83328b7d363693402;hpb=1b5ea911049a8afae6af475a4a2bf62a6e3aa57b

diff --git a/altoslib/AltosGPSSat.java b/altoslib/AltosGPSSat.java
index 319fe7f1..8d3b316a 100644
--- 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,14 +16,14 @@
  * 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.*;
 import java.util.*;
 import java.util.concurrent.*;
 
-public class AltosGPSSat implements AltosJsonable {
+public class AltosGPSSat {
 	public int	svid;
 	public int	c_n0;
 
@@ -33,84 +34,5 @@ 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);
-		j.put("c_n0", c_n0);
-		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;
-
-		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;
-	}
-
-	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;
-		}
-	}
 }