Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos

[fw/altos] / altosui / AltosBTKnown.java

diff --git a/altosui/AltosBTKnown.java b/altosui/AltosBTKnown.java
index 95830637407fa5d5aedc83af5422f36eb9166242..ad0672c6847ddac18a05f51445d1e95555d8e0ee 100644 (file)
--- a/altosui/AltosBTKnown.java
+++ b/altosui/AltosBTKnown.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package altosui;
+package AltosUI;
 import java.lang.*;
 import java.util.*;
 import libaltosJNI.*;
@@ -23,7 +23,7 @@ import java.util.prefs.*;
 
 public class AltosBTKnown implements Iterable<AltosBTDevice> {
        LinkedList<AltosBTDevice>       devices = new LinkedList<AltosBTDevice>();
-       Preferences                     bt_pref = AltosPreferences.bt_devices();
+       Preferences                     bt_pref = AltosUIPreferences.bt_devices();
 
        private String get_address(String name) {
                return bt_pref.get(name, "");
@@ -31,7 +31,6 @@ public class AltosBTKnown implements Iterable<AltosBTDevice> {
 
        private void set_address(String name, String addr) {
                bt_pref.put(name, addr);
-               System.out.printf("saving known %s %s\n", name, addr);
        }
 
        private void remove(String name) {
@@ -44,7 +43,6 @@ public class AltosBTKnown implements Iterable<AltosBTDevice> {
                        for (int i = 0; i < names.length; i++) {
                                String  name = names[i];
                                String  addr = get_address(name);
-                               System.out.printf("Known device %s %s\n", name, addr);
                                devices.add(new AltosBTDevice(name, addr));
                        }
                } catch (BackingStoreException be) {
@@ -57,7 +55,7 @@ public class AltosBTKnown implements Iterable<AltosBTDevice> {
        }
 
        private void flush() {
-               AltosPreferences.flush_preferences();
+               AltosUIPreferences.flush_preferences();
        }
 
        public void set(Iterable<AltosBTDevice> new_devices) {
@@ -91,7 +89,15 @@ public class AltosBTKnown implements Iterable<AltosBTDevice> {
 
        public AltosBTKnown() {
                devices = new LinkedList<AltosBTDevice>();
-               bt_pref = AltosPreferences.bt_devices();
+               bt_pref = AltosUIPreferences.bt_devices();
                load();
        }
-}
\ No newline at end of file
+
+       static AltosBTKnown     known;
+
+       static public AltosBTKnown bt_known() {
+               if (known == null)
+                       known = new AltosBTKnown();
+               return known;
+       }
+}