projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Change AltosLib to altoslib
[fw/altos]
/
altosui
/
AltosUI.java
diff --git
a/altosui/AltosUI.java
b/altosui/AltosUI.java
index c1a66b835692c695f232f401a1030002602ee583..d89b3daa8e7267cb93107c33d4c33bf035ff7401 100644
(file)
--- a/
altosui/AltosUI.java
+++ b/
altosui/AltosUI.java
@@
-20,18
+20,12
@@
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 java.io.*;
import java.io.*;
-import java.util.*;
-import java.text.*;
-import java.util.prefs.*;
import java.util.concurrent.*;
import java.util.concurrent.*;
-import org.altusmetrum.AltosLib.*;
+import org.altusmetrum.altoslib.*;
+import org.altusmetrum.altosuilib.*;
-import libaltosJNI.*;
-
-public class AltosUI extends AltosFrame {
+public class AltosUI extends AltosUIFrame {
public AltosVoice voice = new AltosVoice();
public static boolean load_library(Frame frame) {
public AltosVoice voice = new AltosVoice();
public static boolean load_library(Frame frame) {
@@
-94,7
+88,7
@@
public class AltosUI extends AltosFrame {
c.weighty = 1;
b = new JButton(label);
c.weighty = 1;
b = new JButton(label);
- Dimension ps = b.getPreferredSize();
+
//
Dimension ps = b.getPreferredSize();
gridbag.setConstraints(b, c);
add(b, c);
gridbag.setConstraints(b, c);
add(b, c);
@@
-230,14
+224,6
@@
public class AltosUI extends AltosFrame {
doLayout();
validate();
doLayout();
validate();
- setVisible(true);
-
- Insets i = getInsets();
- Dimension ps = rootPane.getPreferredSize();
- ps.width += i.left + i.right;
- ps.height += i.top + i.bottom;
- setPreferredSize(ps);
- setSize(ps);
setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);
addWindowListener(new WindowAdapter() {
@Override
setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);
addWindowListener(new WindowAdapter() {
@Override
@@
-245,10
+231,15
@@
public class AltosUI extends AltosFrame {
System.exit(0);
}
});
System.exit(0);
}
});
+
+ setLocationByPlatform(false);
+
+ /* Insets aren't set before the window is visible */
+ setVisible(true);
}
private void ConnectToDevice() {
}
private void ConnectToDevice() {
- AltosDevice device = AltosDeviceDialog.show(AltosUI.this,
+ AltosDevice device = AltosDevice
UI
Dialog.show(AltosUI.this,
Altos.product_basestation);
if (device != null)
Altos.product_basestation);
if (device != null)
@@
-448,9
+439,11
@@
public class AltosUI extends AltosFrame {
return null;
}
AltosRecordIterable recs;
return null;
}
AltosRecordIterable recs;
- AltosReplayReader reader;
+
//
AltosReplayReader reader;
if (file.getName().endsWith("eeprom")) {
recs = new AltosEepromIterable(in);
if (file.getName().endsWith("eeprom")) {
recs = new AltosEepromIterable(in);
+ } else if (file.getName().endsWith("mega")) {
+ recs = new AltosEepromMegaIterable(in);
} else {
recs = new AltosTelemetryIterable(in);
}
} else {
recs = new AltosTelemetryIterable(in);
}
@@
-556,7
+549,6
@@
public class AltosUI extends AltosFrame {
/* Handle batch-mode */
if (args.length == 0) {
AltosUI altosui = new AltosUI();
/* Handle batch-mode */
if (args.length == 0) {
AltosUI altosui = new AltosUI();
- altosui.setVisible(true);
java.util.List<AltosDevice> devices = AltosUSBDevice.list(Altos.product_basestation);
for (AltosDevice device : devices)
java.util.List<AltosDevice> devices = AltosUSBDevice.list(Altos.product_basestation);
for (AltosDevice device : devices)