X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FAltosStateIterable.java;h=ec3d944d92843f90dd35852a62c8fb2997976629;hp=6202f9705613f189391cdf329424bb876f3b5d05;hb=fd738d47bbc46d36698350d5450abe1125d990a3;hpb=cb23b992be8ba40c97d8988c134a814a13ccd58c

diff --git a/altoslib/AltosStateIterable.java b/altoslib/AltosStateIterable.java
index 6202f970..ec3d944d 100644
--- a/altoslib/AltosStateIterable.java
+++ b/altoslib/AltosStateIterable.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_7;
+package org.altusmetrum.altoslib_11;
 
 import java.io.*;
 import java.util.*;
@@ -28,16 +29,13 @@ public abstract class AltosStateIterable implements Iterable<AltosState> {
 	public abstract void write(PrintStream out);
 
 	public static AltosStateIterable iterable(File file) {
-		FileInputStream in;
 		try {
-			in = new FileInputStream(file);
+			if (file.getName().endsWith("telem"))
+				return new AltosTelemetryFile(new FileInputStream(file));
+			else
+				return new AltosEepromFile(new FileReader(file));
 		} catch (Exception e) {
-			System.out.printf("Failed to open file '%s'\n", file);
 			return null;
 		}
-		if (file.getName().endsWith("telem"))
-			return new AltosTelemetryFile(in);
-		else
-			return new AltosEepromFile(in);
 	}
 }