diff options
Diffstat (limited to 'altoslib/AltosTelemetryIterable.java')
| -rw-r--r-- | altoslib/AltosTelemetryIterable.java | 30 | 
1 files changed, 13 insertions, 17 deletions
| diff --git a/altoslib/AltosTelemetryIterable.java b/altoslib/AltosTelemetryIterable.java index 402bbf4f..a752e24e 100644 --- a/altoslib/AltosTelemetryIterable.java +++ b/altoslib/AltosTelemetryIterable.java @@ -80,29 +80,25 @@ public class AltosTelemetryIterable implements Iterable<AltosTelemetry> {  		return new AltosTelemetryOrderedIterator(telems);  	} -	public AltosTelemetryIterable (FileInputStream input) { +	public AltosTelemetryIterable (FileInputStream input) throws IOException {  		telems = new TreeSet<AltosTelemetryOrdered> ();  		tick = 0;  		index = 0; -		try { -			for (;;) { -				String line = AltosLib.gets(input); -				if (line == null) { +		for (;;) { +			String line = AltosLib.gets(input); +			if (line == null) { +				break; +			} +			try { +				AltosTelemetry telem = AltosTelemetry.parse(line); +				if (telem == null)  					break; -				} -				try { -					AltosTelemetry telem = AltosTelemetry.parse(line); -					if (telem == null) -						break; -					add(telem); -				} catch (ParseException pe) { -					System.out.printf("parse exception %s\n", pe.getMessage()); -				} catch (AltosCRCException ce) { -				} +				add(telem); +			} catch (ParseException pe) { +				System.out.printf("parse exception %s\n", pe.getMessage()); +			} catch (AltosCRCException ce) {  			} -		} catch (IOException io) { -			System.out.printf("io exception\n");  		}  	}  } | 
