diff options
author | Mike Beattie <mike@ethernal.org> | 2012-09-07 18:19:43 +1200 |
---|---|---|
committer | Mike Beattie <mike@ethernal.org> | 2012-09-07 18:19:43 +1200 |
commit | 3fe932206f40f4d6f83a4ef49e064109a7a3de92 (patch) | |
tree | bfd963db88656f94412d400efe344bf0c0e6e53d /altoslib/AltosEepromMegaIterable.java | |
parent | da053875c12b25b627e83430c3a956a994b435d5 (diff) |
altoslib: move distinct classes to separate files.
Signed-off-by: Mike Beattie <mike@ethernal.org>
Diffstat (limited to 'altoslib/AltosEepromMegaIterable.java')
-rw-r--r-- | altoslib/AltosEepromMegaIterable.java | 44 |
1 files changed, 0 insertions, 44 deletions
diff --git a/altoslib/AltosEepromMegaIterable.java b/altoslib/AltosEepromMegaIterable.java index f0786e12..1ab2fcc8 100644 --- a/altoslib/AltosEepromMegaIterable.java +++ b/altoslib/AltosEepromMegaIterable.java @@ -21,50 +21,6 @@ import java.io.*; import java.util.*; import java.text.*; -/* - * AltosRecords with an index field so they can be sorted by tick while preserving - * the original ordering for elements with matching ticks - */ -class AltosOrderedMegaRecord extends AltosEepromMega implements Comparable<AltosOrderedMegaRecord> { - - public int index; - - public AltosOrderedMegaRecord(String line, int in_index, int prev_tick, boolean prev_tick_valid) - throws ParseException { - super(line); - if (prev_tick_valid) { - tick |= (prev_tick & ~0xffff); - if (tick < prev_tick) { - if (prev_tick - tick > 0x8000) - tick += 0x10000; - } else { - if (tick - prev_tick > 0x8000) - tick -= 0x10000; - } - } - index = in_index; - } - - public AltosOrderedMegaRecord(int in_cmd, int in_tick, int in_a, int in_b, int in_index) { - super(in_cmd, in_tick); - a = in_a; - b = in_b; - index = in_index; - } - - public String toString() { - return String.format("%d.%d %04x %04x %04x", - cmd, index, tick, a, b); - } - - public int compareTo(AltosOrderedMegaRecord o) { - int tick_diff = tick - o.tick; - if (tick_diff != 0) - return tick_diff; - return index - o.index; - } -} - public class AltosEepromMegaIterable extends AltosRecordIterable { static final int seen_flight = 1; |