X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosFrequency.java;h=3c1631a8a1bd0295f30478cd1d486ef12b771ef2;hb=7175774c4f60ed3efd54417f2035b50ea0108c7b;hp=88997152982f6e5876539144372ca9e3e680e1ed;hpb=b13037fad0905c5933d1ff579122ba1357b02eea;p=fw%2Faltos

diff --git a/altoslib/AltosFrequency.java b/altoslib/AltosFrequency.java
index 88997152..3c1631a8 100644
--- a/altoslib/AltosFrequency.java
+++ b/altoslib/AltosFrequency.java
@@ -21,7 +21,7 @@ import java.io.*;
 import java.util.*;
 import java.text.*;
 
-public class AltosFrequency implements Serializable {
+public class AltosFrequency implements AltosJsonable {
 	public double	frequency;
 	public String	description;
 
@@ -58,12 +58,12 @@ public class AltosFrequency implements Serializable {
 		return diff < 0.010;
 	}
 
-	public AltosHashSet hashSet() {
-		AltosHashSet	h = new AltosHashSet();
+	public AltosJson json() {
+		AltosJson	j = new AltosJson();
 
-		h.putDouble("frequency", frequency);
-		h.putString("description", description);
-		return h;
+		j.put("frequency", frequency);
+		j.put("description", description);
+		return j;
 	}
 
 	public AltosFrequency(double f, String d) {
@@ -71,8 +71,14 @@ public class AltosFrequency implements Serializable {
 		description = d;
 	}
 
-	public AltosFrequency(AltosHashSet h) {
-		frequency = h.getDouble("frequency", 0.0);
-		description = h.getString("description", "");
+	private AltosFrequency(AltosJson j) {
+		frequency = j.get_double("frequency", 0.0);
+		description = j.get_string("description", "");
+	}
+
+	public static AltosFrequency fromJson(AltosJson j, AltosFrequency def) {
+		if (j == null)
+			return def;
+		return new AltosFrequency(j);
 	}
 }