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

diff --git a/altoslib/AltosFrequency.java b/altoslib/AltosFrequency.java
index ef46bd67..f9aa6de6 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 {
 	public double	frequency;
 	public String	description;
 
@@ -58,8 +58,27 @@ 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 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);
+	}
 }