projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
alots/stmf0: Fix vpath entry for AES directory
[fw/altos]
/
altosui
/
AltosLaunchUI.java
diff --git
a/altosui/AltosLaunchUI.java
b/altosui/AltosLaunchUI.java
index eb76243db8784b1d0a5cd4f91eab10d9ca3caf76..835858e23230e17f4d4ab72bf64ed422cc147e26 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
*
* 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
*
* 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 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
+47,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;
@@
-336,7
+332,6
@@
public class AltosLaunchUI
public void actionPerformed(ActionEvent e) {
String cmd = e.getActionCommand();
public void actionPerformed(ActionEvent e) {
String cmd = e.getActionCommand();
- System.out.printf("cmd %s\n", cmd);
if (cmd.equals("armed") || cmd.equals("igniter")) {
stop_arm_timer();
}
if (cmd.equals("armed") || cmd.equals("igniter")) {
stop_arm_timer();
}
@@
-377,7
+372,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);