X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltosFlashUI.java;h=6eccface19815f29c00a2ef4ddd366d3545aee0e;hp=f8c24b16c662a2498cb6b4570f087461f9c198f5;hb=08143a922fe27bc50a19924f46538f9476ab5fd1;hpb=52d3cad4f744140e1aa06fdfc0d49a0cf8734fd4

diff --git a/altosui/AltosFlashUI.java b/altosui/AltosFlashUI.java
index f8c24b16..6eccface 100644
--- a/altosui/AltosFlashUI.java
+++ b/altosui/AltosFlashUI.java
@@ -23,9 +23,11 @@ import javax.swing.*;
 import javax.swing.filechooser.FileNameExtensionFilter;
 import java.io.*;
 import java.util.concurrent.*;
+import org.altusmetrum.altoslib_2.*;
+import org.altusmetrum.altosuilib_1.*;
 
 public class AltosFlashUI
-	extends AltosDialog
+	extends AltosUIDialog
 	implements ActionListener
 {
 	Container	pane;
@@ -175,7 +177,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;
@@ -213,15 +215,30 @@ public class AltosFlashUI
 		}
 	}
 
-	class flash_task implements Runnable {
+	class flash_task implements Runnable, AltosFlashListener {
 		AltosFlashUI	ui;
 		Thread		t;
 		AltosFlash	flash;
 
+		public void position(String in_s, int in_percent) {
+			final String s = in_s;
+			final int percent = in_percent;
+			Runnable r = new Runnable() {
+					public void run() {
+						try {
+							ui.actionPerformed(new ActionEvent(this,
+											   percent,
+											   s));
+						} catch (Exception ex) {
+						}
+					}
+				};
+			SwingUtilities.invokeLater(r);
+		}
+
 		public void run () {
 			try {
-				flash = new AltosFlash(ui.file, ui.debug_dongle);
-				flash.addActionListener(ui);
+				flash = new AltosFlash(ui.file, new AltosSerial(ui.debug_dongle), this);
 
 				final AltosRomconfig	current_config = flash.romconfig();
 
@@ -286,7 +303,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) {