projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altosui: Split out UI-specific preferences
[fw/altos]
/
altosui
/
AltosDataChooser.java
diff --git
a/altosui/AltosDataChooser.java
b/altosui/AltosDataChooser.java
index 15de05c2bb510723dabbe22704cbc41d55e57dad..c4a46d01c2e7ca02262fa7c841064bd68dcc01bd 100644
(file)
--- a/
altosui/AltosDataChooser.java
+++ b/
altosui/AltosDataChooser.java
@@
-56,12
+56,15
@@
public class AltosDataChooser extends JFileChooser {
} else if (filename.endsWith("telem")) {
FileInputStream in = new FileInputStream(file);
return new AltosTelemetryIterable(in);
} else if (filename.endsWith("telem")) {
FileInputStream in = new FileInputStream(file);
return new AltosTelemetryIterable(in);
+ } else if (filename.endsWith("mega")) {
+ FileInputStream in = new FileInputStream(file);
+ return new AltosEepromMegaIterable(in);
} else {
throw new FileNotFoundException();
}
} catch (FileNotFoundException fe) {
JOptionPane.showMessageDialog(frame,
} else {
throw new FileNotFoundException();
}
} catch (FileNotFoundException fe) {
JOptionPane.showMessageDialog(frame,
- f
ilename
,
+ f
e.getMessage()
,
"Cannot open file",
JOptionPane.ERROR_MESSAGE);
}
"Cannot open file",
JOptionPane.ERROR_MESSAGE);
}
@@
-74,6
+77,6
@@
public class AltosDataChooser extends JFileChooser {
setDialogTitle("Select Flight Record File");
setFileFilter(new FileNameExtensionFilter("Flight data file",
"telem", "eeprom"));
setDialogTitle("Select Flight Record File");
setFileFilter(new FileNameExtensionFilter("Flight data file",
"telem", "eeprom"));
- setCurrentDirectory(AltosPreferences.logdir());
+ setCurrentDirectory(Altos
UI
Preferences.logdir());
}
}
}
}