altoslib: Remove spurious semicolon in AltosReplayReader.java

[fw/altos] / altoslib / AltosEepromRecord.java

diff --git a/altoslib/AltosEepromRecord.java b/altoslib/AltosEepromRecord.java
index 7a0cc8f92ac4be3d89d3b21e43fbc248450f0a3e..12519e6b91c1b47beff90c731765e9646c4b9ec1 100644 (file)
--- a/altoslib/AltosEepromRecord.java
+++ b/altoslib/AltosEepromRecord.java
@@ -12,11 +12,11 @@
  * General Public License for more details.
  */
 
-package org.altusmetrum.altoslib_11;
+package org.altusmetrum.altoslib_12;
 
 public abstract class AltosEepromRecord implements Comparable<AltosEepromRecord> {
 
-       AltosEepromNew          eeprom;
+       AltosEeprom             eeprom;
 
        int                     wide_tick;
 
@@ -74,7 +74,7 @@ public abstract class AltosEepromRecord implements Comparable<AltosEepromRecord>
                if (cmd_diff != 0)
                        return cmd_diff;
 
-               int     tick_diff = tick() - o.tick();
+               int     tick_diff = wide_tick - o.wide_tick;
 
                if (tick_diff != 0)
                        return tick_diff;
@@ -83,18 +83,16 @@ public abstract class AltosEepromRecord implements Comparable<AltosEepromRecord>
 
        /* AltosDataProvider */
        public void provide_data(AltosDataListener listener, AltosCalData cal_data) {
-               cal_data.set_tick(tick());
+               listener.set_tick(tick());
                if (cmd() == AltosLib.AO_LOG_FLIGHT)
                        cal_data.set_boost_tick();
                listener.set_time(cal_data.time());
 
                /* Flush any pending GPS changes */
                if (!AltosLib.is_gps_cmd(cmd())) {
-                       AltosGPS gps = cal_data.temp_gps();
-                       if (gps != null) {
+                       AltosGPS gps = listener.temp_gps();
+                       if (gps != null)
                                listener.set_gps(gps);
-                               cal_data.reset_temp_gps();
-                       }
                }
        }
 
@@ -115,7 +113,7 @@ public abstract class AltosEepromRecord implements Comparable<AltosEepromRecord>
 
        public abstract AltosEepromRecord next();
 
-       public AltosEepromRecord(AltosEepromNew eeprom, int start, int length) {
+       public AltosEepromRecord(AltosEeprom eeprom, int start, int length) {
                this.eeprom = eeprom;
                this.start = start;
                this.length = length;