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

diff --git a/altoslib/AltosFrequency.java b/altoslib/AltosFrequency.java
index f9aa6de6..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 {
+public class AltosFrequency implements AltosJsonable {
 	public double	frequency;
 	public String	description;
 
@@ -66,6 +66,14 @@ public class AltosFrequency {
 		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;
@@ -81,4 +89,15 @@ public class AltosFrequency {
 			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);
+	}
 }