java: Bump java library versions for next release

[fw/altos] / altoslib / AltosEepromIterable.java

diff --git a/altoslib/AltosEepromIterable.java b/altoslib/AltosEepromIterable.java
index fc793579f41837469a54c8924a6b85025d9c23e9..dd0afd9f1501bd347683f5cd10871e78a12669f8 100644 (file)
--- a/altoslib/AltosEepromIterable.java
+++ b/altoslib/AltosEepromIterable.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_2;
+package org.altusmetrum.altoslib_5;
 
 import java.io.*;
 import java.util.*;
@@ -38,6 +38,13 @@ class AltosEepromOrdered implements Comparable<AltosEepromOrdered> {
                if (cmd_diff != 0)
                        return cmd_diff;
 
+               if (eeprom.has_seconds() && o.eeprom.has_seconds()) {
+                       int     seconds_diff = eeprom.seconds() - o.eeprom.seconds();
+
+                       if (seconds_diff != 0)
+                               return seconds_diff;
+               }
+
                int     tick_diff = tick - o.tick;
 
                if (tick_diff != 0)
@@ -116,4 +123,4 @@ public class AltosEepromIterable implements Iterable<AltosEeprom> {
                        eeproms = new LinkedList<AltosEeprom>();
                return new AltosEepromOrderedIterator(eeproms);
        }
-}
\ No newline at end of file
+}