projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote branch 'aj/master'
[fw/altos]
/
ao-tools
/
altosui
/
AltosLogfileChooser.java
diff --git
a/ao-tools/altosui/AltosLogfileChooser.java
b/ao-tools/altosui/AltosLogfileChooser.java
index 3e9e48922b2f1268642755fbb5899b306feba6ad..8b9d77d69cba6f70cd0d385b20ace70c03ca569e 100644
(file)
--- a/
ao-tools/altosui/AltosLogfileChooser.java
+++ b/
ao-tools/altosui/AltosLogfileChooser.java
@@
-27,25
+27,25
@@
import java.util.*;
import java.text.*;
import java.util.prefs.*;
import java.text.*;
import java.util.prefs.*;
-import altosui.AltosPreferences;
-import altosui.AltosReader;
-import altosui.AltosEepromReader;
-import altosui.AltosTelemetryReader;
-
public class AltosLogfileChooser extends JFileChooser {
JFrame frame;
String filename;
public class AltosLogfileChooser extends JFileChooser {
JFrame frame;
String filename;
+ File file;
public String filename() {
return filename;
}
public String filename() {
return filename;
}
- public AltosReader runDialog() {
+ public File file() {
+ return file;
+ }
+
+ public AltosRecordIterable runDialog() {
int ret;
ret = showOpenDialog(frame);
if (ret == APPROVE_OPTION) {
int ret;
ret = showOpenDialog(frame);
if (ret == APPROVE_OPTION) {
-
File
file = getSelectedFile();
+ file = getSelectedFile();
if (file == null)
return null;
filename = file.getName();
if (file == null)
return null;
filename = file.getName();
@@
-54,9
+54,9
@@
public class AltosLogfileChooser extends JFileChooser {
in = new FileInputStream(file);
if (filename.endsWith("eeprom"))
in = new FileInputStream(file);
if (filename.endsWith("eeprom"))
- return new AltosEeprom
Reader
(in);
+ return new AltosEeprom
Iterable
(in);
else
else
- return new AltosTelemetry
Reader
(in);
+ return new AltosTelemetry
Iterable
(in);
} catch (FileNotFoundException fe) {
JOptionPane.showMessageDialog(frame,
filename,
} catch (FileNotFoundException fe) {
JOptionPane.showMessageDialog(frame,
filename,
@@
-68,7
+68,7
@@
public class AltosLogfileChooser extends JFileChooser {
}
public AltosLogfileChooser(JFrame in_frame) {
}
public AltosLogfileChooser(JFrame in_frame) {
-
in_frame =
frame;
+
frame = in_
frame;
setDialogTitle("Select Flight Record File");
setFileFilter(new FileNameExtensionFilter("Flight data file",
"eeprom",
setDialogTitle("Select Flight Record File");
setFileFilter(new FileNameExtensionFilter("Flight data file",
"eeprom",