altoslib: Get rid of manual JSON encoding stuff

[fw/altos] / altoslib / AltosFrequency.java

diff --git a/altoslib/AltosFrequency.java b/altoslib/AltosFrequency.java
index f08ff1168a1d509dca587de0574b56ba8a19f05f..874a9bccb5a41f8682056eb626b47bb6d73720e6 100644 (file)
--- a/altoslib/AltosFrequency.java
+++ b/altoslib/AltosFrequency.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.AltosLib;
+package org.altusmetrum.altoslib_11;
 
 import java.io.*;
 import java.util.*;
@@ -25,6 +25,19 @@ public class AltosFrequency {
        public double   frequency;
        public String   description;
 
+       public int hashCode() {
+               return new Double(frequency).hashCode();
+       }
+
+       public boolean equals(Object o) {
+               if (o == null)
+                       return false;
+               if (!(o instanceof AltosFrequency))
+                       return false;
+               AltosFrequency other = (AltosFrequency) o;
+               return other.frequency == frequency;
+       }
+
        public String toString() {
                return String.format("%7.3f MHz %-20s",
                                     frequency, description);
@@ -35,14 +48,17 @@ 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 AltosFrequency(double f, String d) {
                frequency = f;
                description = d;
        }
-}
\ No newline at end of file
+}