X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltosFlashUI.java;h=f26a391614e17275f5451d94517daa661b2019b5;hp=704ce35c9fca4227a830c60dd3a51525e0409ec8;hb=2120d362cefceba69e75996b6391d9558978c01d;hpb=f6db11c3c87725c809c518f5f19b07325faf9c84

diff --git a/altosui/AltosFlashUI.java b/altosui/AltosFlashUI.java
index 704ce35c..f26a3916 100644
--- a/altosui/AltosFlashUI.java
+++ b/altosui/AltosFlashUI.java
@@ -21,15 +21,12 @@ 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.altosuilib_1.*;
 
 public class AltosFlashUI
-	extends AltosDialog
+	extends AltosUIDialog
 	implements ActionListener
 {
 	Container	pane;
@@ -161,7 +158,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,12 +171,12 @@ public class AltosFlashUI
 		file = hexfile_chooser.getSelectedFile();
 		if (file == null)
 			return false;
-		AltosPreferences.set_firmwaredir(file.getParentFile());
+		AltosUIPreferences.set_firmwaredir(file.getParentFile());
 		return true;
 	}
 
 	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;
@@ -234,22 +231,17 @@ 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 (InterruptedException ee) {
 				final Exception	e = ee;
-				System.out.printf("exception %s\n", e.toString());
 				SwingUtilities.invokeLater(new Runnable() {
 						public void run() {
 							ui.exception(e);
@@ -257,7 +249,6 @@ public class AltosFlashUI
 					});
 			} catch (IOException ee) {
 				final Exception	e = ee;
-				System.out.printf("exception %s\n", e.toString());
 				SwingUtilities.invokeLater(new Runnable() {
 						public void run() {
 							ui.exception(e);
@@ -265,7 +256,6 @@ public class AltosFlashUI
 					});
 			} catch (AltosSerialInUseException ee) {
 				final Exception	e = ee;
-				System.out.printf("exception %s\n", e.toString());
 				SwingUtilities.invokeLater(new Runnable() {
 						public void run() {
 							ui.exception(e);