altoslib: Clarify terms in Mega pyro config

[fw/altos] / altoslib / AltosFrequency.java

diff --git a/altoslib/AltosFrequency.java b/altoslib/AltosFrequency.java
index ece7525ad848d78408d432c328dac7235c6d3ece..dfe337897f02e3da3c402173101bce076a4790fb 100644 (file)
--- a/altoslib/AltosFrequency.java
+++ b/altoslib/AltosFrequency.java
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,12 +16,29 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_2;
+package org.altusmetrum.altoslib_12;
+
+import java.io.*;
+import java.util.*;
+import java.text.*;
 
 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);
@@ -31,14 +49,20 @@ 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
+       public AltosFrequency() {
+               this(0, null);
+       }
+}