altoslib: Clarify terms in Mega pyro config

[fw/altos] / altoslib / AltosFrequency.java

diff --git a/altoslib/AltosFrequency.java b/altoslib/AltosFrequency.java
index 88997152982f6e5876539144372ca9e3e680e1ed..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,13 +16,13 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_11;
+package org.altusmetrum.altoslib_12;
 
 import java.io.*;
 import java.util.*;
 import java.text.*;
 
-public class AltosFrequency implements Serializable {
+public class AltosFrequency {
        public double   frequency;
        public String   description;
 
@@ -57,22 +58,11 @@ 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;
        }
-
-       public AltosFrequency(AltosHashSet h) {
-               frequency = h.getDouble("frequency", 0.0);
-               description = h.getString("description", "");
+       public AltosFrequency() {
+               this(0, null);
        }
 }