micropeak: Compile for java 6

[fw/altos] / altosui / AltosBTDevice.java

diff --git a/altosui/AltosBTDevice.java b/altosui/AltosBTDevice.java
index 55b8f8fc8bf5f28c2b7f848bbe56bf9b2434ff17..727a9f6625ce7953e251c94817cc9f5832c4b1ad 100644 (file)
--- a/altosui/AltosBTDevice.java
+++ b/altosui/AltosBTDevice.java
@@ -16,9 +16,8 @@
  */
 
 package altosui;
-import java.lang.*;
-import java.util.*;
 import libaltosJNI.*;
+import org.altusmetrum.altosuilib_1.*;
 
 public class AltosBTDevice extends altos_bt_device implements AltosDevice {
 
@@ -79,15 +78,16 @@ public class AltosBTDevice extends altos_bt_device implements AltosDevice {
                return libaltos.altos_bt_open(this);
        }
 
+       /*
        private boolean isAltusMetrum() {
                if (getName().startsWith(Altos.bt_product_telebt))
                        return true;
                return false;
        }
+       */
 
        public boolean matchProduct(int want_product) {
 
-               System.out.printf("matchProduct %s %d\n", toString(), want_product);
 //             if (!isAltusMetrum())
 //                     return false;
 
@@ -107,7 +107,6 @@ public class AltosBTDevice extends altos_bt_device implements AltosDevice {
                if (!(o instanceof AltosBTDevice))
                        return false;
                AltosBTDevice other = (AltosBTDevice) o;
-               System.out.printf("AltosBTDevice equals %s == %s\n", toString(), other.toString());
                return getName().equals(other.getName()) && getAddr().equals(other.getAddr());
        }
 
@@ -116,6 +115,7 @@ public class AltosBTDevice extends altos_bt_device implements AltosDevice {
        }
 
        public AltosBTDevice(String name, String addr) {
+               Altos.load_library();
                libaltos.altos_bt_fill_in(name, addr,this);
        }