altoslib: move distinct classes to separate files.

Signed-off-by: Mike Beattie <mike@ethernal.org>

4 files changed, 127 insertions, 86 deletions

diff --git a/altoslib/AltosEepromIterable.java b/altoslib/AltosEepromIterable.java
index 7c752271..1aa816e1 100644
--- a/altoslib/AltosEepromIterable.java
+++ b/altoslib/AltosEepromIterable.java
@@ -21,48 +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 AltosOrderedRecord extends AltosEepromRecord implements Comparable<AltosOrderedRecord> {
-
-	public int	index;
-
-	public AltosOrderedRecord(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 AltosOrderedRecord(int in_cmd, int in_tick, int in_a, int in_b, int in_index) {
-		super(in_cmd, in_tick, in_a, in_b);
-		index = in_index;
-	}
-
-	public String toString() {
-		return String.format("%d.%d %04x %04x %04x",
-				     cmd, index, tick, a, b);
-	}
-
-	public int compareTo(AltosOrderedRecord o) {
-		int	tick_diff = tick - o.tick;
-		if (tick_diff != 0)
-			return tick_diff;
-		return index - o.index;
-	}
-}
-
 public class AltosEepromIterable extends AltosRecordIterable {
 
 	static final int	seen_flight = 1;
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;
diff --git a/altoslib/AltosOrderedMegaRecord.java b/altoslib/AltosOrderedMegaRecord.java
new file mode 100644
index 00000000..05423dd9
--- /dev/null
+++ b/altoslib/AltosOrderedMegaRecord.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright © 2010 Keith Packard <keithp@keithp.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ */
+
+package org.altusmetrum.AltosLib;
+
+import java.text.ParseException;
+
+/*
+ * 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;
+	}
+}
diff --git a/altoslib/AltosOrderedRecord.java b/altoslib/AltosOrderedRecord.java
new file mode 100644
index 00000000..b4cfd8f2
--- /dev/null
+++ b/altoslib/AltosOrderedRecord.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright © 2010 Keith Packard <keithp@keithp.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ */
+
+package org.altusmetrum.AltosLib;
+
+import java.text.ParseException;
+
+/*
+ * AltosRecords with an index field so they can be sorted by tick while preserving
+ * the original ordering for elements with matching ticks
+ */
+class AltosOrderedRecord extends AltosEepromRecord implements Comparable<AltosOrderedRecord> {
+
+	public int	index;
+
+	public AltosOrderedRecord(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 AltosOrderedRecord(int in_cmd, int in_tick, int in_a, int in_b, int in_index) {
+		super(in_cmd, in_tick, in_a, in_b);
+		index = in_index;
+	}
+
+	public String toString() {
+		return String.format("%d.%d %04x %04x %04x",
+				     cmd, index, tick, a, b);
+	}
+
+	public int compareTo(AltosOrderedRecord o) {
+		int	tick_diff = tick - o.tick;
+		if (tick_diff != 0)
+			return tick_diff;
+		return index - o.index;
+	}
+}
+