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

diff --git a/altoslib/AltosFrequency.java b/altoslib/AltosFrequency.java
index 6d42fd69..f9aa6de6 100644
--- a/altoslib/AltosFrequency.java
+++ b/altoslib/AltosFrequency.java
@@ -15,7 +15,11 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_11;
+
+import java.io.*;
+import java.util.*;
+import java.text.*;
 
 public class AltosFrequency {
 	public double	frequency;
@@ -44,14 +48,37 @@ public class AltosFrequency {
 				     frequency, description);
 	}
 
+	public String frequency_string() {
+		return String.format("%7.3f", frequency);
+	}
+
 	public boolean close(double f) {
 		double	diff = Math.abs(frequency - f);
 
 		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);
+	}
 }