X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosui%2FAltosFlashUI.java;h=66991d1066df111eebb2d2987f12ac83809c8d7c;hb=66a1e07efcac9324d33a1eca0dfb58a2724b667a;hp=3956ff20a94789d99148df23fdda1455e9aa0beb;hpb=128bbfa150f88c09f7adde2434b7bf0b5a9ed556;p=fw%2Faltos

diff --git a/altosui/AltosFlashUI.java b/altosui/AltosFlashUI.java
index 3956ff20..66991d10 100644
--- a/altosui/AltosFlashUI.java
+++ b/altosui/AltosFlashUI.java
@@ -27,9 +27,10 @@ import java.util.*;
 import java.text.*;
 import java.util.prefs.*;
 import java.util.concurrent.*;
+import org.altusmetrum.AltosLib.*;
 
 public class AltosFlashUI
-	extends JDialog
+	extends AltosDialog
 	implements ActionListener
 {
 	Container	pane;
@@ -161,7 +162,7 @@ public class AltosFlashUI
 	boolean select_source_file() {
 		JFileChooser	hexfile_chooser = new JFileChooser();
 
-		File firmwaredir = AltosPreferences.firmwaredir();
+		File firmwaredir = AltosUIPreferences.firmwaredir();
 		if (firmwaredir != null)
 			hexfile_chooser.setCurrentDirectory(firmwaredir);
 
@@ -174,7 +175,7 @@ public class AltosFlashUI
 		file = hexfile_chooser.getSelectedFile();
 		if (file == null)
 			return false;
-		AltosPreferences.set_firmwaredir(file.getParentFile());
+		AltosUIPreferences.set_firmwaredir(file.getParentFile());
 		return true;
 	}
 
@@ -234,30 +235,40 @@ public class AltosFlashUI
 						public void run() {
 							ui.flash = flash;
 							ui.update_rom_config_info(current_config);
-							System.out.printf("Done updating rom config info\n");
 							await_rom_config.release();
 						}
 					});
-				System.out.printf("Waiting for rom configuration updates\n");
 				await_rom_config.acquire();
-				System.out.printf("Got rom config update\n");
 
 				if (ui.rom_config != null) {
-					System.out.printf("rom_config not null\n");
 					flash.set_romconfig(ui.rom_config);
 					flash.flash();
 				}
-			} catch (Exception ee) {
+			} catch (InterruptedException ee) {
 				final Exception	e = ee;
-				System.out.printf("exception %s\n", e.toString());
 				SwingUtilities.invokeLater(new Runnable() {
 						public void run() {
 							ui.exception(e);
 						}
 					});
+			} catch (IOException ee) {
+				final Exception	e = ee;
+				SwingUtilities.invokeLater(new Runnable() {
+						public void run() {
+							ui.exception(e);
+						}
+					});
+			} catch (AltosSerialInUseException ee) {
+				final Exception	e = ee;
+				SwingUtilities.invokeLater(new Runnable() {
+						public void run() {
+							ui.exception(e);
+						}
+					});
+			} finally {
+				if (flash != null)
+					flash.close();
 			}
-			if (flash != null)
-				flash.close();
 		}
 
 		public flash_task(AltosFlashUI in_ui) {