Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos

[fw/altos] / altosui / AltosLaunchUI.java

diff --git a/altosui/AltosLaunchUI.java b/altosui/AltosLaunchUI.java
index a4f1299753c22443b124313066fb8d8ca8c577f2..56b211acd146e26a532d05a8f767fc03b928af71 100644 (file)
--- a/altosui/AltosLaunchUI.java
+++ b/altosui/AltosLaunchUI.java
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,20 +16,15 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package AltosUI;
+package altosui;
 
 import java.awt.*;
 import java.awt.event.*;
 import javax.swing.*;
-import javax.swing.filechooser.FileNameExtensionFilter;
-import javax.swing.table.*;
-import javax.swing.event.*;
 import java.io.*;
-import java.util.*;
 import java.text.*;
-import java.util.prefs.*;
 import java.util.concurrent.*;
-import org.altusmetrum.AltosLib.*;
+import org.altusmetrum.altosuilib_13.*;
 
 class FireButton extends JButton {
        protected void processMouseEvent(MouseEvent e) {
@@ -51,7 +47,7 @@ class FireButton extends JButton {
 }
 
 public class AltosLaunchUI
-       extends AltosDialog
+       extends AltosUIDialog
        implements ActionListener
 {
        AltosDevice     device;
@@ -376,7 +372,7 @@ public class AltosLaunchUI
        private boolean open() {
                command_queue = new LinkedBlockingQueue<String>();
 
-               device = AltosDeviceDialog.show(owner, Altos.product_any);
+               device = AltosDeviceUIDialog.show(owner, Altos.product_any);
                if (device != null) {
                                LaunchHandler   handler = new LaunchHandler(owner);
                                Thread          t = new Thread(handler);