X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosui%2FAltosFlashUI.java;h=f4e522181b8f95419d0094f0881cb84a72b22f02;hb=d203a2da2641bec21a4257c8a7b03d9a1eba53a5;hp=66991d1066df111eebb2d2987f12ac83809c8d7c;hpb=95268d681c9a6652d84db383f55a4fe8a4ac5173;p=fw%2Faltos

diff --git a/altosui/AltosFlashUI.java b/altosui/AltosFlashUI.java
index 66991d10..f4e52218 100644
--- a/altosui/AltosFlashUI.java
+++ b/altosui/AltosFlashUI.java
@@ -21,16 +21,13 @@ import java.awt.*;
 import java.awt.event.*;
 import javax.swing.*;
 import javax.swing.filechooser.FileNameExtensionFilter;
-import javax.swing.table.*;
 import java.io.*;
-import java.util.*;
-import java.text.*;
-import java.util.prefs.*;
 import java.util.concurrent.*;
-import org.altusmetrum.AltosLib.*;
+import org.altusmetrum.altoslib_1.*;
+import org.altusmetrum.altosuilib_1.*;
 
 public class AltosFlashUI
-	extends AltosDialog
+	extends AltosUIDialog
 	implements ActionListener
 {
 	Container	pane;
@@ -180,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;
@@ -218,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();