projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altosui: remove redundant catches
[fw/altos]
/
altosui
/
AltosEepromDownload.java
diff --git
a/altosui/AltosEepromDownload.java
b/altosui/AltosEepromDownload.java
index d1e5fdf0484cd2d51c3a70ef10f9e56761e81a46..d72943099944a6c524f964da8ad7f8f73f1ae49d 100644
(file)
--- a/
altosui/AltosEepromDownload.java
+++ b/
altosui/AltosEepromDownload.java
@@
-17,20
+17,14
@@
package altosui;
package altosui;
-import java.awt.*;
import java.awt.event.*;
import javax.swing.*;
import java.awt.event.*;
import javax.swing.*;
-import javax.swing.filechooser.FileNameExtensionFilter;
-import javax.swing.table.*;
import java.io.*;
import java.util.*;
import java.text.*;
import java.io.*;
import java.util.*;
import java.text.*;
-import java.util.prefs.*;
import java.util.concurrent.*;
import org.altusmetrum.AltosLib.*;
import java.util.concurrent.*;
import org.altusmetrum.AltosLib.*;
-import libaltosJNI.*;
-
public class AltosEepromDownload implements Runnable {
JFrame frame;
public class AltosEepromDownload implements Runnable {
JFrame frame;
@@
-134,7
+128,8
@@
public class AltosEepromDownload implements Runnable {
}
if (r.cmd == Altos.AO_LOG_STATE && r.a == Altos.ao_flight_landed)
done = true;
}
if (r.cmd == Altos.AO_LOG_STATE && r.a == Altos.ao_flight_landed)
done = true;
- any_valid = true;
+ if (r.cmd != AltosLib.AO_LOG_INVALID)
+ any_valid = true;
Log(r);
} catch (ParseException pe) {
if (parse_exception == null)
Log(r);
} catch (ParseException pe) {
if (parse_exception == null)
@@
-319,11
+314,9
@@
public class AltosEepromDownload implements Runnable {
done = false;
start = true;
done = false;
start = true;
-
//
if (flights.config_data.serial == 0)
-
//
throw new IOException("no serial number found");
+
if (flights.config_data.serial == 0)
+
throw new IOException("no serial number found");
- log_format = 5;
- System.out.printf ("log format: %d\n", log_format);
/* Reset per-capture variables */
flight = 0;
year = 0;
/* Reset per-capture variables */
flight = 0;
year = 0;
@@
-338,7
+331,7
@@
public class AltosEepromDownload implements Runnable {
state = 0; state_block = log.start_block;
for (block = log.start_block; !done && block < log.end_block; block++) {
state = 0; state_block = log.start_block;
for (block = log.start_block; !done && block < log.end_block; block++) {
- monitor.set_value(Altos
.state_to_string[state]
, state, block - state_block);
+ monitor.set_value(Altos
Lib.state_name(state)
, state, block - state_block);
AltosEepromChunk eechunk = new AltosEepromChunk(serial_line, block, block == log.start_block);
AltosEepromChunk eechunk = new AltosEepromChunk(serial_line, block, block == log.start_block);