X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosFrequency.java;h=99828d5362ff57668709d00e374a3e62914bc4b6;hb=1b5ea911049a8afae6af475a4a2bf62a6e3aa57b;hp=ef46bd67c53eed8441091f0aef5130a698d90b29;hpb=97adfff4cfb67c17a96f3ff46606b4e439422b01;p=fw%2Faltos

diff --git a/altoslib/AltosFrequency.java b/altoslib/AltosFrequency.java
index ef46bd67..99828d53 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,8 +58,46 @@ public class AltosFrequency implements Serializable {
 		return diff < 0.010;
 	}
 
+	public AltosHashSet hashSet() {
+		AltosHashSet	h = new AltosHashSet();
+
+		h.putDouble("frequency", frequency);
+		h.putString("description", description);
+		return h;
+	}
+
+	public AltosJson json() {
+		AltosJson	j = new AltosJson();
+
+		j.put("frequency", frequency);
+		j.put("description", description);
+		return j;
+	}
+
 	public AltosFrequency(double f, String d) {
 		frequency = f;
 		description = d;
 	}
+
+	private AltosFrequency(AltosHashSet h) {
+		frequency = h.getDouble("frequency", 0.0);
+		description = h.getString("description", "");
+	}
+
+	public static AltosFrequency fromHashSet(AltosHashSet h, AltosFrequency def) {
+		if (h == null)
+			return def;
+		return new AltosFrequency(h);
+	}
+
+	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);
+	}
 }