altoslib/altosuilib: Update library version to 7

[fw/altos] / altosui / AltosConfigTD.java

diff --git a/altosui/AltosConfigTD.java b/altosui/AltosConfigTD.java
index 397ed3db05b5e38a343353528e5a43dc8e784a85..9b9cdcaac4d59f0c664deb65511c287dcb333503 100644 (file)
--- a/altosui/AltosConfigTD.java
+++ b/altosui/AltosConfigTD.java
@@ -21,8 +21,8 @@ import java.awt.event.*;
 import javax.swing.*;
 import java.io.*;
 import java.util.concurrent.*;
-import org.altusmetrum.altoslib_5.*;
-import org.altusmetrum.altosuilib_3.*;
+import org.altusmetrum.altoslib_7.*;
+import org.altusmetrum.altosuilib_7.*;
 
 public class AltosConfigTD implements ActionListener {
 
@@ -183,14 +183,12 @@ public class AltosConfigTD implements ActionListener {
        }
 
        synchronized int telemetry_rate() {
-               System.out.printf("telemetry_rate: %d\n", telemetry_rate.get());
                return telemetry_rate.get();
        }
 
        synchronized void set_telemetry_rate(int new_telemetry_rate){
                int     rate = telemetry_rate.get();
 
-               System.out.printf("set_telemetry_rate %d\n", new_telemetry_rate);
                if (rate >= 0)
                        telemetry_rate.set(new_telemetry_rate);
        }
@@ -225,8 +223,10 @@ public class AltosConfigTD implements ActionListener {
                                        if (!config_version.get().equals("0.0"))
                                                break;
                                        been_there = true;
-                                       config.serial_line.printf("C\n ");
-                                       config.serial_line.flush_input();
+                                       if (config != null && config.serial_line != null) {
+                                               config.serial_line.printf("C\n ");
+                                               config.serial_line.flush_input();
+                                       }
                                }
                        } catch (InterruptedException ie) {
                        }
@@ -279,8 +279,10 @@ public class AltosConfigTD implements ActionListener {
        }
 
        void abort() {
-               serial_line.close();
-               serial_line = null;
+               if (serial_line != null) {
+                       serial_line.close();
+                       serial_line = null;
+               }
                JOptionPane.showMessageDialog(owner,
                                              String.format("Connection to \"%s\" failed",
                                                            device.toShortString()),