From: Mike Beattie <mike@ethernal.org>
Date: Thu, 13 Sep 2012 12:40:16 +0000 (+1200)
Subject: altosui: add missing methods for Backend, fix BT code.
X-Git-Tag: 1.1.9.1~54^2~8
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=67b618409a0d34fff26cac6025bc159ff92ede9c

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 74cc6838..7e5e9533 100644
--- 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 03e8e129..6e4c9097 100644
--- 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 16844f37..2b2769c2 100644
--- 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();