From: Keith Packard <keithp@keithp.com>
Date: Sun, 5 Sep 2010 07:57:38 +0000 (-0700)
Subject: altosui: Return AO_LOG_INVALID instead of exception for eeprom files
X-Git-Tag: debian/0.7+79+g3d49d5f~12
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=eb0e7a59f0806734a4c959a3ce7c57f71cbe3986

altosui: Return AO_LOG_INVALID instead of exception for eeprom files

When an eeprom file contains an invalid line, just return
AO_LOG_INVALID instead of throwing an exception. This allows us to
replay and parse files with extraneous serial communication.

Signed-off-by: Keith Packard <keithp@keithp.com>
---

diff --git a/ao-tools/altosui/AltosEepromRecord.java b/ao-tools/altosui/AltosEepromRecord.java
index 4d0817ab..95cbe015 100644
--- a/ao-tools/altosui/AltosEepromRecord.java
+++ b/ao-tools/altosui/AltosEepromRecord.java
@@ -47,7 +47,7 @@ public class AltosEepromRecord {
 	public String	data;
 	public boolean	tick_valid;
 
-	public AltosEepromRecord (String line) throws ParseException {
+	public AltosEepromRecord (String line) {
 		tick_valid = false;
 		tick = 0;
 		a = 0;
@@ -55,52 +55,61 @@ public class AltosEepromRecord {
 		data = null;
 		if (line == null) {
 			cmd = Altos.AO_LOG_INVALID;
+			data = "";
 		} else {
-			String[] tokens = line.split("\\s+");
+			try {
+				String[] tokens = line.split("\\s+");
 
-			if (tokens[0].length() == 1) {
-				if (tokens.length != 4)
-					throw new ParseException(line, 0);
-				cmd = tokens[0].codePointAt(0);
-				tick = Integer.parseInt(tokens[1],16);
-				tick_valid = true;
-				a = Integer.parseInt(tokens[2],16);
-				b = Integer.parseInt(tokens[3],16);
-			} else if (tokens[0].equals("Config") && tokens[1].equals("version:")) {
-				cmd = Altos.AO_LOG_CONFIG_VERSION;
-				data = tokens[2];
-			} else if (tokens[0].equals("Main") && tokens[1].equals("deploy:")) {
-				cmd = Altos.AO_LOG_MAIN_DEPLOY;
-				a = Integer.parseInt(tokens[2]);
-			} else if (tokens[0].equals("Apogee") && tokens[1].equals("delay:")) {
-				cmd = Altos.AO_LOG_APOGEE_DELAY;
-				a = Integer.parseInt(tokens[2]);
-			} else if (tokens[0].equals("Radio") && tokens[1].equals("channel:")) {
-				cmd = Altos.AO_LOG_RADIO_CHANNEL;
-				a = Integer.parseInt(tokens[2]);
-			} else if (tokens[0].equals("Callsign:")) {
-				cmd = Altos.AO_LOG_CALLSIGN;
-				data = tokens[1].replaceAll("\"","");
-			} else if (tokens[0].equals("Accel") && tokens[1].equals("cal")) {
-				cmd = Altos.AO_LOG_ACCEL_CAL;
-				a = Integer.parseInt(tokens[3]);
-				b = Integer.parseInt(tokens[5]);
-			} else if (tokens[0].equals("Radio") && tokens[1].equals("cal:")) {
-				cmd = Altos.AO_LOG_RADIO_CAL;
-				a = Integer.parseInt(tokens[2]);
-			} else if (tokens[0].equals("manufacturer")) {
-				cmd = Altos.AO_LOG_MANUFACTURER;
-				data = tokens[1];
-			} else if (tokens[0].equals("product")) {
-				cmd = Altos.AO_LOG_PRODUCT;
-				data = tokens[1];
-			} else if (tokens[0].equals("serial-number")) {
-				cmd = Altos.AO_LOG_SERIAL_NUMBER;
-				a = Integer.parseInt(tokens[1]);
-			} else if (tokens[0].equals("software-version")) {
-				cmd = Altos.AO_LOG_SOFTWARE_VERSION;
-				data = tokens[1];
-			} else {
+				if (tokens[0].length() == 1) {
+					if (tokens.length != 4) {
+						cmd = Altos.AO_LOG_INVALID;
+						data = line;
+					} else {
+						cmd = tokens[0].codePointAt(0);
+						tick = Integer.parseInt(tokens[1],16);
+						tick_valid = true;
+						a = Integer.parseInt(tokens[2],16);
+						b = Integer.parseInt(tokens[3],16);
+					}
+				} else if (tokens[0].equals("Config") && tokens[1].equals("version:")) {
+					cmd = Altos.AO_LOG_CONFIG_VERSION;
+					data = tokens[2];
+				} else if (tokens[0].equals("Main") && tokens[1].equals("deploy:")) {
+					cmd = Altos.AO_LOG_MAIN_DEPLOY;
+					a = Integer.parseInt(tokens[2]);
+				} else if (tokens[0].equals("Apogee") && tokens[1].equals("delay:")) {
+					cmd = Altos.AO_LOG_APOGEE_DELAY;
+					a = Integer.parseInt(tokens[2]);
+				} else if (tokens[0].equals("Radio") && tokens[1].equals("channel:")) {
+					cmd = Altos.AO_LOG_RADIO_CHANNEL;
+					a = Integer.parseInt(tokens[2]);
+				} else if (tokens[0].equals("Callsign:")) {
+					cmd = Altos.AO_LOG_CALLSIGN;
+					data = tokens[1].replaceAll("\"","");
+				} else if (tokens[0].equals("Accel") && tokens[1].equals("cal")) {
+					cmd = Altos.AO_LOG_ACCEL_CAL;
+					a = Integer.parseInt(tokens[3]);
+					b = Integer.parseInt(tokens[5]);
+				} else if (tokens[0].equals("Radio") && tokens[1].equals("cal:")) {
+					cmd = Altos.AO_LOG_RADIO_CAL;
+					a = Integer.parseInt(tokens[2]);
+				} else if (tokens[0].equals("manufacturer")) {
+					cmd = Altos.AO_LOG_MANUFACTURER;
+					data = tokens[1];
+				} else if (tokens[0].equals("product")) {
+					cmd = Altos.AO_LOG_PRODUCT;
+					data = tokens[1];
+				} else if (tokens[0].equals("serial-number")) {
+					cmd = Altos.AO_LOG_SERIAL_NUMBER;
+					a = Integer.parseInt(tokens[1]);
+				} else if (tokens[0].equals("software-version")) {
+					cmd = Altos.AO_LOG_SOFTWARE_VERSION;
+					data = tokens[1];
+				} else {
+					cmd = Altos.AO_LOG_INVALID;
+					data = line;
+				}
+			} catch (NumberFormatException ne) {
 				cmd = Altos.AO_LOG_INVALID;
 				data = line;
 			}