Merge branch 'branch-1.8' into debian

1 files changed, 0 insertions, 43 deletions

diff --git a/altoslib/AltosStateIterable.java b/altoslib/AltosStateIterable.java
deleted file mode 100644
index 5332aecd..00000000
--- a/altoslib/AltosStateIterable.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright © 2013 Keith Packard <keithp@keithp.com>
- *
- * 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; 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
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
- */
-
-package org.altusmetrum.altoslib_11;
-
-import java.io.*;
-import java.util.*;
-
-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);
-	}
-}