projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos/telemega-v6: Remove beep freq defs and use defaults
[fw/altos]
/
altosui
/
AltosLaunchUI.java
diff --git
a/altosui/AltosLaunchUI.java
b/altosui/AltosLaunchUI.java
index 39b986c0a129f0dde62a7533be54027bd9bb3ea9..6615063badd39bb12f5cb3594312e8a1aeb63e49 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
@@
-23,6
+24,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_14.*;
class FireButton extends JButton {
protected void processMouseEvent(MouseEvent e) {
class FireButton extends JButton {
protected void processMouseEvent(MouseEvent e) {
@@
-45,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;
@@
-370,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);
@@
-391,7
+393,7
@@
public class AltosLaunchUI
if (!open())
return;
if (!open())
return;
- Container pane = get
Content
Pane();
+ Container pane = get
Scrollable
Pane();
GridBagConstraints c = new GridBagConstraints();
Insets i = new Insets(4,4,4,4);
GridBagConstraints c = new GridBagConstraints();
Insets i = new Insets(4,4,4,4);
@@
-508,4
+510,4
@@
public class AltosLaunchUI
setVisible(true);
}
setVisible(true);
}
-}
\ No newline at end of file
+}