Merge branch 'telescience-v0.2'

[fw/altos] / altosui / AltosFlashUI.java

diff --git a/altosui/AltosFlashUI.java b/altosui/AltosFlashUI.java
index f8c24b16c662a2498cb6b4570f087461f9c198f5..f26a391614e17275f5451d94517daa661b2019b5 100644 (file)
--- a/altosui/AltosFlashUI.java
+++ b/altosui/AltosFlashUI.java
@@ -23,9 +23,10 @@ import javax.swing.*;
 import javax.swing.filechooser.FileNameExtensionFilter;
 import java.io.*;
 import java.util.concurrent.*;
+import org.altusmetrum.altosuilib_1.*;
 
 public class AltosFlashUI
-       extends AltosDialog
+       extends AltosUIDialog
        implements ActionListener
 {
        Container       pane;
@@ -175,7 +176,7 @@ public class AltosFlashUI
        }
 
        boolean select_debug_dongle() {
-               debug_dongle = AltosDeviceDialog.show(frame, Altos.product_any);
+               debug_dongle = AltosDeviceUIDialog.show(frame, Altos.product_any);
 
                if (debug_dongle == null)
                        return false;
@@ -286,7 +287,7 @@ public class AltosFlashUI
                if (!select_source_file())
                        return;
                build_dialog();
-               //flash_task    f = new flash_task(this);
+               flash_task      f = new flash_task(this);
        }
 
        static void show(JFrame frame) {