Switch from GPLv2 to GPLv2+

[fw/altos] / altoslib / AltosPreferences.java

diff --git a/altoslib/AltosPreferences.java b/altoslib/AltosPreferences.java
index cc340d0342ae8d1e9d8fd910a779dcc7f2876784..35d44631ed22918acab2f4c5bada4959e36c33dc 100644 (file)
--- a/altoslib/AltosPreferences.java
+++ b/altoslib/AltosPreferences.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,7 +16,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_10;
+package org.altusmetrum.altoslib_11;
 
 import java.io.*;
 import java.util.*;
@@ -116,7 +117,7 @@ public class AltosPreferences {
        public final static String      frequency_count = "COUNT";
        public final static String      frequency_format = "FREQUENCY-%d";
        public final static String      description_format = "DESCRIPTION-%d";
-       public final static String      frequenciesPreference = "FREQUENCIES";
+       public final static String      frequenciesPreference = "FREQUENCIES-1";
 
        /* Units preference */
 
@@ -133,24 +134,30 @@ public class AltosPreferences {
        static int      map_type;
 
        public static AltosFrequency[] load_common_frequencies() {
-
                AltosFrequency[] frequencies = null;
 
-               frequencies = (AltosFrequency[]) backend.getSerializable(frequenciesPreference, null);
+               try {
+                       AltosJson json = AltosJson.fromString(backend.getString(frequenciesPreference,
+                                                                               null));
+                       frequencies = (AltosFrequency[]) json.make(frequencies.getClass());
+               } catch (Exception e) {
+               }
 
                if (frequencies == null) {
                        if (backend.nodeExists(common_frequencies_node_name)) {
                                AltosPreferencesBackend node = backend.node(common_frequencies_node_name);
                                int             count = node.getInt(frequency_count, 0);
 
-                               frequencies = new AltosFrequency[count];
-                               for (int i = 0; i < count; i++) {
-                                       double  frequency;
-                                       String  description;
+                               if (count > 0) {
+                                       frequencies = new AltosFrequency[count];
+                                       for (int i = 0; i < count; i++) {
+                                               double  frequency;
+                                               String  description;
 
-                                       frequency = node.getDouble(String.format(frequency_format, i), 0.0);
-                                       description = node.getString(String.format(description_format, i), null);
-                                       frequencies[i] = new AltosFrequency(frequency, description);
+                                               frequency = node.getDouble(String.format(frequency_format, i), 0.0);
+                                               description = node.getString(String.format(description_format, i), null);
+                                               frequencies[i] = new AltosFrequency(frequency, description);
+                                       }
                                }
                        }
                }
@@ -165,6 +172,12 @@ public class AltosPreferences {
                return frequencies;
        }
 
+       public static void save_common_frequencies() {
+               AltosJson       json = new AltosJson(common_frequencies);
+               backend.putString(frequenciesPreference, json.toString());
+               flush_preferences();
+       }
+
        public static int launcher_serial;
 
        public static int launcher_channel;
@@ -350,12 +363,12 @@ public class AltosPreferences {
                }
        }
 
-       public static void set_state(int serial, AltosState state, AltosListenerState listener_state) {
+       public static void set_state(AltosState state) {
 
                synchronized(backend) {
-                       backend.putSerializable(String.format(statePreferenceFormat, serial),
-                                               new AltosSavedState(state, listener_state));
-                       backend.putInt(statePreferenceLatest, serial);
+                       backend.putJson(String.format(statePreferenceFormat, state.serial), new AltosJson(state));
+                       backend.putInt(statePreferenceLatest, state.serial);
+                       flush_preferences();
                }
        }
 
@@ -378,6 +391,7 @@ public class AltosPreferences {
        public static void remove_state(int serial) {
                synchronized(backend) {
                        backend.remove(String.format(statePreferenceFormat, serial));
+                       flush_preferences();
                }
        }
 
@@ -389,9 +403,15 @@ public class AltosPreferences {
                return latest;
        }
 
-       public static AltosSavedState state(int serial) {
+       public static AltosState state(int serial) {
                synchronized(backend) {
-                       return (AltosSavedState) backend.getSerializable(String.format(statePreferenceFormat, serial), null);
+                       try {
+                               AltosJson json = backend.getJson(String.format(statePreferenceFormat, serial));
+                               if (json != null)
+                                       return (AltosState) (json.make(AltosState.class));
+                       } catch (Exception e) {
+                       }
+                       return null;
                }
        }
 
@@ -508,8 +528,8 @@ public class AltosPreferences {
        public static void set_common_frequencies(AltosFrequency[] frequencies) {
                synchronized(backend) {
                        common_frequencies = frequencies;
-                       backend.putSerializable(frequenciesPreference, frequencies);
-                       flush_preferences();
+
+                       save_common_frequencies();
                }
        }