Reverted package name to 'altosui' from 'AltosUI'

[fw/altos] / altosui / AltosFlashUI.java

diff --git a/altosui/AltosFlashUI.java b/altosui/AltosFlashUI.java
index 704ce35c9fca4227a830c60dd3a51525e0409ec8..66991d1066df111eebb2d2987f12ac83809c8d7c 100644 (file)
--- a/altosui/AltosFlashUI.java
+++ b/altosui/AltosFlashUI.java
@@ -27,6 +27,7 @@ import java.util.*;
 import java.text.*;
 import java.util.prefs.*;
 import java.util.concurrent.*;
+import org.altusmetrum.AltosLib.*;
 
 public class AltosFlashUI
        extends AltosDialog
@@ -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,22 +235,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 +253,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 +260,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);