altosui: switch channel selector to combo box. Shorten displayed device names

[fw/altos] / ao-tools / altosui / AltosSerial.java

diff --git a/ao-tools/altosui/AltosSerial.java b/ao-tools/altosui/AltosSerial.java
index 0d32a5ae851807e0940a634acf7ccfef335030cd..ab74486b49904e018beae5ca66df2dd2a02cce8a 100644 (file)
--- a/ao-tools/altosui/AltosSerial.java
+++ b/ao-tools/altosui/AltosSerial.java
@@ -38,7 +38,7 @@ public class AltosSerial implements Runnable {
 
        static List<String> devices_opened = Collections.synchronizedList(new LinkedList<String>());
 
 
        static List<String> devices_opened = Collections.synchronizedList(new LinkedList<String>());
 

-       altos_device device;
+       AltosDevice device;

        SWIGTYPE_p_altos_file altos;
        LinkedList<LinkedBlockingQueue<AltosLine>> monitors;
        LinkedBlockingQueue<AltosLine> reply_queue;
        SWIGTYPE_p_altos_file altos;
        LinkedList<LinkedBlockingQueue<AltosLine>> monitors;
        LinkedBlockingQueue<AltosLine> reply_queue;


@@ -195,7 +195,7 @@ public class AltosSerial implements Runnable {
                }
                altos = libaltos.altos_open(device);
                if (altos == null)
                }
                altos = libaltos.altos_open(device);
                if (altos == null)

-                       throw new FileNotFoundException(device.toString());
+                       throw new FileNotFoundException(device.toShortString());

                input_thread = new Thread(this);
                input_thread.start();
                print("~\nE 0\n");
                input_thread = new Thread(this);
                input_thread.start();
                print("~\nE 0\n");


@@ -233,7 +233,7 @@ public class AltosSerial implements Runnable {
                }
        }
 
                }
        }
 

-       public AltosSerial(altos_device in_device) throws FileNotFoundException, AltosSerialInUseException {
+       public AltosSerial(AltosDevice in_device) throws FileNotFoundException, AltosSerialInUseException {

                device = in_device;
                line = "";
                monitor_mode = false;
                device = in_device;
                line = "";
                monitor_mode = false;