summaryrefslogtreecommitdiff
path: root/altoslib/AltosFrequency.java
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2016-06-17 00:52:38 -0700
committerKeith Packard <keithp@keithp.com>2016-06-17 01:03:40 -0700
commit1dce20f7eee56166ac61798ca26eeb323dc8f012 (patch)
treee7f64afa79991e10d0b7aa680e98af3ce96a62bb /altoslib/AltosFrequency.java
parent7175774c4f60ed3efd54417f2035b50ea0108c7b (diff)
altoslib: Get rid of manual JSON encoding stuff
Now that the reflective JSON stuff is working, we can delete all of the manual code. Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'altoslib/AltosFrequency.java')
-rw-r--r--altoslib/AltosFrequency.java22
1 files changed, 1 insertions, 21 deletions
diff --git a/altoslib/AltosFrequency.java b/altoslib/AltosFrequency.java
index 3c1631a8..874a9bcc 100644
--- a/altoslib/AltosFrequency.java
+++ b/altoslib/AltosFrequency.java
@@ -21,7 +21,7 @@ import java.io.*;
import java.util.*;
import java.text.*;
-public class AltosFrequency implements AltosJsonable {
+public class AltosFrequency {
public double frequency;
public String description;
@@ -57,28 +57,8 @@ public class AltosFrequency implements AltosJsonable {
return diff < 0.010;
}
-
- 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(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);
- }
}