eeprom_file = new FileWriter(eeprom_name);
if (eeprom_file != null) {
- monitor.set_file(eeprom_name.getName());
+ monitor.set_filename(eeprom_name.getName());
FlushPending();
eeprom_pending = null;
}
}
}
- void CaptureEeprom(AltosEepromChunk eechunk, int log_format) throws IOException {
+ void CaptureEeprom(AltosEepromChunk eechunk, int log_format) throws IOException, ParseException {
boolean any_valid = false;
boolean got_flight = false;
CheckFile(false);
}
- void CaptureLog(AltosEepromLog log) throws IOException, InterruptedException, TimeoutException {
+ void CaptureLog(AltosEepromLog log) throws IOException, InterruptedException, TimeoutException, ParseException {
int block, state_block = 0;
int log_format = flights.config_data.log_format;
parse_exception = null;
if (log.selected) {
monitor.reset();
- CaptureLog(log);
+ try {
+ CaptureLog(log);
+ } catch (ParseException e) {
+ parse_exception = e;
+ }
}
if (parse_exception != null) {
failed = true;
flights = given_flights;
success = false;
- monitor = new AltosEepromMonitor(frame, Altos.ao_flight_boost, Altos.ao_flight_landed);
- monitor.addActionListener(new ActionListener() {
- public void actionPerformed(ActionEvent e) {
- if (eeprom_thread != null)
- eeprom_thread.interrupt();
- }
- });
+ monitor = new AltosEepromMonitorUI(given_frame);
+ monitor.set_states(Altos.ao_flight_boost, Altos.ao_flight_landed);
+
+ monitor.set_thread(eeprom_thread);
}
}