Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos

[fw/altos] / altoslib / AltosEepromFile.java

diff --git a/altoslib/AltosEepromFile.java b/altoslib/AltosEepromFile.java
index 4606e78091946b84911fd0d0be7777c5b2800986..067f030218a3dd5ea140ff5b105e544f5d8ca4a3 100644 (file)
--- a/altoslib/AltosEepromFile.java
+++ b/altoslib/AltosEepromFile.java
@@ -16,20 +16,16 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_11;
+package org.altusmetrum.altoslib_12;
 
 import java.io.*;
 import java.util.*;
 import java.text.*;
 
-public class AltosEepromFile extends AltosStateIterable {
+public class AltosEepromFile implements AltosRecordSet {
 
        AltosEepromRecordSet    set;
 
-       public AltosConfigData config_data() {
-               return set.eeprom.config_data();
-       }
-
        public void write_comments(PrintStream out) {
        }
 
@@ -37,11 +33,19 @@ public class AltosEepromFile extends AltosStateIterable {
                out.printf("%s\n", set.eeprom.toString());
        }
 
-       public AltosEepromFile(Reader input) throws IOException {
+       public AltosEepromFile(InputStream input) throws IOException {
                set = new AltosEepromRecordSet(input);
        }
 
-       public Iterator<AltosState> iterator() {
-               return set.iterator();
+       public AltosConfigData config_data() {
+               return set.config_data();
+       }
+
+       public AltosCalData cal_data() {
+               return set.cal_data();
+       }
+
+       public void capture_series(AltosDataListener series) {
+               set.capture_series(series);
        }
 }