move a file back

24 files changed, 42 insertions, 44 deletions

diff --git a/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosFontListener.java b/altosui/AltosFontListener.java
index 0dda0f29..6fc214bc 100644
--- a/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosFontListener.java
+++ b/altosui/AltosFontListener.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package altosui;
+package org.altusmetrum.AltosLib;
 
 public interface AltosFontListener {
 	void font_size_changed(int font_size);
diff --git a/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosCRCException.java b/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosCRCException.java
index 4a529bcf..101c5363 100644
--- a/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosCRCException.java
+++ b/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosCRCException.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package altosui;
+package org.altusmetrum.AltosLib;
 
 public class AltosCRCException extends Exception {
 	public int rssi;
diff --git a/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosConvert.java b/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosConvert.java
index df41a522..6773ab7e 100644
--- a/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosConvert.java
+++ b/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosConvert.java
@@ -18,7 +18,7 @@
 /*
  * Sensor data conversion functions
  */
-package altosui;
+package org.altusmetrum.AltosLib;
 
 public class AltosConvert {
 	/*
diff --git a/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosFrequency.java b/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosFrequency.java
index b748e460..4c0c7baa 100644
--- a/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosFrequency.java
+++ b/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosFrequency.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package altosui;
+package org.altusmetrum.AltosLib;
 
 import java.awt.*;
 import java.awt.event.*;
diff --git a/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosGPS.java b/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosGPS.java
index b5df7c9a..8cc7aa69 100644
--- a/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosGPS.java
+++ b/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosGPS.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package altosui;
+package org.altusmetrum.AltosLib;
 
 import java.lang.*;
 import java.text.*;
diff --git a/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosGPSSat.java b/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosGPSSat.java
index fb125651..5fa8f987 100644
--- a/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosGPSSat.java
+++ b/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosGPSSat.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package altosui;
+package org.altusmetrum.AltosLib;
 
 public class AltosGPSSat {
 	int	svid;
diff --git a/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosLine.java b/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosLine.java
index 86e9d4c6..5627795a 100644
--- a/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosLine.java
+++ b/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosLine.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package altosui;
+package org.altusmetrum.AltosLib;
 
 public class AltosLine {
 	public String	line;
diff --git a/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosParse.java b/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosParse.java
index fbfcaaee..4c0a59cb 100644
--- a/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosParse.java
+++ b/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosParse.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package altosui;
+package org.altusmetrum.AltosLib;
 
 import java.text.*;
 import java.lang.*;
@@ -27,7 +27,7 @@ public class AltosParse {
 
 	static int parse_int(String v) throws ParseException {
 		try {
-			return Altos.fromdec(v);
+			return AltosLib.fromdec(v);
 		} catch (NumberFormatException e) {
 			throw new ParseException("error parsing int " + v, 0);
 		}
@@ -35,7 +35,7 @@ public class AltosParse {
 
 	static int parse_hex(String v) throws ParseException {
 		try {
-			return Altos.fromhex(v);
+			return AltosLib.fromhex(v);
 		} catch (NumberFormatException e) {
 			throw new ParseException("error parsing hex " + v, 0);
 		}
diff --git a/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosRecord.java b/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosRecord.java
index 4643d69a..120004a7 100644
--- a/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosRecord.java
+++ b/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosRecord.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package altosui;
+package org.altusmetrum.AltosLib;
 
 import java.lang.*;
 import java.text.*;
@@ -229,7 +229,7 @@ public class AltosRecord implements Comparable <AltosRecord> {
 	}
 
 	public String state() {
-		return Altos.state_name(state);
+		return AltosLib.state_name(state);
 	}
 
 	public static String gets(FileInputStream s) throws IOException {
@@ -292,7 +292,7 @@ public class AltosRecord implements Comparable <AltosRecord> {
 		flight = 0;
 		rssi = 0;
 		status = 0;
-		state = Altos.ao_flight_startup;
+		state = AltosLib.ao_flight_startup;
 		tick = 0;
 		accel = MISSING;
 		pres = MISSING;
diff --git a/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosRecordCompanion.java b/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosRecordCompanion.java
index 0a8f9f4b..4f8e80dc 100644
--- a/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosRecordCompanion.java
+++ b/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosRecordCompanion.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package altosui;
+package org.altusmetrum.AltosLib;
 
 public class AltosRecordCompanion {
 	final static int	board_id_telescience = 0x0a;
diff --git a/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosRecordIterable.java b/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosRecordIterable.java
index 45843b92..abe67aaa 100644
--- a/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosRecordIterable.java
+++ b/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosRecordIterable.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package altosui;
+package org.altusmetrum.AltosLib;
 
 import java.awt.*;
 import java.awt.event.*;
diff --git a/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetry.java b/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetry.java
index 0052ef04..04abb1f3 100644
--- a/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetry.java
+++ b/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetry.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package altosui;
+package org.altusmetrum.AltosLib;
 
 import java.lang.*;
 import java.text.*;
diff --git a/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryIterable.java b/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryIterable.java
index a1b25332..f4b4029f 100644
--- a/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryIterable.java
+++ b/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryIterable.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package altosui;
+package org.altusmetrum.AltosLib;
 
 import java.io.*;
 import java.util.*;
@@ -62,7 +62,7 @@ public class AltosTelemetryIterable extends AltosRecordIterable {
 						current_tick = tick;
 						record.tick = current_tick;
 					}
-					if (!saw_boost && record.state >= Altos.ao_flight_boost)
+					if (!saw_boost && record.state >= AltosLib.ao_flight_boost)
 					{
 						saw_boost = true;
 						boost_tick = record.tick;
diff --git a/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryMap.java b/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryMap.java
index d906100f..003cb6a9 100644
--- a/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryMap.java
+++ b/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryMap.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package altosui;
+package org.altusmetrum.AltosLib;
 import java.lang.*;
 import java.text.*;
 import java.util.HashMap;
diff --git a/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryReader.java b/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryReader.java
index dde60dc9..bd94ee36 100644
--- a/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryReader.java
+++ b/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryReader.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package altosui;
+package org.altusmetrum.AltosLib;
 
 import java.lang.*;
 import java.text.*;
diff --git a/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryRecord.java b/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryRecord.java
index 2e6b5ead..367c148d 100644
--- a/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryRecord.java
+++ b/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryRecord.java
@@ -15,9 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package altosui;
-import java.lang.*;
-import java.text.*;
+package org.altusmetrum.AltosLib;
 
 public abstract class AltosTelemetryRecord {
 
diff --git a/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryRecordCompanion.java b/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryRecordCompanion.java
index 52d7f4cf..6ad17244 100644
--- a/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryRecordCompanion.java
+++ b/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryRecordCompanion.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package altosui;
+package org.altusmetrum.AltosLib;
 
 public class AltosTelemetryRecordCompanion extends AltosTelemetryRecordRaw {
 
diff --git a/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryRecordConfiguration.java b/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryRecordConfiguration.java
index b029d120..25242edc 100644
--- a/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryRecordConfiguration.java
+++ b/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryRecordConfiguration.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package altosui;
+package org.altusmetrum.AltosLib;
 
 
 public class AltosTelemetryRecordConfiguration extends AltosTelemetryRecordRaw {
diff --git a/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryRecordGeneral.java b/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryRecordGeneral.java
index 722baba3..5e157a54 100644
--- a/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryRecordGeneral.java
+++ b/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryRecordGeneral.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package altosui;
+package org.altusmetrum.AltosLib;
 
 import java.lang.*;
 import java.text.*;
diff --git a/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryRecordLegacy.java b/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryRecordLegacy.java
index a72ebb0f..8e3713cc 100644
--- a/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryRecordLegacy.java
+++ b/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryRecordLegacy.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package altosui;
+package org.altusmetrum.AltosLib;
 
 import java.lang.*;
 import java.text.*;
@@ -395,22 +395,22 @@ public class AltosTelemetryRecordLegacy extends AltosTelemetryRecord {
 	int	adjust;
 
 	private int int8(int i) {
-		return Altos.int8(bytes, i + 1 + adjust);
+		return AltosLib.int8(bytes, i + 1 + adjust);
 	}
 	private int uint8(int i) {
-		return Altos.uint8(bytes, i + 1 + adjust);
+		return AltosLib.uint8(bytes, i + 1 + adjust);
 	}
 	private int int16(int i) {
-		return Altos.int16(bytes, i + 1 + adjust);
+		return AltosLib.int16(bytes, i + 1 + adjust);
 	}
 	private int uint16(int i) {
-		return Altos.uint16(bytes, i + 1 + adjust);
+		return AltosLib.uint16(bytes, i + 1 + adjust);
 	}
 	private int uint32(int i) {
-		return Altos.uint32(bytes, i + 1 + adjust);
+		return AltosLib.uint32(bytes, i + 1 + adjust);
 	}
 	private String string(int i, int l) {
-		return Altos.string(bytes, i + 1 + adjust, l);
+		return AltosLib.string(bytes, i + 1 + adjust, l);
 	}
 
 	static final int AO_GPS_NUM_SAT_MASK	= (0xf << 0);
@@ -428,7 +428,7 @@ public class AltosTelemetryRecordLegacy extends AltosTelemetryRecord {
 		record.version = 4;
 		adjust = 0;
 
-		if (bytes.length == Altos.ao_telemetry_0_8_len + 4) {
+		if (bytes.length == AltosLib.ao_telemetry_0_8_len + 4) {
 			record.serial = uint8(0);
 			adjust = -1;
 		} else
diff --git a/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryRecordLocation.java b/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryRecordLocation.java
index 80db454d..cddb773d 100644
--- a/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryRecordLocation.java
+++ b/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryRecordLocation.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package altosui;
+package org.altusmetrum.AltosLib;
 
 
 public class AltosTelemetryRecordLocation extends AltosTelemetryRecordRaw {
diff --git a/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryRecordRaw.java b/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryRecordRaw.java
index 08c85e85..43d0f17a 100644
--- a/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryRecordRaw.java
+++ b/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryRecordRaw.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package altosui;
+package org.altusmetrum.AltosLib;
 
 import java.lang.*;
 import java.text.*;
@@ -30,27 +30,27 @@ public class AltosTelemetryRecordRaw extends AltosTelemetryRecord {
 	long	received_time;
 
 	public int int8(int off) {
-		return Altos.int8(bytes, off + 1);
+		return AltosLib.int8(bytes, off + 1);
 	}
 
 	public int uint8(int off) {
-		return Altos.uint8(bytes, off + 1);
+		return AltosLib.uint8(bytes, off + 1);
 	}
 
 	public int int16(int off) {
-		return Altos.int16(bytes, off + 1);
+		return AltosLib.int16(bytes, off + 1);
 	}
 
 	public int uint16(int off) {
-		return Altos.uint16(bytes, off + 1);
+		return AltosLib.uint16(bytes, off + 1);
 	}
 
 	public int uint32(int off) {
-		return Altos.uint32(bytes, off + 1);
+		return AltosLib.uint32(bytes, off + 1);
 	}
 
 	public String string(int off, int l) {
-		return Altos.string(bytes, off + 1, l);
+		return AltosLib.string(bytes, off + 1, l);
 	}
 
 	public AltosTelemetryRecordRaw(int[] in_bytes) {
diff --git a/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryRecordSatellite.java b/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryRecordSatellite.java
index 2dd782ad..2526afb6 100644
--- a/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryRecordSatellite.java
+++ b/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryRecordSatellite.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package altosui;
+package org.altusmetrum.AltosLib;
 
 public class AltosTelemetryRecordSatellite extends AltosTelemetryRecordRaw {
 	int		channels;
diff --git a/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryRecordSensor.java b/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryRecordSensor.java
index 96fee81f..cfaf90b0 100644
--- a/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryRecordSensor.java
+++ b/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryRecordSensor.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package altosui;
+package org.altusmetrum.AltosLib;
 
 
 public class AltosTelemetryRecordSensor extends AltosTelemetryRecordRaw {