Switch from GPLv2 to GPLv2+

[fw/altos] / altoslib / AltosStateIterable.java

diff --git a/altoslib/AltosStateIterable.java b/altoslib/AltosStateIterable.java
index 6d63741947e715bb30ec2a8facf1e08a32e3e0e9..5332aecd04822a33cd25eb7ac93b522afd6eaee2 100644 (file)
--- 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_2;
+package org.altusmetrum.altoslib_11;
 
 import java.io.*;
 import java.util.*;
@@ -24,6 +25,19 @@ public abstract class AltosStateIterable implements Iterable<AltosState> {
 
        public void write_comments (PrintStream out) {
        }
-       
+
        public abstract void write(PrintStream out);
+
+       public static AltosStateIterable iterable(File file) {
+               FileInputStream in;
+               try {
+                       in = new FileInputStream(file);
+               } catch (Exception e) {
+                       return null;
+               }
+               if (file.getName().endsWith("telem"))
+                       return new AltosTelemetryFile(in);
+               else
+                       return new AltosEepromFile(in);
+       }
 }