X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FAltosFrequency.java;h=58f503c565d16db931668c33e8df2b2e4c7c838a;hp=99828d5362ff57668709d00e374a3e62914bc4b6;hb=408badbef80d7a3412b5ad92b269be19d0faaa09;hpb=1b5ea911049a8afae6af475a4a2bf62a6e3aa57b

diff --git a/altoslib/AltosFrequency.java b/altoslib/AltosFrequency.java
index 99828d53..58f503c5 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
@@ -15,13 +16,13 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_11;
+package org.altusmetrum.altoslib_13;
 
 import java.io.*;
 import java.util.*;
 import java.text.*;
 
-public class AltosFrequency implements AltosJsonable {
+public class AltosFrequency {
 	public double	frequency;
 	public String	description;
 
@@ -57,47 +58,11 @@ public class AltosFrequency implements AltosJsonable {
 
 		return diff < 0.010;
 	}
-
-	public AltosHashSet hashSet() {
-		AltosHashSet	h = new AltosHashSet();
-
-		h.putDouble("frequency", frequency);
-		h.putString("description", description);
-		return h;
-	}
-
-	public AltosJson json() {
-		AltosJson	j = new AltosJson();
-
-		j.put("frequency", frequency);
-		j.put("description", description);
-		return j;
-	}
-
 	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);
-	}
-
-	private AltosFrequency(AltosJson j) {
-		frequency = j.get_double("frequency", 0.0);
-		description = j.get_string("description", "");
-	}
-
-	public static AltosFrequency fromJson(AltosJson j, AltosFrequency def) {
-		if (j == null)
-			return def;
-		return new AltosFrequency(j);
+	public AltosFrequency() {
+		this(0, null);
 	}
 }