use multimaint-merge to make Debian changelogs less ugly

[fw/altos] / altosui / AltosEepromManage.java

diff --git a/altosui/AltosEepromManage.java b/altosui/AltosEepromManage.java
index 5fb70a8413cba0e1e5b9be39f4421b46cc3467a8..2e5206280b1e308e5aef46d5358faefc4b769835 100644 (file)
--- a/altosui/AltosEepromManage.java
+++ b/altosui/AltosEepromManage.java
@@ -44,7 +44,10 @@ public class AltosEepromManage implements ActionListener {
 
        public void finish() {
                if (serial_line != null) {
-                       serial_line.flush_input();
+                       try {
+                               serial_line.flush_input();
+                       } catch (InterruptedException ie) {
+                       }
                        serial_line.close();
                        serial_line = null;
                }
@@ -168,17 +171,23 @@ public class AltosEepromManage implements ActionListener {
                AltosEepromManage       manage;
 
                public void run () {
+                       Runnable r;
                        try {
                                flights = new AltosEepromList(serial_line, remote);
-                               Runnable r = new Runnable() {
+                               r = new Runnable() {
                                                public void run() {
-                                                       manage.got_flights(flights);
+                                                       got_flights(flights);
                                                }
                                        };
-                               SwingUtilities.invokeLater(r);
                        } catch (Exception e) {
-                               manage.got_exception(e);
+                               final Exception f_e = e;
+                               r = new Runnable() {
+                                               public void run() {
+                                                       got_exception(f_e);
+                                               }
+                                       };
                        }
+                       SwingUtilities.invokeLater(r);
                }
 
                public EepromGetList(AltosEepromManage in_manage) {
@@ -191,7 +200,7 @@ public class AltosEepromManage implements ActionListener {
                boolean running = false;
 
                frame = given_frame;
-               device = AltosDeviceDialog.show(frame, AltosDevice.product_any);
+               device = AltosDeviceDialog.show(frame, Altos.product_any);
 
                remote = false;
                any_download = false;
@@ -200,7 +209,7 @@ public class AltosEepromManage implements ActionListener {
                if (device != null) {
                        try {
                                serial_line = new AltosSerial(device);
-                               if (!device.matchProduct(AltosDevice.product_telemetrum))
+                               if (device.matchProduct(Altos.product_basestation))
                                        remote = true;
 
                                serial_line.set_frame(frame);