X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FAltosFrequency.java;h=3b2a445a084e1560cc4477f7623d4216baa26468;hp=88997152982f6e5876539144372ca9e3e680e1ed;hb=da914cd72411af8c36af05b13c11b9093c8a378c;hpb=b13037fad0905c5933d1ff579122ba1357b02eea diff --git a/altoslib/AltosFrequency.java b/altoslib/AltosFrequency.java index 88997152..3b2a445a 100644 --- 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 @@ -21,7 +22,7 @@ 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,8 @@ 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", ""); - } }