X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosui%2FAltosLaunchUI.java;h=6615063badd39bb12f5cb3594312e8a1aeb63e49;hb=1fa1ba86f6e6e4ff469f0680cdbc39bc806474a4;hp=444815442de739d5a40b45f909599df9d07c8a82;hpb=95268d681c9a6652d84db383f55a4fe8a4ac5173;p=fw%2Faltos diff --git a/altosui/AltosLaunchUI.java b/altosui/AltosLaunchUI.java index 44481544..6615063b 100644 --- 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 @@ -20,15 +21,10 @@ 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_14.*; 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(); - 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); @@ -397,7 +393,7 @@ public class AltosLaunchUI if (!open()) return; - Container pane = getContentPane(); + Container pane = getScrollablePane(); GridBagConstraints c = new GridBagConstraints(); Insets i = new Insets(4,4,4,4); @@ -514,4 +510,4 @@ public class AltosLaunchUI setVisible(true); } -} \ No newline at end of file +}