Change AltosLib to altoslib

[fw/altos] / micropeak / MicroDownload.java

diff --git a/micropeak/MicroDownload.java b/micropeak/MicroDownload.java
index 2e328b4a450121e7b3ffb8ce69740ee33817fc00..cc4046268537dd47610f8bf113a5b014671259ad 100644 (file)
--- a/micropeak/MicroDownload.java
+++ b/micropeak/MicroDownload.java
@@ -23,7 +23,7 @@ import javax.swing.*;
 import java.io.*;
 import java.util.concurrent.*;
 import java.util.*;
-import org.altusmetrum.AltosLib.*;
+import org.altusmetrum.altoslib.*;
 import org.altusmetrum.altosuilib.*;
 
 public class MicroDownload extends AltosUIDialog implements Runnable, ActionListener {
@@ -37,10 +37,17 @@ public class MicroDownload extends AltosUIDialog implements Runnable, ActionList
        private void done_internal() {
                setVisible(false);
                if (data != null) {
-                       owner = owner.SetData(data);
-                       MicroSave save = new MicroSave(owner, data);
-                       if (save.runDialog())
-                               owner.SetName(data.name);
+                       if (data.crc_valid) {
+                               owner = owner.SetData(data);
+                               MicroSave save = new MicroSave(owner, data);
+                               if (save.runDialog())
+                                       owner.SetName(data.name);
+                       } else {
+                               JOptionPane.showMessageDialog(owner,
+                                                             "Flight data corrupted",
+                                                             "Download Failed",
+                                                             JOptionPane.ERROR_MESSAGE);
+                       }
                }
                dispose();
        }
@@ -81,9 +88,7 @@ public class MicroDownload extends AltosUIDialog implements Runnable, ActionList
        }
 
        public void actionPerformed(ActionEvent ae) {
-               System.out.printf ("command %s\n", ae.getActionCommand());
                if (serial_thread != null) {
-                       System.out.printf ("Interrupting serial_thread\n");
                        serial.close();
                        serial_thread.interrupt();
                }