projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into branch-1.6
[fw/altos]
/
altosui
/
AltosLaunchUI.java
diff --git
a/altosui/AltosLaunchUI.java
b/altosui/AltosLaunchUI.java
index 444815442de739d5a40b45f909599df9d07c8a82..22608c1b74066a0f8bafd9bf4ba5461ccb919062 100644
(file)
--- a/
altosui/AltosLaunchUI.java
+++ b/
altosui/AltosLaunchUI.java
@@
-20,15
+20,10
@@
package altosui;
import java.awt.*;
import java.awt.event.*;
import javax.swing.*;
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.io.*;
-import java.util.*;
import java.text.*;
import java.text.*;
-import java.util.prefs.*;
import java.util.concurrent.*;
import java.util.concurrent.*;
-import org.altusmetrum.
AltosLib
.*;
+import org.altusmetrum.
altosuilib_11
.*;
class FireButton extends JButton {
protected void processMouseEvent(MouseEvent e) {
class FireButton extends JButton {
protected void processMouseEvent(MouseEvent e) {
@@
-51,7
+46,7
@@
class FireButton extends JButton {
}
public class AltosLaunchUI
}
public class AltosLaunchUI
- extends AltosDialog
+ extends Altos
UI
Dialog
implements ActionListener
{
AltosDevice device;
implements ActionListener
{
AltosDevice device;
@@
-376,7
+371,7
@@
public class AltosLaunchUI
private boolean open() {
command_queue = new LinkedBlockingQueue<String>();
private boolean open() {
command_queue = new LinkedBlockingQueue<String>();
- device = AltosDeviceDialog.show(owner, Altos.product_any);
+ device = AltosDevice
UI
Dialog.show(owner, Altos.product_any);
if (device != null) {
LaunchHandler handler = new LaunchHandler(owner);
Thread t = new Thread(handler);
if (device != null) {
LaunchHandler handler = new LaunchHandler(owner);
Thread t = new Thread(handler);