altoslib: Store saved state in version-independent format

[fw/altos] / altoslib / AltosFrequency.java

diff --git a/altoslib/AltosFrequency.java b/altoslib/AltosFrequency.java
index 88997152982f6e5876539144372ca9e3e680e1ed..f9aa6de6ccb3eeea88baee2eb751a6ae3b9cd44d 100644 (file)
--- 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 Serializable {
+public class AltosFrequency {
        public double   frequency;
        public String   description;
 
@@ -71,8 +71,14 @@ public class AltosFrequency implements Serializable {
                description = d;
        }
 
-       public AltosFrequency(AltosHashSet h) {
+       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);
+       }
 }