X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FAltosTelemetryIterable.java;h=a752e24e4bfd709125ab55ce5e53ebc927bcd70b;hp=ac42597d5935e7a7da957b95a7ef68883828d8ae;hb=da914cd72411af8c36af05b13c11b9093c8a378c;hpb=bd440afc2a6e37b74fffcf1b977e149485095316

diff --git a/altoslib/AltosTelemetryIterable.java b/altoslib/AltosTelemetryIterable.java
index ac42597d..a752e24e 100644
--- a/altoslib/AltosTelemetryIterable.java
+++ b/altoslib/AltosTelemetryIterable.java
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,7 +16,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_5;
+package org.altusmetrum.altoslib_11;
 
 import java.io.*;
 import java.util.*;
@@ -66,7 +67,7 @@ public class AltosTelemetryIterable implements Iterable<AltosTelemetry> {
 	int index;
 
 	public void add (AltosTelemetry telem) {
-		int	t = telem.tick;
+		int	t = telem.tick();
 		if (!telems.isEmpty()) {
 			while (t < tick - 1000)
 				t += 65536;
@@ -79,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");
 		}
 	}
 }