projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'origin/master'
[fw/altos]
/
altosui
/
AltosLaunchUI.java
diff --git
a/altosui/AltosLaunchUI.java
b/altosui/AltosLaunchUI.java
index 39b986c0a129f0dde62a7533be54027bd9bb3ea9..4d9fbda563c552c86331524a860d7bdaab584060 100644
(file)
--- a/
altosui/AltosLaunchUI.java
+++ b/
altosui/AltosLaunchUI.java
@@
-23,6
+23,7
@@
import javax.swing.*;
import java.io.*;
import java.text.*;
import java.util.concurrent.*;
import java.io.*;
import java.text.*;
import java.util.concurrent.*;
+import org.altusmetrum.altosuilib_1.*;
class FireButton extends JButton {
protected void processMouseEvent(MouseEvent e) {
class FireButton extends JButton {
protected void processMouseEvent(MouseEvent e) {
@@
-45,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;
@@
-370,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);