Merge remote-tracking branch 'mjb/altoslib_mjb'

1 files changed, 1 insertions, 49 deletions

diff --git a/altoslib/AltosEepromMegaIterable.java b/altoslib/AltosEepromMegaIterable.java
index f62cc45b..1ab2fcc8 100644
--- a/altoslib/AltosEepromMegaIterable.java
+++ b/altoslib/AltosEepromMegaIterable.java
@@ -20,52 +20,6 @@ package org.altusmetrum.AltosLib;
 import java.io.*;
 import java.util.*;
 import java.text.*;
-import java.util.prefs.*;
-import java.util.concurrent.LinkedBlockingQueue;
-
-/*
- * 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 {
 
@@ -285,7 +239,7 @@ public class AltosEepromMegaIterable extends AltosRecordIterable {
 		Iterator<AltosOrderedMegaRecord>	iterator = records.iterator();
 		AltosOrderedMegaRecord		record = null;
 		AltosRecordMM			state = new AltosRecordMM();
-		boolean				last_reported = false;
+		//boolean				last_reported = false;
 		EepromState			eeprom = new EepromState();
 
 		state.state = AltosLib.ao_flight_pad;
@@ -452,8 +406,6 @@ public class AltosEepromMegaIterable extends AltosRecordIterable {
 				if (line == null)
 					break;
 				AltosOrderedMegaRecord record = new AltosOrderedMegaRecord(line, index++, prev_tick, prev_tick_valid);
-				if (record == null)
-					break;
 				if (record.cmd == AltosLib.AO_LOG_INVALID)
 					continue;
 				prev_tick = record.tick;