altosui: Make bluetooth dialog modal

[fw/altos] / altosui / AltosBTDevice.java

diff --git a/altosui/AltosBTDevice.java b/altosui/AltosBTDevice.java
index 8eb18bb94270ca11d9b5d7499b0c7c133dd43e5e..ff2be49a66279009c6fc0f32ea69dce4d6ad89b7 100644 (file)
--- a/altosui/AltosBTDevice.java
+++ b/altosui/AltosBTDevice.java
@@ -20,36 +20,9 @@ import java.lang.*;
 import java.util.*;
 import libaltosJNI.*;
 
-public class AltosBTDevice extends altos_bt_device {
-
-       static public boolean initialized = false;
-       static public boolean loaded_library = false;
-
-       public static boolean load_library() {
-               if (!initialized) {
-                       try {
-                               System.loadLibrary("altos");
-                               libaltos.altos_init();
-                               loaded_library = true;
-                       } catch (UnsatisfiedLinkError e) {
-                               loaded_library = false;
-                       }
-                       initialized = true;
-               }
-               return loaded_library;
-       }
-
-       static String bt_product_telebt() {
-               if (load_library())
-                       return libaltosConstants.BLUETOOTH_PRODUCT_TELEBT;
-               return "TeleBT";
-       }
-
-       public final static String bt_product_telebt = bt_product_telebt();
-       public final static String bt_product_any = "Any";
-       public final static String bt_product_basestation = "Basestation";
+public class AltosBTDevice extends altos_bt_device implements AltosDevice {
 
-       public String getProduct() {
+       public String getProductName() {
                String  name = getName();
                if (name == null)
                        return "Altus Metrum";
@@ -59,6 +32,16 @@ public class AltosBTDevice extends altos_bt_device {
                return name.substring(0,dash);
        }
 
+       public int getProduct() {
+               if (Altos.bt_product_telebt.equals(getProductName()))
+                       return Altos.product_telebt;
+               return 0;
+       }
+
+       public String getPath() {
+               return getAddr();
+       }
+
        public int getSerial() {
                String name = getName();
                if (name == null)
@@ -79,7 +62,7 @@ public class AltosBTDevice extends altos_bt_device {
                if (name == null)
                        name = "Altus Metrum";
                return String.format("%-20.20s %4d %s",
-                                    getProduct(), getSerial(), getAddr());
+                                    getProductName(), getSerial(), getAddr());
        }
 
        public String toShortString() {
@@ -91,52 +74,30 @@ public class AltosBTDevice extends altos_bt_device {
 
        }
 
-       public boolean isAltusMetrum() {
-               if (getName().startsWith(bt_product_telebt))
+       public SWIGTYPE_p_altos_file open() {
+               return libaltos.altos_bt_open(this);
+       }
+
+       private boolean isAltusMetrum() {
+               if (getName().startsWith(Altos.bt_product_telebt))
                        return true;
                return false;
        }
 
-       public boolean matchProduct(String want_product) {
+       public boolean matchProduct(int want_product) {
 
                if (!isAltusMetrum())
                        return false;
 
-               if (want_product.equals(bt_product_any))
+               if (want_product == Altos.product_any)
                        return true;
 
-               if (want_product.equals(bt_product_basestation))
-                       return matchProduct(bt_product_telebt);
+               if (want_product == Altos.product_basestation)
+                       return matchProduct(Altos.product_telebt);
 
-               if (want_product.equals(getProduct()))
+               if (want_product == getProduct())
                        return true;
 
                return false;
        }
-
-       static AltosBTDevice[] list(String product) {
-               if (!load_library())
-                       return null;
-
-               SWIGTYPE_p_altos_bt_list list = libaltos.altos_bt_list_start();
-
-               ArrayList<AltosBTDevice> device_list = new ArrayList<AltosBTDevice>();
-               if (list != null) {
-                       SWIGTYPE_p_altos_file file;
-
-                       for (;;) {
-                               AltosBTDevice device = new AltosBTDevice();
-                               if (libaltos.altos_bt_list_next(list, device) == 0)
-                                       break;
-                               if (device.matchProduct(product))
-                                       device_list.add(device);
-                       }
-                       libaltos.altos_bt_list_finish(list);
-               }
-
-               AltosBTDevice[] devices = new AltosBTDevice[device_list.size()];
-               for (int i = 0; i < device_list.size(); i++)
-                       devices[i] = device_list.get(i);
-               return devices;
-       }
 }
\ No newline at end of file