X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosPreferences.java;h=2fda9621e70c0fd09b3c4dc8ff278050a03ad936;hb=075999e274dd1815b15c0d717d1af4e7717e5da9;hp=569aaa5481f863f9e8558fe8207aaff0f8ef89f1;hpb=1dce20f7eee56166ac61798ca26eeb323dc8f012;p=fw%2Faltos

diff --git a/altoslib/AltosPreferences.java b/altoslib/AltosPreferences.java
index 569aaa54..2fda9621 100644
--- 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_11;
+package org.altusmetrum.altoslib_14;
 
 import java.io.*;
 import java.util.*;
@@ -71,8 +72,8 @@ public class AltosPreferences {
 	/* Launcher channel preference name */
 	public final static String launcherChannelPreference = "LAUNCHER-CHANNEL";
 
-	/* Default logdir is ~/TeleMetrum */
-	public final static String logdirName = "TeleMetrum";
+	/* Default logdir is ~/AltusMetrum */
+	public final static String logdirName = "AltusMetrum";
 
 	/* Log directory */
 	public static File logdir;
@@ -138,7 +139,7 @@ public class AltosPreferences {
 		try {
 			AltosJson json = AltosJson.fromString(backend.getString(frequenciesPreference,
 										null));
-			frequencies = (AltosFrequency[]) json.make(frequencies.getClass());
+			frequencies = (AltosFrequency[]) json.make((new AltosFrequency[1]).getClass());
 		} catch (Exception e) {
 		}
 
@@ -362,11 +363,11 @@ public class AltosPreferences {
 		}
 	}
 
-	public static void set_state(AltosState state) {
+	public static void set_state(AltosState state, int serial) {
 
 		synchronized(backend) {
-			backend.putJson(String.format(statePreferenceFormat, state.serial), new AltosJson(state));
-			backend.putInt(statePreferenceLatest, state.serial);
+			backend.putJson(String.format(statePreferenceFormat, serial), new AltosJson(state));
+			backend.putInt(statePreferenceLatest, serial);
 			flush_preferences();
 		}
 	}