altoslib: Create data file open helper in AltosLib

[fw/altos] / altoslib / AltosEepromFile.java

diff --git a/altoslib/AltosEepromFile.java b/altoslib/AltosEepromFile.java
index 48d2543c30375e2a0e28f98b9ef63509b9de8631..463948b11b20e769510b296994a2e0dbd3afc58f 100644 (file)
--- a/altoslib/AltosEepromFile.java
+++ b/altoslib/AltosEepromFile.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,37 +16,36 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_1;
+package org.altusmetrum.altoslib_11;
 
 import java.io.*;
 import java.util.*;
 import java.text.*;
 
-public class AltosEepromFile {
+public class AltosEepromFile implements AltosRecordSet {
 
-       AltosEepromIterable     headers;
-       AltosEepromIterable     body;
+       AltosEepromRecordSet    set;
+
+       public void write_comments(PrintStream out) {
+       }
 
        public void write(PrintStream out) {
-               headers.write(out);
-               body.write(out);
+               out.printf("%s\n", set.eeprom.toString());
+       }
+
+       public AltosEepromFile(InputStream input) throws IOException {
+               set = new AltosEepromRecordSet(input);
+       }
+
+       public AltosConfigData config_data() {
+               return set.config_data();
+       }
+
+       public AltosCalData cal_data() {
+               return set.cal_data();
        }
 
-       public AltosEepromFile(FileInputStream input) {
-               headers = new AltosEepromIterable(AltosEepromHeader.read(input));
-
-               AltosState      state = headers.state();
-
-               switch (state.log_format) {
-               case AltosLib.AO_LOG_FORMAT_FULL:
-               case AltosLib.AO_LOG_FORMAT_TINY:
-               case AltosLib.AO_LOG_FORMAT_TELEMETRY:
-               case AltosLib.AO_LOG_FORMAT_TELESCIENCE:
-               case AltosLib.AO_LOG_FORMAT_TELEMEGA:
-                       break;
-               case AltosLib.AO_LOG_FORMAT_MINI:
-                       body = new AltosEepromIterable(AltosEepromMini.read(input));
-                       break;
-               }
+       public void capture_series(AltosDataListener series) {
+               set.capture_series(series);
        }
-}
\ No newline at end of file
+}