altosui: add missing methods for Backend, fix BT code.

Signed-off-by: Mike Beattie <mike@ethernal.org>

diff --git a/altosui/AltosBTKnown.java b/altosui/AltosBTKnown.java
index 74cc6838455264e040076127012dd5ca1d692751..7e5e95338abd9c29f0048c7c8435b9ff96f13301 100644 (file)
--- a/altosui/AltosBTKnown.java
+++ b/altosui/AltosBTKnown.java
@@ -21,14 +21,14 @@ import java.util.prefs.*;
 
 public class AltosBTKnown implements Iterable<AltosBTDevice> {
        LinkedList<AltosBTDevice>       devices = new LinkedList<AltosBTDevice>();
-       Preferences                     bt_pref = AltosUIPreferences.bt_devices();
+       AltosPreferencesBackend         bt_pref = AltosUIPreferences.bt_devices();
 
        private String get_address(String name) {
-               return bt_pref.get(name, "");
+               return bt_pref.getString(name, "");
        }
 
        private void set_address(String name, String addr) {
-               bt_pref.put(name, addr);
+               bt_pref.putString(name, addr);
        }
 
        private void remove(String name) {

diff --git a/altosui/AltosUIPreferences.java b/altosui/AltosUIPreferences.java
index 03e8e1290936e21de066365f44e1f7a9fe4e4d7f..6e4c9097268f697ca3408f6115d7c45e92a3bd31 100644 (file)
--- a/altosui/AltosUIPreferences.java
+++ b/altosui/AltosUIPreferences.java
@@ -98,7 +98,7 @@ public class AltosUIPreferences extends AltosPreferences {
                }
        }
        public static int font_size() {
-               synchronized (preferences) {
+               synchronized (backend) {
                        return font_size;
                }
        }
@@ -144,7 +144,7 @@ public class AltosUIPreferences extends AltosPreferences {
        }
 
        public static String look_and_feel() {
-               synchronized (preferences) {
+               synchronized (backend) {
                        return look_and_feel;
                }
        }
@@ -170,7 +170,7 @@ public class AltosUIPreferences extends AltosPreferences {
        }
 
        public static boolean serial_debug() {
-               synchronized (preferences) {
+               synchronized (backend) {
                        return serial_debug;
                }
        }

diff --git a/altosui/AltosUIPreferencesBackend.java b/altosui/AltosUIPreferencesBackend.java
index 16844f378cc5679c41ff92530aeb378f415fef03..2b2769c218ac05aa499136a575482970b210ddad 100644 (file)
--- a/altosui/AltosUIPreferencesBackend.java
+++ b/altosui/AltosUIPreferencesBackend.java
@@ -73,6 +73,14 @@ public class AltosUIPreferencesBackend implements AltosPreferencesBackend {
                return new AltosUIPreferencesBackend(_preferences.node(key));
        }
 
+       public String[] keys() {
+               return _preferences.keys();
+       }
+
+       public void remove(String key) {
+               _preferences.remove(key);
+       }
+
        public void    flush() {
                try {
                        _preferences.flush();