Bump java library versions

[fw/altos] / altoslib / AltosPreferences.java

diff --git a/altoslib/AltosPreferences.java b/altoslib/AltosPreferences.java
index cc340d0342ae8d1e9d8fd910a779dcc7f2876784..b853e944bc76ffc8c4d4e186ad1e120237644748 100644 (file)
--- a/altoslib/AltosPreferences.java
+++ b/altoslib/AltosPreferences.java
@@ -15,7 +15,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.*;
@@ -350,12 +350,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.putSerializable(String.format(statePreferenceFormat, state.serial), state);
+                       backend.putInt(statePreferenceLatest, state.serial);
+                       flush_preferences();
                }
        }
 
@@ -389,9 +389,13 @@ 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 {
+                               return (AltosState) backend.getSerializable(String.format(statePreferenceFormat, serial), null);
+                       } catch (Exception e) {
+                               return null;
+                       }
                }
        }