altoslib/altosuilib: Change versions to altoslib:4, altosuilib:2

API has changed for these libraries, time to bump the file versions

Signed-off-by: Keith Packard <keithp@keithp.com>

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosBluetooth.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosBluetooth.java
index 634769ccff6e7e94fc5de49ce665a735e113ec11..1b4d45ed3e66536eabac8b1ca25633fa6d1a4be3 100644 (file)
--- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosBluetooth.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosBluetooth.java
@@ -31,7 +31,7 @@ import android.os.Handler;
 //import android.os.Message;
 import android.util.Log;
 
 //import android.os.Message;
 import android.util.Log;
 

-import org.altusmetrum.altoslib_3.*;
+import org.altusmetrum.altoslib_4.*;

 
 public class AltosBluetooth extends AltosLink {
 
 
 public class AltosBluetooth extends AltosLink {
 

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
index 9125d56bfa6ceed6843491b8181f91889dacb712..f61baf1e411a933518bc1cf245f20ddd8673511d 100644 (file)
--- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
@@ -49,7 +49,7 @@ import android.widget.Toast;
 import android.app.AlertDialog;
 import android.location.Location;
 
 import android.app.AlertDialog;
 import android.location.Location;
 

-import org.altusmetrum.altoslib_3.*;
+import org.altusmetrum.altoslib_4.*;

 
 public class AltosDroid extends FragmentActivity {
        // Debugging
 
 public class AltosDroid extends FragmentActivity {
        // Debugging

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidPreferences.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidPreferences.java
index 067cb6208a014ce745feb1e556ac6abf4e1624de..f6e6881de3df550b08eb29832541af0ae8fc37e0 100644 (file)
--- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidPreferences.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidPreferences.java
@@ -23,7 +23,7 @@ import android.content.Context;
 import android.content.SharedPreferences;
 import android.os.Environment;
 
 import android.content.SharedPreferences;
 import android.os.Environment;
 

-import org.altusmetrum.altoslib_3.*;
+import org.altusmetrum.altoslib_4.*;

 
 public class AltosDroidPreferences implements AltosPreferencesBackend {
        public final static String        NAME    = "org.altusmetrum.AltosDroid";
 
 public class AltosDroidPreferences implements AltosPreferencesBackend {
        public final static String        NAME    = "org.altusmetrum.AltosDroid";

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidTab.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidTab.java
index 9d155385db3f61fee18fca876923e500d9518744..fac4b8d4530027de625ccd39430828b6d940d1ab 100644 (file)
--- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidTab.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidTab.java
@@ -17,7 +17,7 @@
 
 package org.altusmetrum.AltosDroid;
 
 
 package org.altusmetrum.AltosDroid;
 

-import org.altusmetrum.altoslib_3.*;
+import org.altusmetrum.altoslib_4.*;

 import android.location.Location;
 
 public interface AltosDroidTab {
 import android.location.Location;
 
 public interface AltosDroidTab {

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosVoice.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosVoice.java
index b50cab2232254e8f4d68aff83d233b16a685e492..77d4ba382d0e63882ac79e2c750a3feaa5e3f7b5 100644 (file)
--- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosVoice.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosVoice.java
@@ -21,7 +21,7 @@ package org.altusmetrum.AltosDroid;
 import android.speech.tts.TextToSpeech;
 import android.speech.tts.TextToSpeech.OnInitListener;
 
 import android.speech.tts.TextToSpeech;
 import android.speech.tts.TextToSpeech.OnInitListener;
 

-import org.altusmetrum.altoslib_3.*;
+import org.altusmetrum.altoslib_4.*;

 
 public class AltosVoice {
 
 
 public class AltosVoice {
 

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TabAscent.java b/altosdroid/src/org/altusmetrum/AltosDroid/TabAscent.java
index edfd82458f1392cee616a26303f1e05128a472c4..e4a815eb6f929f57b218a2988da17fe25dc76215 100644 (file)
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TabAscent.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TabAscent.java
@@ -17,7 +17,7 @@
 
 package org.altusmetrum.AltosDroid;
 
 
 package org.altusmetrum.AltosDroid;
 

-import org.altusmetrum.altoslib_3.*;
+import org.altusmetrum.altoslib_4.*;

 
 import android.app.Activity;
 import android.os.Bundle;
 
 import android.app.Activity;
 import android.os.Bundle;

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TabDescent.java b/altosdroid/src/org/altusmetrum/AltosDroid/TabDescent.java
index cc070b0d1192dbfa14532b18bd72d4c77d09587c..cbbe4d4473ab9bc62f09c201d0248e008def6737 100644 (file)
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TabDescent.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TabDescent.java
@@ -17,7 +17,7 @@
 
 package org.altusmetrum.AltosDroid;
 
 
 package org.altusmetrum.AltosDroid;
 

-import org.altusmetrum.altoslib_3.*;
+import org.altusmetrum.altoslib_4.*;

 
 import android.app.Activity;
 import android.os.Bundle;
 
 import android.app.Activity;
 import android.os.Bundle;

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TabLanded.java b/altosdroid/src/org/altusmetrum/AltosDroid/TabLanded.java
index 5a70397825a47a969f391bd45c51e924bcc73ecf..b2e6fd2016a87877cca3d12fa973804239f7f8d8 100644 (file)
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TabLanded.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TabLanded.java
@@ -17,7 +17,7 @@
 
 package org.altusmetrum.AltosDroid;
 
 
 package org.altusmetrum.AltosDroid;
 

-import org.altusmetrum.altoslib_3.*;
+import org.altusmetrum.altoslib_4.*;

 
 import android.app.Activity;
 import android.os.Bundle;
 
 import android.app.Activity;
 import android.os.Bundle;

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java b/altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java
index 5fe88f51c3a0c39818258b833e9ab7f2083e410f..38922771f73f097e4938ccbddca1423ceca4a2a8 100644 (file)
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java
@@ -19,7 +19,7 @@ package org.altusmetrum.AltosDroid;
 
 import java.util.Arrays;
 
 
 import java.util.Arrays;
 

-import org.altusmetrum.altoslib_3.*;
+import org.altusmetrum.altoslib_4.*;

 
 import com.google.android.gms.maps.CameraUpdateFactory;
 import com.google.android.gms.maps.GoogleMap;
 
 import com.google.android.gms.maps.CameraUpdateFactory;
 import com.google.android.gms.maps.GoogleMap;

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TabPad.java b/altosdroid/src/org/altusmetrum/AltosDroid/TabPad.java
index 3f0a188703c0eda6cdbd6ec6f678e78623bec5b6..10bb3bd9c0eae7c57dcb2269145973dfff796d2f 100644 (file)
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TabPad.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TabPad.java
@@ -17,7 +17,7 @@
 
 package org.altusmetrum.AltosDroid;
 
 
 package org.altusmetrum.AltosDroid;
 

-import org.altusmetrum.altoslib_3.*;
+import org.altusmetrum.altoslib_4.*;

 
 import android.app.Activity;
 import android.os.Bundle;
 
 import android.app.Activity;
 import android.os.Bundle;

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryLogger.java b/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryLogger.java
index c8c61838989d59ae48d85c31de93c481eb1accb6..4215a3303df0d757a8b14ca80ee016f6654a2094 100644 (file)
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryLogger.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryLogger.java
@@ -1,6 +1,6 @@
 package org.altusmetrum.AltosDroid;
 
 package org.altusmetrum.AltosDroid;
 

-import org.altusmetrum.altoslib_3.*;
+import org.altusmetrum.altoslib_4.*;

 
 import android.content.BroadcastReceiver;
 import android.content.Context;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryReader.java b/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryReader.java
index 2a2cc4040de33ead81269752adbd99716a559e4a..5bc4b90dd9e417ec4901611e9b2b0b10ea968ac4 100644 (file)
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryReader.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryReader.java
@@ -25,7 +25,7 @@ import java.util.concurrent.*;
 import android.util.Log;
 import android.os.Handler;
 
 import android.util.Log;
 import android.os.Handler;
 

-import org.altusmetrum.altoslib_3.*;
+import org.altusmetrum.altoslib_4.*;

 
 
 public class TelemetryReader extends Thread {
 
 
 public class TelemetryReader extends Thread {

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java b/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java
index 96cedad81aeca07e0bce56db0c1c8e014514daac..da5e044f0abc5b122416b996c4c81149ccb07c11 100644 (file)
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java
@@ -44,7 +44,7 @@ import android.location.LocationManager;
 import android.location.LocationListener;
 import android.location.Criteria;
 
 import android.location.LocationListener;
 import android.location.Criteria;
 

-import org.altusmetrum.altoslib_3.*;
+import org.altusmetrum.altoslib_4.*;

 
 
 public class TelemetryService extends Service implements LocationListener {
 
 
 public class TelemetryService extends Service implements LocationListener {

diff --git a/altoslib/AltosAccel.java b/altoslib/AltosAccel.java
index 43dc20bd3f0a33322603da70d0eb981151f0b4cd..3d340e5d2c32f7d31e1a11535cf9cdef0133f4be 100644 (file)
--- a/altoslib/AltosAccel.java
+++ b/altoslib/AltosAccel.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 

-package org.altusmetrum.altoslib_3;
+package org.altusmetrum.altoslib_4;

 
 public class AltosAccel extends AltosUnits {
 
 
 public class AltosAccel extends AltosUnits {
 

diff --git a/altoslib/AltosCRCException.java b/altoslib/AltosCRCException.java
index 949627317800c07aa46e2d9c8ed5636863034b72..253ca435dc83753330397a623639133ace8401b3 100644 (file)
--- a/altoslib/AltosCRCException.java
+++ b/altoslib/AltosCRCException.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 

-package org.altusmetrum.altoslib_3;
+package org.altusmetrum.altoslib_4;

 
 public class AltosCRCException extends Exception {
        public int rssi;
 
 public class AltosCRCException extends Exception {
        public int rssi;

diff --git a/altoslib/AltosCSV.java b/altoslib/AltosCSV.java
index 8176d21b4a21c038ff16f9cc2a23bdddd8be398b..27e1fade54c76bdb54b4cae8a3b16a6c66369edc 100644 (file)
--- a/altoslib/AltosCSV.java
+++ b/altoslib/AltosCSV.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 

-package org.altusmetrum.altoslib_3;
+package org.altusmetrum.altoslib_4;

 
 import java.io.*;
 import java.util.*;
 
 import java.io.*;
 import java.util.*;

diff --git a/altoslib/AltosCompanion.java b/altoslib/AltosCompanion.java
index 47ca328e5bcd9c70f5b8721b812cbcbcd9fd5966..09bfe9f3c7482e3a5238b27e7340be074ee1de63 100644 (file)
--- a/altoslib/AltosCompanion.java
+++ b/altoslib/AltosCompanion.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 

-package org.altusmetrum.altoslib_3;
+package org.altusmetrum.altoslib_4;

 
 public class AltosCompanion {
        public final static int board_id_telescience = 0x0a;
 
 public class AltosCompanion {
        public final static int board_id_telescience = 0x0a;

diff --git a/altoslib/AltosConfigData.java b/altoslib/AltosConfigData.java
index 213d8f1311b56f35bf66469a898dacd8bea4a4f4..e5c546ff69c84e5f576ec42dbce25678a23f5f4a 100644 (file)
--- a/altoslib/AltosConfigData.java
+++ b/altoslib/AltosConfigData.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 

-package org.altusmetrum.altoslib_3;
+package org.altusmetrum.altoslib_4;

 
 import java.util.*;
 import java.text.*;
 
 import java.util.*;
 import java.text.*;

diff --git a/altoslib/AltosConfigValues.java b/altoslib/AltosConfigValues.java
index 1a9fddbf4617254780c5b5a05cebb0972a4b4078..b7c0c6ed548052babface01c00b02589ad64aa3b 100644 (file)
--- a/altoslib/AltosConfigValues.java
+++ b/altoslib/AltosConfigValues.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 

-package org.altusmetrum.altoslib_3;
+package org.altusmetrum.altoslib_4;

 
 public interface AltosConfigValues {
        /* set and get all of the dialog values */
 
 public interface AltosConfigValues {
        /* set and get all of the dialog values */

diff --git a/altoslib/AltosConvert.java b/altoslib/AltosConvert.java
index 4ed45c6869a045c0b7df6025fd9cd1daa36751e6..484f621377f1f168cd0920d0f9e0d482c5c31bd2 100644 (file)
--- a/altoslib/AltosConvert.java
+++ b/altoslib/AltosConvert.java
@@ -18,7 +18,7 @@
 /*
  * Sensor data conversion functions
  */
 /*
  * Sensor data conversion functions
  */

-package org.altusmetrum.altoslib_3;
+package org.altusmetrum.altoslib_4;

 
 public class AltosConvert {
        /*
 
 public class AltosConvert {
        /*

diff --git a/altoslib/AltosDebug.java b/altoslib/AltosDebug.java
index 4dfb31e5ebf5860e85d9dbe542dcb91535c494f1..b0e52fc1c5855abfd1b41e9bd4209b6980dce92a 100644 (file)
--- a/altoslib/AltosDebug.java
+++ b/altoslib/AltosDebug.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 

-package org.altusmetrum.altoslib_3;
+package org.altusmetrum.altoslib_4;

 
 import java.io.*;
 
 
 import java.io.*;
 

diff --git a/altoslib/AltosDistance.java b/altoslib/AltosDistance.java
index 71ee81d7c9ee895d1fadc7b824feb38b29f8d093..76ca20c07521995323dc31690763956f052e2ced 100644 (file)
--- a/altoslib/AltosDistance.java
+++ b/altoslib/AltosDistance.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 

-package org.altusmetrum.altoslib_3;
+package org.altusmetrum.altoslib_4;

 
 public class AltosDistance extends AltosUnits {
 
 
 public class AltosDistance extends AltosUnits {
 

diff --git a/altoslib/AltosEeprom.java b/altoslib/AltosEeprom.java
index 57ee73adb87bfdb4b52dcf9402550c7b5c9611a6..be18ba24ec7ae83c20ca5c89043a73678658a9c4 100644 (file)
--- a/altoslib/AltosEeprom.java
+++ b/altoslib/AltosEeprom.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 

-package org.altusmetrum.altoslib_3;
+package org.altusmetrum.altoslib_4;

 
 import java.io.*;
 import java.util.*;
 
 import java.io.*;
 import java.util.*;

diff --git a/altoslib/AltosEepromChunk.java b/altoslib/AltosEepromChunk.java
index c884b6593af6eea75acbe7601b9f1f8be9bf3d66..32de96bc0b7c11ec7384db2aba40b9535320a432 100644 (file)
--- a/altoslib/AltosEepromChunk.java
+++ b/altoslib/AltosEepromChunk.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 

-package org.altusmetrum.altoslib_3;
+package org.altusmetrum.altoslib_4;

 
 import java.text.*;
 import java.util.concurrent.*;
 
 import java.text.*;
 import java.util.concurrent.*;

diff --git a/altoslib/AltosEepromDownload.java b/altoslib/AltosEepromDownload.java
index 163ffad93613ec32b2859667dbb9e3c41c7c7ff3..a2dfc438afcf76838b9c212a3c4ad34e48297124 100644 (file)
--- a/altoslib/AltosEepromDownload.java
+++ b/altoslib/AltosEepromDownload.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 

-package org.altusmetrum.altoslib_3;
+package org.altusmetrum.altoslib_4;

 
 import java.io.*;
 import java.util.*;
 
 import java.io.*;
 import java.util.*;

diff --git a/altoslib/AltosEepromFile.java b/altoslib/AltosEepromFile.java
index 91ffc223764d3a909d23ba7e10fc9020e3197e32..2a26c484ac7b3b24ab3cbe3df5e035f575afbbe6 100644 (file)
--- a/altoslib/AltosEepromFile.java
+++ b/altoslib/AltosEepromFile.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 

-package org.altusmetrum.altoslib_3;
+package org.altusmetrum.altoslib_4;

 
 import java.io.*;
 import java.util.*;
 
 import java.io.*;
 import java.util.*;

diff --git a/altoslib/AltosEepromHeader.java b/altoslib/AltosEepromHeader.java
index fe5bf6c36b8142a6472f1f31aa24085ae8114fb7..0d022f466afb505bc9620bacd6bb16d19025b80a 100644 (file)
--- a/altoslib/AltosEepromHeader.java
+++ b/altoslib/AltosEepromHeader.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 

-package org.altusmetrum.altoslib_3;
+package org.altusmetrum.altoslib_4;

 
 import java.io.*;
 import java.util.*;
 
 import java.io.*;
 import java.util.*;

diff --git a/altoslib/AltosEepromIterable.java b/altoslib/AltosEepromIterable.java
index 081721b3ecec0ac18a19dd76d69b1ab601171a85..415c5b62099d87e5a1ea2ce720aa364b5b3d1099 100644 (file)
--- a/altoslib/AltosEepromIterable.java
+++ b/altoslib/AltosEepromIterable.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 

-package org.altusmetrum.altoslib_3;
+package org.altusmetrum.altoslib_4;

 
 import java.io.*;
 import java.util.*;
 
 import java.io.*;
 import java.util.*;

diff --git a/altoslib/AltosEepromList.java b/altoslib/AltosEepromList.java
index a9dac13aaa9a67623c8d28e38c58793f7b642e11..ab853a884a89d000faafc41103720a23ad480970 100644 (file)
--- a/altoslib/AltosEepromList.java
+++ b/altoslib/AltosEepromList.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 

-package org.altusmetrum.altoslib_3;
+package org.altusmetrum.altoslib_4;

 
 import java.io.*;
 import java.util.*;
 
 import java.io.*;
 import java.util.*;

diff --git a/altoslib/AltosEepromLog.java b/altoslib/AltosEepromLog.java
index cc2982071432db8f0f987ba6f7f06466042850b1..1a430c03dd2273f3eb25af49055b7f7198453a4d 100644 (file)
--- a/altoslib/AltosEepromLog.java
+++ b/altoslib/AltosEepromLog.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 

-package org.altusmetrum.altoslib_3;
+package org.altusmetrum.altoslib_4;

 
 import java.text.*;
 import java.util.concurrent.*;
 
 import java.text.*;
 import java.util.concurrent.*;

diff --git a/altoslib/AltosEepromMega.java b/altoslib/AltosEepromMega.java
index f0d7097e990c58e60359fb3279e8a5187fa54375..71719a26477eb47db8a103790abe6f314ac2cfe8 100644 (file)
--- a/altoslib/AltosEepromMega.java
+++ b/altoslib/AltosEepromMega.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 

-package org.altusmetrum.altoslib_3;
+package org.altusmetrum.altoslib_4;

 
 import java.io.*;
 import java.util.*;
 
 import java.io.*;
 import java.util.*;

diff --git a/altoslib/AltosEepromMetrum2.java b/altoslib/AltosEepromMetrum2.java
index d13aac42863d5b2e8f8bdc718682d65c0ed95aa5..d137614a8949a30069d771d50260b7d8d921d6a1 100644 (file)
--- a/altoslib/AltosEepromMetrum2.java
+++ b/altoslib/AltosEepromMetrum2.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 

-package org.altusmetrum.altoslib_3;
+package org.altusmetrum.altoslib_4;

 
 import java.io.*;
 import java.util.*;
 
 import java.io.*;
 import java.util.*;

diff --git a/altoslib/AltosEepromMini.java b/altoslib/AltosEepromMini.java
index b308fbf4fb392510feb6e5f9d433c0b081962fc8..32985639e52b73729ce021c897f29029dfc874d9 100644 (file)
--- a/altoslib/AltosEepromMini.java
+++ b/altoslib/AltosEepromMini.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 

-package org.altusmetrum.altoslib_3;
+package org.altusmetrum.altoslib_4;

 
 import java.io.*;
 import java.util.*;
 
 import java.io.*;
 import java.util.*;

diff --git a/altoslib/AltosEepromMonitor.java b/altoslib/AltosEepromMonitor.java
index 9ab1a5ab103acd402e3f25cd4b5f8379ff20ba30..b97287c3b1801a1d69ce911f528c3f3b4e86e43d 100644 (file)
--- a/altoslib/AltosEepromMonitor.java
+++ b/altoslib/AltosEepromMonitor.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 

-package org.altusmetrum.altoslib_3;
+package org.altusmetrum.altoslib_4;

 
 public interface AltosEepromMonitor {
 
 
 public interface AltosEepromMonitor {
 

diff --git a/altoslib/AltosEepromTM.java b/altoslib/AltosEepromTM.java
index c8b1e60cb450d06151839a6d71019d8c87c3a04c..77fe20c5789d31eb99a5ce57d617b74a5e5f11ff 100644 (file)
--- a/altoslib/AltosEepromTM.java
+++ b/altoslib/AltosEepromTM.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 

-package org.altusmetrum.altoslib_3;
+package org.altusmetrum.altoslib_4;

 
 import java.io.*;
 import java.util.*;
 
 import java.io.*;
 import java.util.*;

diff --git a/altoslib/AltosEepromTm.java b/altoslib/AltosEepromTm.java
index 049dd340612568cb56f6002ae62740e0526a52b7..6cbb72535740d74a6fa31d573f5bb84a4f539402 100644 (file)
--- a/altoslib/AltosEepromTm.java
+++ b/altoslib/AltosEepromTm.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 

-package org.altusmetrum.altoslib_3;
+package org.altusmetrum.altoslib_4;

 
 import java.io.*;
 import java.util.*;
 
 import java.io.*;
 import java.util.*;

diff --git a/altoslib/AltosFile.java b/altoslib/AltosFile.java
index 79f6f1c6940c29bd0b485bd08b150e86b1b53798..2a7389960b08bb8604fabe0c4beb3e5ea3f347d9 100644 (file)
--- a/altoslib/AltosFile.java
+++ b/altoslib/AltosFile.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 

-package org.altusmetrum.altoslib_3;
+package org.altusmetrum.altoslib_4;

 
 import java.io.File;
 import java.util.*;
 
 import java.io.File;
 import java.util.*;

diff --git a/altoslib/AltosFlash.java b/altoslib/AltosFlash.java
index 25c76863b6b037de0fbd50605cc49caa607fb647..8e8722c2727dec1b343b5127fbb28ab57183c632 100644 (file)
--- a/altoslib/AltosFlash.java
+++ b/altoslib/AltosFlash.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 

-package org.altusmetrum.altoslib_3;
+package org.altusmetrum.altoslib_4;

 
 import java.io.*;
 
 
 import java.io.*;
 

diff --git a/altoslib/AltosFlashListener.java b/altoslib/AltosFlashListener.java
index b7fcd73bfae19b0b6a329a4897666b7a24adcc69..8bb86bba1c42aaf0a9d69c11f94503d51cca0f7b 100644 (file)
--- a/altoslib/AltosFlashListener.java
+++ b/altoslib/AltosFlashListener.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 

-package org.altusmetrum.altoslib_3;
+package org.altusmetrum.altoslib_4;

 
 public interface AltosFlashListener {
        public void position(String label, int percent);
 
 public interface AltosFlashListener {
        public void position(String label, int percent);

diff --git a/altoslib/AltosFlightReader.java b/altoslib/AltosFlightReader.java
index 86757e8272521a1b2e474e0a8c6b11027137678e..2fcd556ea6c5ad0e607b3a58df9d22390cb73c88 100644 (file)
--- a/altoslib/AltosFlightReader.java
+++ b/altoslib/AltosFlightReader.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 

-package org.altusmetrum.altoslib_3;
+package org.altusmetrum.altoslib_4;

 
 import java.text.*;
 import java.io.*;
 
 import java.text.*;
 import java.io.*;

diff --git a/altoslib/AltosFrequency.java b/altoslib/AltosFrequency.java
index 5770b646ae36a1f4175083534fc4e9743c4ef8a2..7c291ea9036b29f0169730c5bbb39525ec0b9adb 100644 (file)
--- a/altoslib/AltosFrequency.java
+++ b/altoslib/AltosFrequency.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 

-package org.altusmetrum.altoslib_3;
+package org.altusmetrum.altoslib_4;

 
 public class AltosFrequency {
        public double   frequency;
 
 public class AltosFrequency {
        public double   frequency;

diff --git a/altoslib/AltosGPS.java b/altoslib/AltosGPS.java
index 01e6fdbccf5575ba56ef838aeb3a8780163bd375..2708d026e840184a0013c8b632a26a1ffe7780db 100644 (file)
--- a/altoslib/AltosGPS.java
+++ b/altoslib/AltosGPS.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 

-package org.altusmetrum.altoslib_3;
+package org.altusmetrum.altoslib_4;

 
 import java.text.*;
 import java.util.concurrent.*;
 
 import java.text.*;
 import java.util.concurrent.*;

diff --git a/altoslib/AltosGPSSat.java b/altoslib/AltosGPSSat.java
index 76fa3a560015c304038f19de1b7fb31ec555569f..ef24d4974f844f0a055bf5d354a2dec6e293a30e 100644 (file)
--- a/altoslib/AltosGPSSat.java
+++ b/altoslib/AltosGPSSat.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 

-package org.altusmetrum.altoslib_3;
+package org.altusmetrum.altoslib_4;

 
 public class AltosGPSSat {
        public int      svid;
 
 public class AltosGPSSat {
        public int      svid;

diff --git a/altoslib/AltosGreatCircle.java b/altoslib/AltosGreatCircle.java
index b884a3bc210712fbe190f15727800d6309005628..39df4fc8cd01807d31eb8c999724690c525ab044 100644 (file)
--- a/altoslib/AltosGreatCircle.java
+++ b/altoslib/AltosGreatCircle.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 

-package org.altusmetrum.altoslib_3;
+package org.altusmetrum.altoslib_4;

 
 import java.lang.Math;
 
 
 import java.lang.Math;
 

diff --git a/altoslib/AltosHeight.java b/altoslib/AltosHeight.java
index a81897e7c4a533bcfabb47d0f32cfbf0c6a5303d..84981032a76e909e6af429b7ff32f72c72db6fdc 100644 (file)
--- a/altoslib/AltosHeight.java
+++ b/altoslib/AltosHeight.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 

-package org.altusmetrum.altoslib_3;
+package org.altusmetrum.altoslib_4;

 
 public class AltosHeight extends AltosUnits {
 
 
 public class AltosHeight extends AltosUnits {
 

diff --git a/altoslib/AltosHexfile.java b/altoslib/AltosHexfile.java
index 60f4ecdc5012f64f1b64d61c5fc18c0c06682203..d5fa8f5fe1c08b86e99649e09bec6895f5129dcf 100644 (file)
--- a/altoslib/AltosHexfile.java
+++ b/altoslib/AltosHexfile.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 

-package org.altusmetrum.altoslib_3;
+package org.altusmetrum.altoslib_4;

 
 import java.io.*;
 import java.util.LinkedList;
 
 import java.io.*;
 import java.util.LinkedList;

diff --git a/altoslib/AltosHexsym.java b/altoslib/AltosHexsym.java
index a98ef0fc13223eb161d759670871fee19dd3d9d6..403b5644b50d3bdb524a59cccefff2b286304448 100644 (file)
--- a/altoslib/AltosHexsym.java
+++ b/altoslib/AltosHexsym.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 

-package org.altusmetrum.altoslib_3;
+package org.altusmetrum.altoslib_4;

 
 public class AltosHexsym {
        String  name;
 
 public class AltosHexsym {
        String  name;

diff --git a/altoslib/AltosIMU.java b/altoslib/AltosIMU.java
index 99efb76f198f5d12f93af9e9ee8ae16028b69b4d..a22b3fed29290ca6e59f765734c581f388d1e55c 100644 (file)
--- a/altoslib/AltosIMU.java
+++ b/altoslib/AltosIMU.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 

-package org.altusmetrum.altoslib_3;
+package org.altusmetrum.altoslib_4;

 
 import java.util.concurrent.*;
 
 
 import java.util.concurrent.*;
 

diff --git a/altoslib/AltosIdle.java b/altoslib/AltosIdle.java
index c7b546b6c67e350592e689932e4ff69eb789fee1..55f6f5c9d834e5cfa5fa6a009da66c568060cf73 100644 (file)
--- a/altoslib/AltosIdle.java
+++ b/altoslib/AltosIdle.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 

-package org.altusmetrum.altoslib_3;
+package org.altusmetrum.altoslib_4;

 
 import java.io.*;
 import java.util.*;
 
 import java.io.*;
 import java.util.*;

diff --git a/altoslib/AltosIdleFetch.java b/altoslib/AltosIdleFetch.java
index b0e45797145973d7f786519f6a7faa90cbb62d98..5cd8bf367944907ebec648aa6dc3e99c35f4e582 100644 (file)
--- a/altoslib/AltosIdleFetch.java
+++ b/altoslib/AltosIdleFetch.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 

-package org.altusmetrum.altoslib_3;
+package org.altusmetrum.altoslib_4;

 
 import java.io.*;
 import java.util.*;
 
 import java.io.*;
 import java.util.*;

diff --git a/altoslib/AltosIdleMonitor.java b/altoslib/AltosIdleMonitor.java
index 8342f8a53d9da17ce3fc0f9cb29b16ba7fbf95fd..f81abdff0baac58d40094beb566b1a5a4ee23461 100644 (file)
--- a/altoslib/AltosIdleMonitor.java
+++ b/altoslib/AltosIdleMonitor.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 

-package org.altusmetrum.altoslib_3;
+package org.altusmetrum.altoslib_4;

 
 import java.io.*;
 import java.util.concurrent.*;
 
 import java.io.*;
 import java.util.concurrent.*;

diff --git a/altoslib/AltosIdleMonitorListener.java b/altoslib/AltosIdleMonitorListener.java
index dcaa77a6c8f21058f337a106667c74fe59a7a728..6a9abea24dea350540620a9160473f5eb49829f7 100644 (file)
--- a/altoslib/AltosIdleMonitorListener.java
+++ b/altoslib/AltosIdleMonitorListener.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 

-package org.altusmetrum.altoslib_3;
+package org.altusmetrum.altoslib_4;

 
 public interface AltosIdleMonitorListener {
        public void update(AltosState state, AltosListenerState listener_state);
 
 public interface AltosIdleMonitorListener {
        public void update(AltosState state, AltosListenerState listener_state);

diff --git a/altoslib/AltosIgnite.java b/altoslib/AltosIgnite.java
index 8ab47d1de49a9ba8c54e6327ca096addd5334563..c21f17ac2234da61d93ad414494180747aa4ea27 100644 (file)
--- a/altoslib/AltosIgnite.java
+++ b/altoslib/AltosIgnite.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 

-package org.altusmetrum.altoslib_3;
+package org.altusmetrum.altoslib_4;

 
 import java.util.*;
 import java.io.*;
 
 import java.util.*;
 import java.io.*;

diff --git a/altoslib/AltosKML.java b/altoslib/AltosKML.java
index cc9a9f51051b9339eefde74b40954053e62744a3..d55da9ef2d9474276178a4999d69dea1ad73b46f 100644 (file)
--- a/altoslib/AltosKML.java
+++ b/altoslib/AltosKML.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 

-package org.altusmetrum.altoslib_3;
+package org.altusmetrum.altoslib_4;

 
 import java.io.*;
 
 
 import java.io.*;
 

diff --git a/altoslib/AltosLib.java b/altoslib/AltosLib.java
index 3f25bc3199d8ec1d11ba0a9f2e27bf8eaae0dfcb..5e18202fae639b966e763ced7f47792bd1b32d91 100644 (file)
--- a/altoslib/AltosLib.java
+++ b/altoslib/AltosLib.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 

-package org.altusmetrum.altoslib_3;
+package org.altusmetrum.altoslib_4;

 
 import java.util.*;
 import java.io.*;
 
 import java.util.*;
 import java.io.*;

diff --git a/altoslib/AltosLine.java b/altoslib/AltosLine.java
index 9d796a896f38e8cb880c9b982e1b671c2fa74289..f9c712a327597ecdac8010da611affc5c50d6a80 100644 (file)
--- a/altoslib/AltosLine.java
+++ b/altoslib/AltosLine.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 

-package org.altusmetrum.altoslib_3;
+package org.altusmetrum.altoslib_4;

 
 public class AltosLine {
        public String   line;
 
 public class AltosLine {
        public String   line;

diff --git a/altoslib/AltosLink.java b/altoslib/AltosLink.java
index 469b03c0a1f8f41723e9bff0250393ecad5cd601..7f434a064200921d881eaf5051a580d6d1258ac8 100644 (file)
--- a/altoslib/AltosLink.java
+++ b/altoslib/AltosLink.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 

-package org.altusmetrum.altoslib_3;
+package org.altusmetrum.altoslib_4;

 
 import java.io.*;
 import java.util.concurrent.*;
 
 import java.io.*;
 import java.util.concurrent.*;

diff --git a/altoslib/AltosListenerState.java b/altoslib/AltosListenerState.java
index 53ed33f9219d2b26e69114137a164b774c3b7a4b..5bf761b0a5fa035d0a01b91952b48ecba0daf33b 100644 (file)
--- a/altoslib/AltosListenerState.java
+++ b/altoslib/AltosListenerState.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 

-package org.altusmetrum.altoslib_3;
+package org.altusmetrum.altoslib_4;

 
 public class AltosListenerState {
        public int      crc_errors;
 
 public class AltosListenerState {
        public int      crc_errors;

diff --git a/altoslib/AltosLog.java b/altoslib/AltosLog.java
index 70c017b7df950c2353ed21d57346b9b6305f72fc..8ecb1e96707a4192af1e95b87bddf13ac62cc343 100644 (file)
--- a/altoslib/AltosLog.java
+++ b/altoslib/AltosLog.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 

-package org.altusmetrum.altoslib_3;
+package org.altusmetrum.altoslib_4;

 
 import java.io.*;
 import java.text.*;
 
 import java.io.*;
 import java.text.*;

diff --git a/altoslib/AltosMag.java b/altoslib/AltosMag.java
index a3a0a74b157412e677760046f9b09c35fa3fd14d..9262de2d3e8e6f06fc1892cb22bbc3cff3af8618 100644 (file)
--- a/altoslib/AltosMag.java
+++ b/altoslib/AltosMag.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 

-package org.altusmetrum.altoslib_3;
+package org.altusmetrum.altoslib_4;

 
 import java.util.concurrent.*;
 
 
 import java.util.concurrent.*;
 

diff --git a/altoslib/AltosMma655x.java b/altoslib/AltosMma655x.java
index 0d90c351a8e7f21e1ee222fe0da29fd6accea4ff..cb2e63d4269cb9de38004377cf4f2471a19bae3e 100644 (file)
--- a/altoslib/AltosMma655x.java
+++ b/altoslib/AltosMma655x.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 

-package org.altusmetrum.altoslib_3;
+package org.altusmetrum.altoslib_4;

 
 import java.util.concurrent.*;
 
 
 import java.util.concurrent.*;
 

diff --git a/altoslib/AltosMs5607.java b/altoslib/AltosMs5607.java
index 4a851524d6810a24d3483fd987aacf65797090c5..5aa3a7ec6bf8bb0f673a8308ea9b0b818f458390 100644 (file)
--- a/altoslib/AltosMs5607.java
+++ b/altoslib/AltosMs5607.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 

-package org.altusmetrum.altoslib_3;
+package org.altusmetrum.altoslib_4;

 
 import java.util.concurrent.*;
 
 
 import java.util.concurrent.*;
 

diff --git a/altoslib/AltosNoSymbol.java b/altoslib/AltosNoSymbol.java
index 791899c06706f3ea48e17c71dec7079af9c2ebcd..f5e53b8cb032e663e4ad1a290022e833f0b3109d 100644 (file)
--- a/altoslib/AltosNoSymbol.java
+++ b/altoslib/AltosNoSymbol.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 

-package org.altusmetrum.altoslib_3;
+package org.altusmetrum.altoslib_4;

 
 public class AltosNoSymbol extends Exception {
        public AltosNoSymbol(String name) {
 
 public class AltosNoSymbol extends Exception {
        public AltosNoSymbol(String name) {

diff --git a/altoslib/AltosOrient.java b/altoslib/AltosOrient.java
index d916a0fba52bc4269e83dd5583f07e89c109a730..5fcbe28dd16b5fb38b80daeaf339ceae6c6c1e92 100644 (file)
--- a/altoslib/AltosOrient.java
+++ b/altoslib/AltosOrient.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 

-package org.altusmetrum.altoslib_3;
+package org.altusmetrum.altoslib_4;

 
 public class AltosOrient extends AltosUnits {
 
 
 public class AltosOrient extends AltosUnits {
 

diff --git a/altoslib/AltosParse.java b/altoslib/AltosParse.java
index 5137fef8caddc1c34da4bccb2c47e0771e822074..1bff76823f0d7d1d2d69c85404815c7d52ca4b1e 100644 (file)
--- a/altoslib/AltosParse.java
+++ b/altoslib/AltosParse.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 

-package org.altusmetrum.altoslib_3;
+package org.altusmetrum.altoslib_4;

 
 import java.text.*;
 
 
 import java.text.*;
 

diff --git a/altoslib/AltosPreferences.java b/altoslib/AltosPreferences.java
index 484cb64411735f1881afb67e06aba5e4161f3c98..d299f27b02ddd865e23f8e4e05c8a06ce3361ed5 100644 (file)
--- a/altoslib/AltosPreferences.java
+++ b/altoslib/AltosPreferences.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 

-package org.altusmetrum.altoslib_3;
+package org.altusmetrum.altoslib_4;

 
 import java.io.*;
 import java.util.*;
 
 import java.io.*;
 import java.util.*;

diff --git a/altoslib/AltosPreferencesBackend.java b/altoslib/AltosPreferencesBackend.java
index 2eb29702c322a221e87bcfce959828d7ce6dd12a..461b5c80ec1d409f61917068484dae4788bd9ebe 100644 (file)
--- a/altoslib/AltosPreferencesBackend.java
+++ b/altoslib/AltosPreferencesBackend.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 

-package org.altusmetrum.altoslib_3;
+package org.altusmetrum.altoslib_4;

 
 import java.io.File;
 
 
 import java.io.File;
 

diff --git a/altoslib/AltosProgrammer.java b/altoslib/AltosProgrammer.java
index 750e1f02b7e2655660cb25c87186a2f69290c30e..c96f04ca47da88eb0a16d76169fa3f57e0948c23 100644 (file)
--- a/altoslib/AltosProgrammer.java
+++ b/altoslib/AltosProgrammer.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 

-package org.altusmetrum.altoslib_3;
+package org.altusmetrum.altoslib_4;

 
 import java.io.*;
 
 
 import java.io.*;
 

diff --git a/altoslib/AltosPyro.java b/altoslib/AltosPyro.java
index a14141232dbc6dcd30d3f3a5c0acefbc8e6ce6ff..9e47bc804282f9b6319e1a2b151b81ab03bf5784 100644 (file)
--- a/altoslib/AltosPyro.java
+++ b/altoslib/AltosPyro.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 

-package org.altusmetrum.altoslib_3;
+package org.altusmetrum.altoslib_4;

 
 import java.util.*;
 import java.text.*;
 
 import java.util.*;
 import java.text.*;

diff --git a/altoslib/AltosReplayReader.java b/altoslib/AltosReplayReader.java
index 4cf642ca43801e378181bab6189adbdefca47dea..ac7df4141d537725659c7554651711f02662b28d 100644 (file)
--- a/altoslib/AltosReplayReader.java
+++ b/altoslib/AltosReplayReader.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 

-package org.altusmetrum.altoslib_3;
+package org.altusmetrum.altoslib_4;

 
 import java.io.*;
 import java.util.*;
 
 import java.io.*;
 import java.util.*;

diff --git a/altoslib/AltosRomconfig.java b/altoslib/AltosRomconfig.java
index 506c39610eb3e3272af3943b7b8b8a519520a6a2..10df11afd6cc7c9277dcd63d1475588e7a43fcf8 100644 (file)
--- a/altoslib/AltosRomconfig.java
+++ b/altoslib/AltosRomconfig.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 

-package org.altusmetrum.altoslib_3;
+package org.altusmetrum.altoslib_4;

 
 import java.io.*;
 
 
 import java.io.*;
 

diff --git a/altoslib/AltosSelfFlash.java b/altoslib/AltosSelfFlash.java
index 051aa76698f420df39e9e943b1076db79c132f31..502c6d65ba5fd426a71b0c5b0085dfa4581b0bfb 100644 (file)
--- a/altoslib/AltosSelfFlash.java
+++ b/altoslib/AltosSelfFlash.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 

-package org.altusmetrum.altoslib_3;
+package org.altusmetrum.altoslib_4;

 
 import java.io.*;
 
 
 import java.io.*;
 

diff --git a/altoslib/AltosSensorEMini.java b/altoslib/AltosSensorEMini.java
index 5f43b3a9ecf6aebcfde8f24c4190ec77436cf14a..ee0238f965f8a2b6c68d9ebca523ec35ffc494ef 100644 (file)
--- a/altoslib/AltosSensorEMini.java
+++ b/altoslib/AltosSensorEMini.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 

-package org.altusmetrum.altoslib_3;
+package org.altusmetrum.altoslib_4;

 
 import java.util.concurrent.TimeoutException;
 
 
 import java.util.concurrent.TimeoutException;
 

diff --git a/altoslib/AltosSensorMM.java b/altoslib/AltosSensorMM.java
index 0c23d671cfe8128f2d207c882d83d7c15beec9ce..e34e71b7f599a4b363a7b18a027134f8dd901bbb 100644 (file)
--- a/altoslib/AltosSensorMM.java
+++ b/altoslib/AltosSensorMM.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 

-package org.altusmetrum.altoslib_3;
+package org.altusmetrum.altoslib_4;

 
 import java.util.concurrent.TimeoutException;
 
 
 import java.util.concurrent.TimeoutException;
 

diff --git a/altoslib/AltosSensorMega.java b/altoslib/AltosSensorMega.java
index c52f688d6495f459c4337dae879edc6e2a70e765..02f3a25622e596ff2749315b05921b2dbbed128a 100644 (file)
--- a/altoslib/AltosSensorMega.java
+++ b/altoslib/AltosSensorMega.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 

-package org.altusmetrum.altoslib_3;
+package org.altusmetrum.altoslib_4;

 
 import java.util.concurrent.TimeoutException;
 
 
 import java.util.concurrent.TimeoutException;
 

diff --git a/altoslib/AltosSensorMetrum.java b/altoslib/AltosSensorMetrum.java
index bb794a1e598f04f624b76a77a47b3a6cf0baf7ee..e5421ef53d1a79dadade3a63f1954879e92836cf 100644 (file)
--- a/altoslib/AltosSensorMetrum.java
+++ b/altoslib/AltosSensorMetrum.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 

-package org.altusmetrum.altoslib_3;
+package org.altusmetrum.altoslib_4;

 
 import java.util.concurrent.TimeoutException;
 
 
 import java.util.concurrent.TimeoutException;
 

diff --git a/altoslib/AltosSensorTM.java b/altoslib/AltosSensorTM.java
index a5129783fdfe39dbede076fbdad061562fb4cc61..2d60d8cfbaf9e33ee3a73807ba1e09c448e4d6ef 100644 (file)
--- a/altoslib/AltosSensorTM.java
+++ b/altoslib/AltosSensorTM.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 

-package org.altusmetrum.altoslib_3;
+package org.altusmetrum.altoslib_4;

 
 import java.util.concurrent.TimeoutException;
 
 
 import java.util.concurrent.TimeoutException;
 

diff --git a/altoslib/AltosSensorTMini.java b/altoslib/AltosSensorTMini.java
index bb60a794dad55d047bd9578c9ff3c1b0de5de99a..b9eeca0cc1d803403d09b5e6283d7a30e5c2ee80 100644 (file)
--- a/altoslib/AltosSensorTMini.java
+++ b/altoslib/AltosSensorTMini.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 

-package org.altusmetrum.altoslib_3;
+package org.altusmetrum.altoslib_4;

 
 import java.util.concurrent.TimeoutException;
 
 
 import java.util.concurrent.TimeoutException;
 

diff --git a/altoslib/AltosSpeed.java b/altoslib/AltosSpeed.java
index d93229dd0a3837d0a6bfaa59010a91bd6ba7668f..9134f5f4a59c60c729f1835ccadd10de4eb17502 100644 (file)
--- a/altoslib/AltosSpeed.java
+++ b/altoslib/AltosSpeed.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 

-package org.altusmetrum.altoslib_3;
+package org.altusmetrum.altoslib_4;

 
 public class AltosSpeed extends AltosUnits {
 
 
 public class AltosSpeed extends AltosUnits {
 

diff --git a/altoslib/AltosState.java b/altoslib/AltosState.java
index 4dbd751bee8d74f78562f4832d2be0fcf656897e..7126315168448d2765b5beb518bcfdf1b141d7e1 100644 (file)
--- a/altoslib/AltosState.java
+++ b/altoslib/AltosState.java
@@ -19,7 +19,7 @@
  * Track flight state from telemetry or eeprom data stream
  */
 
  * Track flight state from telemetry or eeprom data stream
  */
 

-package org.altusmetrum.altoslib_3;
+package org.altusmetrum.altoslib_4;

 
 public class AltosState implements Cloneable {
 
 
 public class AltosState implements Cloneable {
 

diff --git a/altoslib/AltosStateIterable.java b/altoslib/AltosStateIterable.java
index 7ea3041bb79e0c862611a1f7de04edc164d95ef7..be812095342988dc6f2f889f74d4f2bda5a9cff1 100644 (file)
--- a/altoslib/AltosStateIterable.java
+++ b/altoslib/AltosStateIterable.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 

-package org.altusmetrum.altoslib_3;
+package org.altusmetrum.altoslib_4;

 
 import java.io.*;
 import java.util.*;
 
 import java.io.*;
 import java.util.*;

diff --git a/altoslib/AltosStateUpdate.java b/altoslib/AltosStateUpdate.java
index 4614c67a1f0db70397be7747a77158b9e93c9691..ac4e963e6de6750b21150684745bfc37bd51337f 100644 (file)
--- a/altoslib/AltosStateUpdate.java
+++ b/altoslib/AltosStateUpdate.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 

-package org.altusmetrum.altoslib_3;
+package org.altusmetrum.altoslib_4;

 
 public interface AltosStateUpdate {
        public void     update_state(AltosState state) throws InterruptedException;
 
 public interface AltosStateUpdate {
        public void     update_state(AltosState state) throws InterruptedException;

diff --git a/altoslib/AltosTelemetry.java b/altoslib/AltosTelemetry.java
index 1c4ce7bc36e6057d4d4b98bbdb4cf895735a0fb1..629483785a5a4217de9107eb6c7897d986447604 100644 (file)
--- a/altoslib/AltosTelemetry.java
+++ b/altoslib/AltosTelemetry.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 

-package org.altusmetrum.altoslib_3;
+package org.altusmetrum.altoslib_4;

 
 import java.text.*;
 
 
 import java.text.*;
 

diff --git a/altoslib/AltosTelemetryConfiguration.java b/altoslib/AltosTelemetryConfiguration.java
index 67a437489294f28291dc5ea3e0c8ca7f0fef165c..d1341b9e342a54ebbb8de0c49150f2d9939f933f 100644 (file)
--- a/altoslib/AltosTelemetryConfiguration.java
+++ b/altoslib/AltosTelemetryConfiguration.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 

-package org.altusmetrum.altoslib_3;
+package org.altusmetrum.altoslib_4;

 
 
 public class AltosTelemetryConfiguration extends AltosTelemetryStandard {
 
 
 public class AltosTelemetryConfiguration extends AltosTelemetryStandard {

diff --git a/altoslib/AltosTelemetryFile.java b/altoslib/AltosTelemetryFile.java
index f66431347fec2064a1a677edee8e9216014b2d0a..3d3fa407085c641dda785a5ee8235e99b31d9033 100644 (file)
--- a/altoslib/AltosTelemetryFile.java
+++ b/altoslib/AltosTelemetryFile.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 

-package org.altusmetrum.altoslib_3;
+package org.altusmetrum.altoslib_4;

 
 import java.io.*;
 import java.util.*;
 
 import java.io.*;
 import java.util.*;

diff --git a/altoslib/AltosTelemetryIterable.java b/altoslib/AltosTelemetryIterable.java
index 002f53b4eacdc86f3dfdfd0223d29143b5c620fb..cba97ddc01309ddf9637d6b4ca53f1de4ec6ad4d 100644 (file)
--- a/altoslib/AltosTelemetryIterable.java
+++ b/altoslib/AltosTelemetryIterable.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 

-package org.altusmetrum.altoslib_3;
+package org.altusmetrum.altoslib_4;

 
 import java.io.*;
 import java.util.*;
 
 import java.io.*;
 import java.util.*;

diff --git a/altoslib/AltosTelemetryLegacy.java b/altoslib/AltosTelemetryLegacy.java
index da9296e448d05c81e86d0bfa5b5e8ebdbf7289b4..3367ece78bc2a50145b3aa84df36c9aae4e24357 100644 (file)
--- a/altoslib/AltosTelemetryLegacy.java
+++ b/altoslib/AltosTelemetryLegacy.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 

-package org.altusmetrum.altoslib_3;
+package org.altusmetrum.altoslib_4;

 
 import java.text.*;
 
 
 import java.text.*;
 

diff --git a/altoslib/AltosTelemetryLocation.java b/altoslib/AltosTelemetryLocation.java
index 8dcda9e173abf75f67fef1077c43502a208166fe..8368188f895492d42b83385babb524836e1a0b68 100644 (file)
--- a/altoslib/AltosTelemetryLocation.java
+++ b/altoslib/AltosTelemetryLocation.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 

-package org.altusmetrum.altoslib_3;
+package org.altusmetrum.altoslib_4;

 
 
 public class AltosTelemetryLocation extends AltosTelemetryStandard {
 
 
 public class AltosTelemetryLocation extends AltosTelemetryStandard {

diff --git a/altoslib/AltosTelemetryMap.java b/altoslib/AltosTelemetryMap.java
index 37b2527b663b410466e619cf1adf7bb1e565d913..8d0de355f195346df58079a2849f48cd315eaa87 100644 (file)
--- a/altoslib/AltosTelemetryMap.java
+++ b/altoslib/AltosTelemetryMap.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 

-package org.altusmetrum.altoslib_3;
+package org.altusmetrum.altoslib_4;

 import java.text.*;
 import java.util.HashMap;
 
 import java.text.*;
 import java.util.HashMap;
 

diff --git a/altoslib/AltosTelemetryMegaData.java b/altoslib/AltosTelemetryMegaData.java
index ffd825462a0b5691da2e1528977a513cfcaf674e..fac5695f27fbf6048a5f5d7b994f1e0ffe3ea529 100644 (file)
--- a/altoslib/AltosTelemetryMegaData.java
+++ b/altoslib/AltosTelemetryMegaData.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 

-package org.altusmetrum.altoslib_3;
+package org.altusmetrum.altoslib_4;

 
 public class AltosTelemetryMegaData extends AltosTelemetryStandard {
        int     state;
 
 public class AltosTelemetryMegaData extends AltosTelemetryStandard {
        int     state;

diff --git a/altoslib/AltosTelemetryMegaSensor.java b/altoslib/AltosTelemetryMegaSensor.java
index d9fd7fdeadc0a25a09cdc5a02a21e54c1d93e9b7..9e73bc4e2c6b53114b9b43bf7fcaad7a6c801c44 100644 (file)
--- a/altoslib/AltosTelemetryMegaSensor.java
+++ b/altoslib/AltosTelemetryMegaSensor.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 

-package org.altusmetrum.altoslib_3;
+package org.altusmetrum.altoslib_4;

 
 public class AltosTelemetryMegaSensor extends AltosTelemetryStandard {
        int     accel;
 
 public class AltosTelemetryMegaSensor extends AltosTelemetryStandard {
        int     accel;

diff --git a/altoslib/AltosTelemetryMetrumData.java b/altoslib/AltosTelemetryMetrumData.java
index b8f7e9ea6768fb045664b8faeda104db286211ce..966173069e81a8bbe320adc3b5ff69fe7a7e98f8 100644 (file)
--- a/altoslib/AltosTelemetryMetrumData.java
+++ b/altoslib/AltosTelemetryMetrumData.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 

-package org.altusmetrum.altoslib_3;
+package org.altusmetrum.altoslib_4;

 
 
 public class AltosTelemetryMetrumData extends AltosTelemetryStandard {
 
 
 public class AltosTelemetryMetrumData extends AltosTelemetryStandard {

diff --git a/altoslib/AltosTelemetryMetrumSensor.java b/altoslib/AltosTelemetryMetrumSensor.java
index 232468bbf67ca5967d42f4d4f8996f1ffee09b5c..e7055404b24fe5b1f6c36309d3ca0e32355f0525 100644 (file)
--- a/altoslib/AltosTelemetryMetrumSensor.java
+++ b/altoslib/AltosTelemetryMetrumSensor.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 

-package org.altusmetrum.altoslib_3;
+package org.altusmetrum.altoslib_4;

 
 
 public class AltosTelemetryMetrumSensor extends AltosTelemetryStandard {
 
 
 public class AltosTelemetryMetrumSensor extends AltosTelemetryStandard {

diff --git a/altoslib/AltosTelemetryMini.java b/altoslib/AltosTelemetryMini.java
index e0a493dc06c7c6c3eb5afed0ab44d06a9c7aa960..fbfaff8e2cc406ce52397f37670bbbfd87a5664c 100644 (file)
--- a/altoslib/AltosTelemetryMini.java
+++ b/altoslib/AltosTelemetryMini.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 

-package org.altusmetrum.altoslib_3;
+package org.altusmetrum.altoslib_4;

 
 
 public class AltosTelemetryMini extends AltosTelemetryStandard {
 
 
 public class AltosTelemetryMini extends AltosTelemetryStandard {

diff --git a/altoslib/AltosTelemetryRaw.java b/altoslib/AltosTelemetryRaw.java
index 91cfbb18d5e23320fd8fe2d8c9bb0827d4248bfe..0dca62aa62abf988c0552279732bf04598cd52d0 100644 (file)
--- a/altoslib/AltosTelemetryRaw.java
+++ b/altoslib/AltosTelemetryRaw.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 

-package org.altusmetrum.altoslib_3;
+package org.altusmetrum.altoslib_4;

 
 public class AltosTelemetryRaw extends AltosTelemetryStandard {
        public AltosTelemetryRaw(int[] bytes) {
 
 public class AltosTelemetryRaw extends AltosTelemetryStandard {
        public AltosTelemetryRaw(int[] bytes) {

diff --git a/altoslib/AltosTelemetryReader.java b/altoslib/AltosTelemetryReader.java
index 5e28358762c72e9ca51f013efa782ae5742529db..3dff661a3e3a91ed876166d32a59b334c17f4cd2 100644 (file)
--- a/altoslib/AltosTelemetryReader.java
+++ b/altoslib/AltosTelemetryReader.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 

-package org.altusmetrum.altoslib_3;
+package org.altusmetrum.altoslib_4;

 
 import java.text.*;
 import java.io.*;
 
 import java.text.*;
 import java.io.*;

diff --git a/altoslib/AltosTelemetrySatellite.java b/altoslib/AltosTelemetrySatellite.java
index 24777b28a713396269572093e71edada744f79f7..d611e88c004b371b26630beb018aabd8b88c0d69 100644 (file)
--- a/altoslib/AltosTelemetrySatellite.java
+++ b/altoslib/AltosTelemetrySatellite.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 

-package org.altusmetrum.altoslib_3;
+package org.altusmetrum.altoslib_4;

 
 public class AltosTelemetrySatellite extends AltosTelemetryStandard {
        int             channels;
 
 public class AltosTelemetrySatellite extends AltosTelemetryStandard {
        int             channels;

diff --git a/altoslib/AltosTelemetrySensor.java b/altoslib/AltosTelemetrySensor.java
index d6389865c15197e8a90310b45bbcc3cc54486e9b..ad4d92837a955c2ab80019e3bf5e2862f2559f7e 100644 (file)
--- a/altoslib/AltosTelemetrySensor.java
+++ b/altoslib/AltosTelemetrySensor.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 

-package org.altusmetrum.altoslib_3;
+package org.altusmetrum.altoslib_4;

 
 
 public class AltosTelemetrySensor extends AltosTelemetryStandard {
 
 
 public class AltosTelemetrySensor extends AltosTelemetryStandard {

diff --git a/altoslib/AltosTelemetryStandard.java b/altoslib/AltosTelemetryStandard.java
index c9531fcb3fcd0470de446f4d1aa1fcb174b6f6c7..23ae9d21fc05894fc76ef14ac29b1493ddbc32a8 100644 (file)
--- a/altoslib/AltosTelemetryStandard.java
+++ b/altoslib/AltosTelemetryStandard.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 

-package org.altusmetrum.altoslib_3;
+package org.altusmetrum.altoslib_4;

 
 public abstract class AltosTelemetryStandard extends AltosTelemetry {
        int[]   bytes;
 
 public abstract class AltosTelemetryStandard extends AltosTelemetry {
        int[]   bytes;

diff --git a/altoslib/AltosTemperature.java b/altoslib/AltosTemperature.java
index 36e2656436827614f7fa7e221d4fe3838753193b..5fa71b8683b48cd9f710f6d4a5c4368a4f107e7a 100644 (file)
--- a/altoslib/AltosTemperature.java
+++ b/altoslib/AltosTemperature.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 

-package org.altusmetrum.altoslib_3;
+package org.altusmetrum.altoslib_4;

 
 public class AltosTemperature extends AltosUnits {
 
 
 public class AltosTemperature extends AltosUnits {
 

diff --git a/altoslib/AltosUnits.java b/altoslib/AltosUnits.java
index 82f102e4cd14beebda39433f34e2acfd14ae585e..d29cfae7450825f7bea624759b1a4c578dfe06ab 100644 (file)
--- a/altoslib/AltosUnits.java
+++ b/altoslib/AltosUnits.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 

-package org.altusmetrum.altoslib_3;
+package org.altusmetrum.altoslib_4;

 
 public abstract class AltosUnits {
 
 
 public abstract class AltosUnits {
 

diff --git a/altoslib/AltosUnitsListener.java b/altoslib/AltosUnitsListener.java
index e9b29f9a866a23722aeb64fac49438b7eddf90e4..ca6faafd34166edf90e192b2a856c15384f46817 100644 (file)
--- a/altoslib/AltosUnitsListener.java
+++ b/altoslib/AltosUnitsListener.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 

-package org.altusmetrum.altoslib_3;
+package org.altusmetrum.altoslib_4;

 
 public interface AltosUnitsListener {
        public void units_changed(boolean imperial_units);
 
 public interface AltosUnitsListener {
        public void units_changed(boolean imperial_units);

diff --git a/altoslib/AltosWriter.java b/altoslib/AltosWriter.java
index 0b0daebd55c0fbfe0f7be25ee5d08426320985e8..c3479a93dfd2bf18e4709ce643610a3f7eb261a1 100644 (file)
--- a/altoslib/AltosWriter.java
+++ b/altoslib/AltosWriter.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 

-package org.altusmetrum.altoslib_3;
+package org.altusmetrum.altoslib_4;

 
 public interface AltosWriter {
 
 
 public interface AltosWriter {
 

diff --git a/altosui/Altos.java b/altosui/Altos.java
index 4b171fa77512f7de17a3a5c827d8bdab389b209b..28038ad687653e5829c756b848103eb8cf18f1b2 100644 (file)
--- a/altosui/Altos.java
+++ b/altosui/Altos.java
@@ -20,8 +20,8 @@ package altosui;
 import java.awt.*;
 import libaltosJNI.*;
 
 import java.awt.*;
 import libaltosJNI.*;
 

-import org.altusmetrum.altoslib_3.*;
-import org.altusmetrum.altosuilib_1.*;
+import org.altusmetrum.altoslib_4.*;
+import org.altusmetrum.altosuilib_2.*;

 
 public class Altos extends AltosUILib {
 
 
 public class Altos extends AltosUILib {
 

diff --git a/altosui/AltosAscent.java b/altosui/AltosAscent.java
index 81b08d2c3aa7cae5ee67c6124dc90199d7b71ee1..f6ccbf0c0713426fc8f59fe4dbe9d76609182b33 100644 (file)
--- a/altosui/AltosAscent.java
+++ b/altosui/AltosAscent.java
@@ -19,7 +19,8 @@ package altosui;
 
 import java.awt.*;
 import javax.swing.*;
 
 import java.awt.*;
 import javax.swing.*;

-import org.altusmetrum.altoslib_3.*;
+import org.altusmetrum.altoslib_4.*;
+import org.altusmetrum.altosuilib_2.*;

 
 public class AltosAscent extends JComponent implements AltosFlightDisplay {
        GridBagLayout   layout;
 
 public class AltosAscent extends JComponent implements AltosFlightDisplay {
        GridBagLayout   layout;

diff --git a/altosui/AltosBTDevice.java b/altosui/AltosBTDevice.java
index 727a9f6625ce7953e251c94817cc9f5832c4b1ad..e920803a12fe125c7fbe95364cc53447207fb5d1 100644 (file)
--- a/altosui/AltosBTDevice.java
+++ b/altosui/AltosBTDevice.java
@@ -17,7 +17,7 @@
 
 package altosui;
 import libaltosJNI.*;
 
 package altosui;
 import libaltosJNI.*;

-import org.altusmetrum.altosuilib_1.*;
+import org.altusmetrum.altosuilib_2.*;

 
 public class AltosBTDevice extends altos_bt_device implements AltosDevice {
 
 
 public class AltosBTDevice extends altos_bt_device implements AltosDevice {
 

diff --git a/altosui/AltosBTKnown.java b/altosui/AltosBTKnown.java
index 968d72d5466a42451699485ca589fce00372b76f..3abbbe0891aa9851d07a4729299611c583ecada7 100644 (file)
--- a/altosui/AltosBTKnown.java
+++ b/altosui/AltosBTKnown.java
@@ -17,8 +17,8 @@
 
 package altosui;
 import java.util.*;
 
 package altosui;
 import java.util.*;

-import org.altusmetrum.altoslib_3.*;
-import org.altusmetrum.altosuilib_1.*;
+import org.altusmetrum.altoslib_4.*;
+import org.altusmetrum.altosuilib_2.*;

 
 public class AltosBTKnown implements Iterable<AltosBTDevice> {
        LinkedList<AltosBTDevice>       devices = new LinkedList<AltosBTDevice>();
 
 public class AltosBTKnown implements Iterable<AltosBTDevice> {
        LinkedList<AltosBTDevice>       devices = new LinkedList<AltosBTDevice>();

diff --git a/altosui/AltosBTManage.java b/altosui/AltosBTManage.java
index ad1c28b6e0bbd54ffc3e32beba8c8f96c787b761..e6e7efd4bf9743bc8c593f2487774d7e73c37b72 100644 (file)
--- a/altosui/AltosBTManage.java
+++ b/altosui/AltosBTManage.java
@@ -23,7 +23,7 @@ import javax.swing.*;
 import javax.swing.plaf.basic.*;
 import java.util.*;
 import java.util.concurrent.*;
 import javax.swing.plaf.basic.*;
 import java.util.*;
 import java.util.concurrent.*;

-import org.altusmetrum.altosuilib_1.*;
+import org.altusmetrum.altosuilib_2.*;

 
 public class AltosBTManage extends AltosUIDialog implements ActionListener, Iterable<AltosBTDevice> {
        LinkedBlockingQueue<AltosBTDevice> found_devices;
 
 public class AltosBTManage extends AltosUIDialog implements ActionListener, Iterable<AltosBTDevice> {
        LinkedBlockingQueue<AltosBTDevice> found_devices;

diff --git a/altosui/AltosCSVUI.java b/altosui/AltosCSVUI.java
index 95a8aeeaff9f64b22595bbd7cf08b708437e64f5..a0fceee52afd6b7c0c9be0b7622fd4ad47d7aa7d 100644 (file)
--- a/altosui/AltosCSVUI.java
+++ b/altosui/AltosCSVUI.java
@@ -21,8 +21,8 @@ import java.awt.*;
 import java.awt.event.*;
 import javax.swing.*;
 import java.io.*;
 import java.awt.event.*;
 import javax.swing.*;
 import java.io.*;

-import org.altusmetrum.altoslib_3.*;
-import org.altusmetrum.altosuilib_1.*;
+import org.altusmetrum.altoslib_4.*;
+import org.altusmetrum.altosuilib_2.*;

 
 public class AltosCSVUI
        extends AltosUIDialog
 
 public class AltosCSVUI
        extends AltosUIDialog

diff --git a/altosui/AltosCompanionInfo.java b/altosui/AltosCompanionInfo.java
index b90240fbebf22578c8c8a722f7ddc1b289fa008f..42413a57d506d40561fd25404130f3c5e8f23378 100644 (file)
--- a/altosui/AltosCompanionInfo.java
+++ b/altosui/AltosCompanionInfo.java
@@ -19,7 +19,7 @@ package altosui;
 
 import java.awt.*;
 import javax.swing.*;
 
 import java.awt.*;
 import javax.swing.*;

-import org.altusmetrum.altoslib_3.*;
+import org.altusmetrum.altoslib_4.*;

 
 public class AltosCompanionInfo extends JTable {
        private AltosFlightInfoTableModel model;
 
 public class AltosCompanionInfo extends JTable {
        private AltosFlightInfoTableModel model;

diff --git a/altosui/AltosConfig.java b/altosui/AltosConfig.java
index e1805fc12be91d70b1365f86d08dc8e019985ea1..3128114f265bf4a7d19eff45fc36134c44b03b67 100644 (file)
--- a/altosui/AltosConfig.java
+++ b/altosui/AltosConfig.java
@@ -22,8 +22,8 @@ import javax.swing.*;
 import java.io.*;
 import java.util.concurrent.*;
 import java.text.*;
 import java.io.*;
 import java.util.concurrent.*;
 import java.text.*;

-import org.altusmetrum.altoslib_3.*;
-import org.altusmetrum.altosuilib_1.*;
+import org.altusmetrum.altoslib_4.*;
+import org.altusmetrum.altosuilib_2.*;

 
 public class AltosConfig implements ActionListener {
 
 
 public class AltosConfig implements ActionListener {
 

diff --git a/altosui/AltosConfigFreqUI.java b/altosui/AltosConfigFreqUI.java
index 663782f0dc23906882770d341ea8dd6692aaafc7..c7181e1467a35c5a87a5a304ef5c33bc29887155 100644 (file)
--- a/altosui/AltosConfigFreqUI.java
+++ b/altosui/AltosConfigFreqUI.java
@@ -21,8 +21,8 @@ import java.awt.*;
 import java.awt.event.*;
 import javax.swing.*;
 import java.util.*;
 import java.awt.event.*;
 import javax.swing.*;
 import java.util.*;

-import org.altusmetrum.altoslib_3.*;
-import org.altusmetrum.altosuilib_1.*;
+import org.altusmetrum.altoslib_4.*;
+import org.altusmetrum.altosuilib_2.*;

 
 class AltosEditFreqUI extends AltosUIDialog implements ActionListener {
        Frame           frame;
 
 class AltosEditFreqUI extends AltosUIDialog implements ActionListener {
        Frame           frame;

diff --git a/altosui/AltosConfigPyroUI.java b/altosui/AltosConfigPyroUI.java
index cd42a3b0bef46797b000b7e6dd472684b072ead2..9df2d87dc302e5c4755804daccfa6b6740ab9737 100644 (file)
--- a/altosui/AltosConfigPyroUI.java
+++ b/altosui/AltosConfigPyroUI.java
@@ -21,8 +21,8 @@ import java.awt.*;
 import java.awt.event.*;
 import javax.swing.*;
 import javax.swing.event.*;
 import java.awt.event.*;
 import javax.swing.*;
 import javax.swing.event.*;

-import org.altusmetrum.altoslib_3.*;
-import org.altusmetrum.altosuilib_1.*;
+import org.altusmetrum.altoslib_4.*;
+import org.altusmetrum.altosuilib_2.*;

 
 public class AltosConfigPyroUI
        extends AltosUIDialog
 
 public class AltosConfigPyroUI
        extends AltosUIDialog

diff --git a/altosui/AltosConfigTD.java b/altosui/AltosConfigTD.java
index ad9ebbfacf82b4ab8a3ad479713f949b30850935..bfbd2c7710ef296118724e50a85cce9c625be561 100644 (file)
--- a/altosui/AltosConfigTD.java
+++ b/altosui/AltosConfigTD.java
@@ -21,8 +21,8 @@ import java.awt.event.*;
 import javax.swing.*;
 import java.io.*;
 import java.util.concurrent.*;
 import javax.swing.*;
 import java.io.*;
 import java.util.concurrent.*;

-import org.altusmetrum.altoslib_3.*;
-import org.altusmetrum.altosuilib_1.*;
+import org.altusmetrum.altoslib_4.*;
+import org.altusmetrum.altosuilib_2.*;

 
 public class AltosConfigTD implements ActionListener {
 
 
 public class AltosConfigTD implements ActionListener {
 

diff --git a/altosui/AltosConfigTDUI.java b/altosui/AltosConfigTDUI.java
index 55d6aed95c82bc067355bd1828168ea175ddf598..22b3384d6a995e7a341c6eac16a1f6c4c8f17121 100644 (file)
--- a/altosui/AltosConfigTDUI.java
+++ b/altosui/AltosConfigTDUI.java
@@ -21,8 +21,8 @@ import java.awt.*;
 import java.awt.event.*;
 import javax.swing.*;
 import javax.swing.event.*;
 import java.awt.event.*;
 import javax.swing.*;
 import javax.swing.event.*;

-import org.altusmetrum.altoslib_3.*;
-import org.altusmetrum.altosuilib_1.*;
+import org.altusmetrum.altoslib_4.*;
+import org.altusmetrum.altosuilib_2.*;

 
 public class AltosConfigTDUI
        extends AltosUIDialog
 
 public class AltosConfigTDUI
        extends AltosUIDialog

diff --git a/altosui/AltosConfigUI.java b/altosui/AltosConfigUI.java
index 7f4e1eb00280187b22664e53ea40d5eb2329994e..3ec3cdb0f365a524895d342ddec9e19cc95f3934 100644 (file)
--- a/altosui/AltosConfigUI.java
+++ b/altosui/AltosConfigUI.java
@@ -21,8 +21,8 @@ import java.awt.*;
 import java.awt.event.*;
 import javax.swing.*;
 import javax.swing.event.*;
 import java.awt.event.*;
 import javax.swing.*;
 import javax.swing.event.*;

-import org.altusmetrum.altoslib_3.*;
-import org.altusmetrum.altosuilib_1.*;
+import org.altusmetrum.altoslib_4.*;
+import org.altusmetrum.altosuilib_2.*;

 
 public class AltosConfigUI
        extends AltosUIDialog
 
 public class AltosConfigUI
        extends AltosUIDialog

diff --git a/altosui/AltosConfigureUI.java b/altosui/AltosConfigureUI.java
index 80876959600bb788458505c2611aa6032c8d15ef..e61a4a5b191200115596d4c10c5b8090aa86cf84 100644 (file)
--- a/altosui/AltosConfigureUI.java
+++ b/altosui/AltosConfigureUI.java
@@ -22,7 +22,7 @@ import java.awt.event.*;
 import java.beans.*;
 import javax.swing.*;
 import javax.swing.event.*;
 import java.beans.*;
 import javax.swing.*;
 import javax.swing.event.*;

-import org.altusmetrum.altosuilib_1.*;
+import org.altusmetrum.altosuilib_2.*;

 
 public class AltosConfigureUI
        extends AltosUIConfigure
 
 public class AltosConfigureUI
        extends AltosUIConfigure

diff --git a/altosui/AltosDataChooser.java b/altosui/AltosDataChooser.java
index a9344a01c832ed0c96b52918a4feb056cb4e1d0d..43726a44de71e254b1a0020f6263a753cc26752c 100644 (file)
--- a/altosui/AltosDataChooser.java
+++ b/altosui/AltosDataChooser.java
@@ -20,8 +20,8 @@ package altosui;
 import javax.swing.*;
 import javax.swing.filechooser.FileNameExtensionFilter;
 import java.io.*;
 import javax.swing.*;
 import javax.swing.filechooser.FileNameExtensionFilter;
 import java.io.*;

-import org.altusmetrum.altoslib_3.*;
-import org.altusmetrum.altosuilib_1.*;
+import org.altusmetrum.altoslib_4.*;
+import org.altusmetrum.altosuilib_2.*;

 
 public class AltosDataChooser extends JFileChooser {
        JFrame  frame;
 
 public class AltosDataChooser extends JFileChooser {
        JFrame  frame;

diff --git a/altosui/AltosDescent.java b/altosui/AltosDescent.java
index cd993a758eabf1945a31309309b47e76e86bd6ad..5cb693fe99ed89e404ed3e5bb76530154adad1d2 100644 (file)
--- a/altosui/AltosDescent.java
+++ b/altosui/AltosDescent.java
@@ -19,7 +19,8 @@ package altosui;
 
 import java.awt.*;
 import javax.swing.*;
 
 import java.awt.*;
 import javax.swing.*;

-import org.altusmetrum.altoslib_3.*;
+import org.altusmetrum.altoslib_4.*;
+import org.altusmetrum.altosuilib_2.*;

 
 public class AltosDescent extends JComponent implements AltosFlightDisplay {
        GridBagLayout   layout;
 
 public class AltosDescent extends JComponent implements AltosFlightDisplay {
        GridBagLayout   layout;

diff --git a/altosui/AltosDeviceUIDialog.java b/altosui/AltosDeviceUIDialog.java
index ca34357ebd9c25579ad222c8f8eae3377106338b..307c77f87aec21743feaa7a6e916cce3b2948265 100644 (file)
--- a/altosui/AltosDeviceUIDialog.java
+++ b/altosui/AltosDeviceUIDialog.java
@@ -20,7 +20,7 @@ package altosui;
 import javax.swing.*;
 import java.awt.*;
 import java.awt.event.*;
 import javax.swing.*;
 import java.awt.*;
 import java.awt.event.*;

-import org.altusmetrum.altosuilib_1.*;
+import org.altusmetrum.altosuilib_2.*;

 
 public class AltosDeviceUIDialog extends AltosDeviceDialog {
 
 
 public class AltosDeviceUIDialog extends AltosDeviceDialog {
 

diff --git a/altosui/AltosEepromDelete.java b/altosui/AltosEepromDelete.java
index b2d2e291f0be03ab43fd5e16ef9851c2c2278357..b6ac7edb92731086240afc0f2bb3065be9fc1298 100644 (file)
--- a/altosui/AltosEepromDelete.java
+++ b/altosui/AltosEepromDelete.java
@@ -21,7 +21,7 @@ import java.awt.event.*;
 import javax.swing.*;
 import java.io.*;
 import java.util.concurrent.*;
 import javax.swing.*;
 import java.io.*;
 import java.util.concurrent.*;

-import org.altusmetrum.altoslib_3.*;
+import org.altusmetrum.altoslib_4.*;

 
 public class AltosEepromDelete implements Runnable {
        AltosEepromList         flights;
 
 public class AltosEepromDelete implements Runnable {
        AltosEepromList         flights;

diff --git a/altosui/AltosEepromManage.java b/altosui/AltosEepromManage.java
index e363557141547dc0d92f46719b924ee010ec7c57..aa43ab9ee3c4f740187bc3f391f387b14ec54f19 100644 (file)
--- a/altosui/AltosEepromManage.java
+++ b/altosui/AltosEepromManage.java
@@ -21,8 +21,8 @@ import java.awt.event.*;
 import javax.swing.*;
 import java.io.*;
 import java.util.concurrent.*;
 import javax.swing.*;
 import java.io.*;
 import java.util.concurrent.*;

-import org.altusmetrum.altoslib_3.*;
-import org.altusmetrum.altosuilib_1.*;
+import org.altusmetrum.altoslib_4.*;
+import org.altusmetrum.altosuilib_2.*;

 
 public class AltosEepromManage implements ActionListener {
 
 
 public class AltosEepromManage implements ActionListener {
 

diff --git a/altosui/AltosEepromMonitor.java b/altosui/AltosEepromMonitor.java
index 50921da17df203d645038ac116de5cb692951ebb..ce1c16255c3484ecb9ac371513df40487410f807 100644 (file)
--- a/altosui/AltosEepromMonitor.java
+++ b/altosui/AltosEepromMonitor.java
@@ -20,7 +20,7 @@ package altosui;
 import java.awt.*;
 import java.awt.event.*;
 import javax.swing.*;
 import java.awt.*;
 import java.awt.event.*;
 import javax.swing.*;

-import org.altusmetrum.altosuilib_1.*;
+import org.altusmetrum.altosuilib_2.*;

 
 public class AltosEepromMonitor extends AltosUIDialog {
 
 
 public class AltosEepromMonitor extends AltosUIDialog {
 

diff --git a/altosui/AltosEepromMonitorUI.java b/altosui/AltosEepromMonitorUI.java
index c2e925a26f6c730a74c36156d2b91450fac1b351..c1c1eb25c4a51afe4b0b99424054aa57d6eedfab 100644 (file)
--- a/altosui/AltosEepromMonitorUI.java
+++ b/altosui/AltosEepromMonitorUI.java
@@ -20,8 +20,8 @@ package altosui;
 import java.awt.*;
 import java.awt.event.*;
 import javax.swing.*;
 import java.awt.*;
 import java.awt.event.*;
 import javax.swing.*;

-import org.altusmetrum.altosuilib_1.*;
-import org.altusmetrum.altoslib_3.*;
+import org.altusmetrum.altosuilib_2.*;
+import org.altusmetrum.altoslib_4.*;

 
 public class AltosEepromMonitorUI extends AltosUIDialog implements AltosEepromMonitor {
        JFrame          owner;
 
 public class AltosEepromMonitorUI extends AltosUIDialog implements AltosEepromMonitor {
        JFrame          owner;

diff --git a/altosui/AltosEepromSelect.java b/altosui/AltosEepromSelect.java
index b7cdbb72fc6a446eb5ad269696cf017c503d6daf..66a197c9af5ac300e102121ae81078909a123a4d 100644 (file)
--- a/altosui/AltosEepromSelect.java
+++ b/altosui/AltosEepromSelect.java
@@ -21,8 +21,8 @@ import javax.swing.*;
 import javax.swing.border.*;
 import java.awt.*;
 import java.awt.event.*;
 import javax.swing.border.*;
 import java.awt.*;
 import java.awt.event.*;

-import org.altusmetrum.altoslib_3.*;
-import org.altusmetrum.altosuilib_1.*;
+import org.altusmetrum.altoslib_4.*;
+import org.altusmetrum.altosuilib_2.*;

 
 class AltosEepromItem implements ActionListener {
        AltosEepromLog  log;
 
 class AltosEepromItem implements ActionListener {
        AltosEepromLog  log;

diff --git a/altosui/AltosFlashUI.java b/altosui/AltosFlashUI.java
index ff9cb95dcc87558b05f5ae79846858232647bc18..d8c70a0675136b23112bbd18b9edd7cc756ef5e8 100644 (file)
--- a/altosui/AltosFlashUI.java
+++ b/altosui/AltosFlashUI.java
@@ -23,8 +23,8 @@ import javax.swing.*;
 import javax.swing.filechooser.FileNameExtensionFilter;
 import java.io.*;
 import java.util.concurrent.*;
 import javax.swing.filechooser.FileNameExtensionFilter;
 import java.io.*;
 import java.util.concurrent.*;

-import org.altusmetrum.altoslib_3.*;
-import org.altusmetrum.altosuilib_1.*;
+import org.altusmetrum.altoslib_4.*;
+import org.altusmetrum.altosuilib_2.*;

 
 public class AltosFlashUI
        extends AltosUIDialog
 
 public class AltosFlashUI
        extends AltosUIDialog

diff --git a/altosui/AltosFlightStatsTable.java b/altosui/AltosFlightStatsTable.java
index da71154eb3e4282b3148ea0ceaf9995aeb186982..e7a8e728f220fa36b481e7b44bbbcc3718cdf66f 100644 (file)
--- a/altosui/AltosFlightStatsTable.java
+++ b/altosui/AltosFlightStatsTable.java
@@ -19,7 +19,7 @@ package altosui;
 
 import java.awt.*;
 import javax.swing.*;
 
 import java.awt.*;
 import javax.swing.*;

-import org.altusmetrum.altoslib_3.*;
+import org.altusmetrum.altoslib_4.*;

 
 public class AltosFlightStatsTable extends JComponent {
        GridBagLayout   layout;
 
 public class AltosFlightStatsTable extends JComponent {
        GridBagLayout   layout;

diff --git a/altosui/AltosFlightStatus.java b/altosui/AltosFlightStatus.java
index b467bbdee4d8b2154dc7f134e4cb58354ecafea5..73b84f8d51cdd2dc59705cffafbc1a5a0e329284 100644 (file)
--- a/altosui/AltosFlightStatus.java
+++ b/altosui/AltosFlightStatus.java
@@ -19,7 +19,8 @@ package altosui;
 
 import java.awt.*;
 import javax.swing.*;
 
 import java.awt.*;
 import javax.swing.*;

-import org.altusmetrum.altoslib_3.*;
+import org.altusmetrum.altoslib_4.*;
+import org.altusmetrum.altosuilib_2.*;

 
 public class AltosFlightStatus extends JComponent implements AltosFlightDisplay {
        GridBagLayout   layout;
 
 public class AltosFlightStatus extends JComponent implements AltosFlightDisplay {
        GridBagLayout   layout;

diff --git a/altosui/AltosFlightStatusTableModel.java b/altosui/AltosFlightStatusTableModel.java
index e372d40197ade4bc31063fba71dc92e1d75f61c2..b33f40a4a9cbe760ea1ccc724c7c4782bc7dd290 100644 (file)
--- a/altosui/AltosFlightStatusTableModel.java
+++ b/altosui/AltosFlightStatusTableModel.java
@@ -27,7 +27,7 @@ import java.util.*;
 import java.text.*;
 import java.util.prefs.*;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.text.*;
 import java.util.prefs.*;
 import java.util.concurrent.LinkedBlockingQueue;

-import org.altusmetrum.altoslib_3.*;
+import org.altusmetrum.altoslib_4.*;

 
 public class AltosFlightStatusTableModel extends AbstractTableModel {
        private String[] columnNames = {
 
 public class AltosFlightStatusTableModel extends AbstractTableModel {
        private String[] columnNames = {

diff --git a/altosui/AltosFlightStatusUpdate.java b/altosui/AltosFlightStatusUpdate.java
index 93399a13791e2094fb6be49a658670821eac4ae8..0daec04e87d7c4ac7e952fc463f347f96162bcfa 100644 (file)
--- a/altosui/AltosFlightStatusUpdate.java
+++ b/altosui/AltosFlightStatusUpdate.java
@@ -18,7 +18,7 @@
 package altosui;
 
 import java.awt.event.*;
 package altosui;
 
 import java.awt.event.*;

-import org.altusmetrum.altoslib_3.*;
+import org.altusmetrum.altoslib_4.*;

 
 public class AltosFlightStatusUpdate implements ActionListener {
 
 
 public class AltosFlightStatusUpdate implements ActionListener {
 

diff --git a/altosui/AltosFlightUI.java b/altosui/AltosFlightUI.java
index b31de12c858ee6cf0f6c3a5ec10ce8051ef77bfc..2bd60d6c02e31c7680278748b1f1457be726a5b0 100644 (file)
--- a/altosui/AltosFlightUI.java
+++ b/altosui/AltosFlightUI.java
@@ -21,8 +21,8 @@ import java.awt.*;
 import java.awt.event.*;
 import javax.swing.*;
 import java.util.concurrent.*;
 import java.awt.event.*;
 import javax.swing.*;
 import java.util.concurrent.*;

-import org.altusmetrum.altoslib_3.*;
-import org.altusmetrum.altosuilib_1.*;
+import org.altusmetrum.altoslib_4.*;
+import org.altusmetrum.altosuilib_2.*;

 
 public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay, AltosFontListener {
        AltosVoice              voice;
 
 public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay, AltosFontListener {
        AltosVoice              voice;

diff --git a/altosui/AltosGraph.java b/altosui/AltosGraph.java
index d5c00247891394376fa0861d5adeb0b08bb388e5..ba3875c6d521ec5e2690783a537a37be4278d1e1 100644 (file)
--- a/altosui/AltosGraph.java
+++ b/altosui/AltosGraph.java
@@ -22,8 +22,8 @@ import java.util.ArrayList;
 
 import java.awt.*;
 import javax.swing.*;
 
 import java.awt.*;
 import javax.swing.*;

-import org.altusmetrum.altoslib_3.*;
-import org.altusmetrum.altosuilib_1.*;
+import org.altusmetrum.altoslib_4.*;
+import org.altusmetrum.altosuilib_2.*;

 
 import org.jfree.ui.*;
 import org.jfree.chart.*;
 
 import org.jfree.ui.*;
 import org.jfree.chart.*;

diff --git a/altosui/AltosGraphDataPoint.java b/altosui/AltosGraphDataPoint.java
index a0b0925cfb693cb8bec77d9d493191922fd1c913..06a9b62d0767c35169b5996521b130487d1aba65 100644 (file)
--- a/altosui/AltosGraphDataPoint.java
+++ b/altosui/AltosGraphDataPoint.java
@@ -17,8 +17,8 @@
 
 package altosui;
 
 
 package altosui;
 

-import org.altusmetrum.altosuilib_1.*;
-import org.altusmetrum.altoslib_3.*;
+import org.altusmetrum.altosuilib_2.*;
+import org.altusmetrum.altoslib_4.*;

 
 public class AltosGraphDataPoint implements AltosUIDataPoint {
 
 
 public class AltosGraphDataPoint implements AltosUIDataPoint {
 

diff --git a/altosui/AltosGraphDataSet.java b/altosui/AltosGraphDataSet.java
index d2773a3f8558c285436c02ad44e2e35d48ad76ba..a90c25636033bc487e4e9b49976f372d8db6c8cb 100644 (file)
--- a/altosui/AltosGraphDataSet.java
+++ b/altosui/AltosGraphDataSet.java
@@ -20,8 +20,8 @@ package altosui;
 import java.lang.*;
 import java.io.*;
 import java.util.*;
 import java.lang.*;
 import java.io.*;
 import java.util.*;

-import org.altusmetrum.altoslib_3.*;
-import org.altusmetrum.altosuilib_1.*;
+import org.altusmetrum.altoslib_4.*;
+import org.altusmetrum.altosuilib_2.*;

 
 class AltosGraphIterator implements Iterator<AltosUIDataPoint> {
        AltosGraphDataSet       dataSet;
 
 class AltosGraphIterator implements Iterator<AltosUIDataPoint> {
        AltosGraphDataSet       dataSet;

diff --git a/altosui/AltosGraphUI.java b/altosui/AltosGraphUI.java
index 92b9b94a36ecfbe05aa093032c4289dfbb2e8b25..33e12130ceba74561ed40f72a60a26cd2e44e23b 100644 (file)
--- a/altosui/AltosGraphUI.java
+++ b/altosui/AltosGraphUI.java
@@ -9,8 +9,8 @@ import java.util.ArrayList;
 
 import java.awt.*;
 import javax.swing.*;
 
 import java.awt.*;
 import javax.swing.*;

-import org.altusmetrum.altoslib_3.*;
-import org.altusmetrum.altosuilib_1.*;
+import org.altusmetrum.altoslib_4.*;
+import org.altusmetrum.altosuilib_2.*;

 
 import org.jfree.chart.ChartPanel;
 import org.jfree.chart.JFreeChart;
 
 import org.jfree.chart.ChartPanel;
 import org.jfree.chart.JFreeChart;

diff --git a/altosui/AltosIdleMonitorUI.java b/altosui/AltosIdleMonitorUI.java
index 7ca935b654ee4a0a66444a7196297f60dc97d1b0..62b5056811c9816da25d9060bf162350029aa7b5 100644 (file)
--- a/altosui/AltosIdleMonitorUI.java
+++ b/altosui/AltosIdleMonitorUI.java
@@ -24,8 +24,8 @@ import javax.swing.event.*;
 import java.io.*;
 import java.util.concurrent.*;
 import java.util.Arrays;
 import java.io.*;
 import java.util.concurrent.*;
 import java.util.Arrays;

-import org.altusmetrum.altoslib_3.*;
-import org.altusmetrum.altosuilib_1.*;
+import org.altusmetrum.altoslib_4.*;
+import org.altusmetrum.altosuilib_2.*;

 
 public class AltosIdleMonitorUI extends AltosUIFrame implements AltosFlightDisplay, AltosFontListener, AltosIdleMonitorListener, DocumentListener {
        AltosDevice             device;
 
 public class AltosIdleMonitorUI extends AltosUIFrame implements AltosFlightDisplay, AltosFontListener, AltosIdleMonitorListener, DocumentListener {
        AltosDevice             device;

diff --git a/altosui/AltosIgniteUI.java b/altosui/AltosIgniteUI.java
index 3028bb9c52125a3987024676d8212e771840ae8c..c251bbe219e90a92d7fbaf378c8c4e4ad9a677ac 100644 (file)
--- a/altosui/AltosIgniteUI.java
+++ b/altosui/AltosIgniteUI.java
@@ -24,8 +24,8 @@ import java.io.*;
 import java.text.*;
 import java.util.*;
 import java.util.concurrent.*;
 import java.text.*;
 import java.util.*;
 import java.util.concurrent.*;

-import org.altusmetrum.altoslib_3.*;
-import org.altusmetrum.altosuilib_1.*;
+import org.altusmetrum.altoslib_4.*;
+import org.altusmetrum.altosuilib_2.*;

 
 public class AltosIgniteUI
        extends AltosUIDialog
 
 public class AltosIgniteUI
        extends AltosUIDialog

diff --git a/altosui/AltosIgnitor.java b/altosui/AltosIgnitor.java
index fcab7427f3aa060c97a37b919e1db1ba4e6fc86a..7f79f42bfede9e08e8431a3a073e29d8ef688e59 100644 (file)
--- a/altosui/AltosIgnitor.java
+++ b/altosui/AltosIgnitor.java
@@ -19,7 +19,8 @@ package altosui;
 
 import java.awt.*;
 import javax.swing.*;
 
 import java.awt.*;
 import javax.swing.*;

-import org.altusmetrum.altoslib_3.*;
+import org.altusmetrum.altoslib_4.*;
+import org.altusmetrum.altosuilib_2.*;

 
 public class AltosIgnitor extends JComponent implements AltosFlightDisplay {
        GridBagLayout   layout;
 
 public class AltosIgnitor extends JComponent implements AltosFlightDisplay {
        GridBagLayout   layout;

diff --git a/altosui/AltosInfoTable.java b/altosui/AltosInfoTable.java
index 3242d65273a58b1bf5f4270ce4c9b0bd934d0003..125fa94c57cd3f7fb35b2ea590fe9f6d66f41def 100644 (file)
--- a/altosui/AltosInfoTable.java
+++ b/altosui/AltosInfoTable.java
@@ -20,7 +20,7 @@ package altosui;
 import java.awt.*;
 import javax.swing.*;
 import javax.swing.table.*;
 import java.awt.*;
 import javax.swing.*;
 import javax.swing.table.*;

-import org.altusmetrum.altoslib_3.*;
+import org.altusmetrum.altoslib_4.*;

 
 public class AltosInfoTable extends JTable {
        private AltosFlightInfoTableModel model;
 
 public class AltosInfoTable extends JTable {
        private AltosFlightInfoTableModel model;

diff --git a/altosui/AltosLanded.java b/altosui/AltosLanded.java
index 25d768adc8713a4dafcf511912578342b6e3f553..707d8fccb38414d3dd9d5fb96675853e88735f50 100644 (file)
--- a/altosui/AltosLanded.java
+++ b/altosui/AltosLanded.java
@@ -21,7 +21,8 @@ import java.awt.*;
 import java.awt.event.*;
 import javax.swing.*;
 import java.io.*;
 import java.awt.event.*;
 import javax.swing.*;
 import java.io.*;

-import org.altusmetrum.altoslib_3.*;
+import org.altusmetrum.altoslib_4.*;
+import org.altusmetrum.altosuilib_2.*;

 
 public class AltosLanded extends JComponent implements AltosFlightDisplay, ActionListener {
        GridBagLayout   layout;
 
 public class AltosLanded extends JComponent implements AltosFlightDisplay, ActionListener {
        GridBagLayout   layout;

diff --git a/altosui/AltosLaunch.java b/altosui/AltosLaunch.java
index 04948ee6647baedbe1222ec9b4f96ceba85ca28e..9ac1e44c3a11b0fd1c88a6a03f244a56982a7048 100644 (file)
--- a/altosui/AltosLaunch.java
+++ b/altosui/AltosLaunch.java
@@ -20,7 +20,7 @@ package altosui;
 import java.io.*;
 import java.util.concurrent.*;
 import java.awt.*;
 import java.io.*;
 import java.util.concurrent.*;
 import java.awt.*;

-import org.altusmetrum.altosuilib_1.*;
+import org.altusmetrum.altosuilib_2.*;

 
 public class AltosLaunch {
        AltosDevice     device;
 
 public class AltosLaunch {
        AltosDevice     device;

diff --git a/altosui/AltosLaunchUI.java b/altosui/AltosLaunchUI.java
index 4d9fbda563c552c86331524a860d7bdaab584060..cc082542b6f853543e998d20b68258b1171634fd 100644 (file)
--- a/altosui/AltosLaunchUI.java
+++ b/altosui/AltosLaunchUI.java
@@ -23,7 +23,7 @@ import javax.swing.*;
 import java.io.*;
 import java.text.*;
 import java.util.concurrent.*;
 import java.io.*;
 import java.text.*;
 import java.util.concurrent.*;

-import org.altusmetrum.altosuilib_1.*;
+import org.altusmetrum.altosuilib_2.*;

 
 class FireButton extends JButton {
        protected void processMouseEvent(MouseEvent e) {
 
 class FireButton extends JButton {
        protected void processMouseEvent(MouseEvent e) {

diff --git a/altosui/AltosPad.java b/altosui/AltosPad.java
index 2844b32c4cae523c24d293e6d8735c1cefc783a0..a6ac70db5efc9de4d582de91df0f1f7722dfa509 100644 (file)
--- a/altosui/AltosPad.java
+++ b/altosui/AltosPad.java
@@ -19,7 +19,8 @@ package altosui;
 
 import java.awt.*;
 import javax.swing.*;
 
 import java.awt.*;
 import javax.swing.*;

-import org.altusmetrum.altoslib_3.*;
+import org.altusmetrum.altoslib_4.*;
+import org.altusmetrum.altosuilib_2.*;

 
 public class AltosPad extends JComponent implements AltosFlightDisplay {
        GridBagLayout   layout;
 
 public class AltosPad extends JComponent implements AltosFlightDisplay {
        GridBagLayout   layout;

diff --git a/altosui/AltosRomconfigUI.java b/altosui/AltosRomconfigUI.java
index 899946790f2649db585e6e806d5c2bc8f8250a79..d2fe54d94d9a7f395c189bbc67993835060770e7 100644 (file)
--- a/altosui/AltosRomconfigUI.java
+++ b/altosui/AltosRomconfigUI.java
@@ -20,8 +20,8 @@ package altosui;
 import java.awt.*;
 import java.awt.event.*;
 import javax.swing.*;
 import java.awt.*;
 import java.awt.event.*;
 import javax.swing.*;

-import org.altusmetrum.altoslib_3.*;
-import org.altusmetrum.altosuilib_1.*;
+import org.altusmetrum.altoslib_4.*;
+import org.altusmetrum.altosuilib_2.*;

 
 public class AltosRomconfigUI
        extends AltosUIDialog
 
 public class AltosRomconfigUI
        extends AltosUIDialog

diff --git a/altosui/AltosScanUI.java b/altosui/AltosScanUI.java
index 5cc74a7796b6a91cad6068b1d6ff3f0f3938b05d..1f1f59ad1166dc0942bed57aa983e3be434e12d0 100644 (file)
--- a/altosui/AltosScanUI.java
+++ b/altosui/AltosScanUI.java
@@ -25,8 +25,8 @@ import java.io.*;
 import java.util.*;
 import java.text.*;
 import java.util.concurrent.*;
 import java.util.*;
 import java.text.*;
 import java.util.concurrent.*;

-import org.altusmetrum.altoslib_3.*;
-import org.altusmetrum.altosuilib_1.*;
+import org.altusmetrum.altoslib_4.*;
+import org.altusmetrum.altosuilib_2.*;

 
 class AltosScanResult {
        String          callsign;
 
 class AltosScanResult {
        String          callsign;

diff --git a/altosui/AltosSerial.java b/altosui/AltosSerial.java
index 2c5d2dfd3104fbaf7107e673ecd8b56629587397..9b2180baf6fea2a2ee1f4db343f9ae0155cbe350 100644 (file)
--- a/altosui/AltosSerial.java
+++ b/altosui/AltosSerial.java
@@ -25,8 +25,8 @@ import java.io.*;
 import java.util.*;
 import java.awt.*;
 import javax.swing.*;
 import java.util.*;
 import java.awt.*;
 import javax.swing.*;

-import org.altusmetrum.altoslib_3.*;
-import org.altusmetrum.altosuilib_1.*;
+import org.altusmetrum.altoslib_4.*;
+import org.altusmetrum.altosuilib_2.*;

 
 import libaltosJNI.*;
 
 
 import libaltosJNI.*;
 

diff --git a/altosui/AltosSerialInUseException.java b/altosui/AltosSerialInUseException.java
index b45d91578d136824aec863fc19bd868e81b895ba..318155c8cb28cf5215637b3d5ba9ccbc78e43b46 100644 (file)
--- a/altosui/AltosSerialInUseException.java
+++ b/altosui/AltosSerialInUseException.java
@@ -16,7 +16,7 @@
  */
 
 package altosui;
  */
 
 package altosui;

-import org.altusmetrum.altosuilib_1.*;
+import org.altusmetrum.altosuilib_2.*;

 
 public class AltosSerialInUseException extends Exception {
        public AltosDevice      device;
 
 public class AltosSerialInUseException extends Exception {
        public AltosDevice      device;

diff --git a/altosui/AltosUI.java b/altosui/AltosUI.java
index a1bc83bf11c28c40fe2545f7e5dcd8691f37f277..9df02ec93dd58d7d825c6d34de85e94b3794f5db 100644 (file)
--- a/altosui/AltosUI.java
+++ b/altosui/AltosUI.java
@@ -22,8 +22,8 @@ import java.awt.event.*;
 import javax.swing.*;
 import java.io.*;
 import java.util.concurrent.*;
 import javax.swing.*;
 import java.io.*;
 import java.util.concurrent.*;

-import org.altusmetrum.altoslib_3.*;
-import org.altusmetrum.altosuilib_1.*;
+import org.altusmetrum.altoslib_4.*;
+import org.altusmetrum.altosuilib_2.*;

 
 public class AltosUI extends AltosUIFrame {
        public AltosVoice voice = new AltosVoice();
 
 public class AltosUI extends AltosUIFrame {
        public AltosVoice voice = new AltosVoice();

diff --git a/altosui/AltosUIPreferencesBackend.java b/altosui/AltosUIPreferencesBackend.java
index f85735e8de583969a51839e45ffae97c80b3095f..280470866a4f22df99e45ca6de87158be04991ff 100644 (file)
--- a/altosui/AltosUIPreferencesBackend.java
+++ b/altosui/AltosUIPreferencesBackend.java
@@ -19,7 +19,7 @@ package altosui;
 
 import java.io.File;
 import java.util.prefs.*;
 
 import java.io.File;
 import java.util.prefs.*;

-import org.altusmetrum.altoslib_3.*;
+import org.altusmetrum.altoslib_4.*;

 import javax.swing.filechooser.FileSystemView;
 
 public class AltosUIPreferencesBackend implements AltosPreferencesBackend {
 import javax.swing.filechooser.FileSystemView;
 
 public class AltosUIPreferencesBackend implements AltosPreferencesBackend {

diff --git a/altosuilib/AltosDevice.java b/altosuilib/AltosDevice.java
index 2461df1b08f8f04bb519e020750d637453c8467d..251ae994cb21087c417ebd31ae8e96061289bb8e 100644 (file)
--- a/altosuilib/AltosDevice.java
+++ b/altosuilib/AltosDevice.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 

-package org.altusmetrum.altosuilib_1;
+package org.altusmetrum.altosuilib_2;

 
 import libaltosJNI.*;
 
 
 import libaltosJNI.*;
 

diff --git a/altosuilib/AltosDeviceDialog.java b/altosuilib/AltosDeviceDialog.java
index 7fb23e137002c8b3b665f40d39e7755e882ca7c4..0bedea97b75019ea597cf160a493491fb8ffae7f 100644 (file)
--- a/altosuilib/AltosDeviceDialog.java
+++ b/altosuilib/AltosDeviceDialog.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 

-package org.altusmetrum.altosuilib_1;
+package org.altusmetrum.altosuilib_2;

 
 import javax.swing.*;
 import java.awt.*;
 
 import javax.swing.*;
 import java.awt.*;

diff --git a/altosuilib/AltosFontListener.java b/altosuilib/AltosFontListener.java
index da9033525976225311d84822f292c67656ec7c18..a98cc13179c1122f7bfd0ab0a9f7d121172d6b3d 100644 (file)
--- a/altosuilib/AltosFontListener.java
+++ b/altosuilib/AltosFontListener.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 

-package org.altusmetrum.altosuilib_1;
+package org.altusmetrum.altosuilib_2;

 
 public interface AltosFontListener {
        void font_size_changed(int font_size);
 
 public interface AltosFontListener {
        void font_size_changed(int font_size);

diff --git a/altosuilib/AltosPositionListener.java b/altosuilib/AltosPositionListener.java
index e75d2de566a9bdcb009e80ab14a1656aaf01c930..34cf1650179cb3e95aad061fb56d0679fa06f6ab 100644 (file)
--- a/altosuilib/AltosPositionListener.java
+++ b/altosuilib/AltosPositionListener.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 

-package org.altusmetrum.altosuilib_1;
+package org.altusmetrum.altosuilib_2;

 
 public interface AltosPositionListener {
        public void position_changed(int position);
 
 public interface AltosPositionListener {
        public void position_changed(int position);

diff --git a/altosuilib/AltosUIAxis.java b/altosuilib/AltosUIAxis.java
index 7bc2def9826c35fe1d509be73e3585c3dc769c39..74561673fde97f92cb53eee15353d3765259b5a3 100644 (file)
--- a/altosuilib/AltosUIAxis.java
+++ b/altosuilib/AltosUIAxis.java
@@ -15,14 +15,14 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 

-package org.altusmetrum.altosuilib_1;
+package org.altusmetrum.altosuilib_2;

 
 import java.io.*;
 import java.util.ArrayList;
 
 import java.awt.*;
 import javax.swing.*;
 
 import java.io.*;
 import java.util.ArrayList;
 
 import java.awt.*;
 import javax.swing.*;

-import org.altusmetrum.altoslib_3.*;
+import org.altusmetrum.altoslib_4.*;

 
 import org.jfree.ui.*;
 import org.jfree.chart.*;
 
 import org.jfree.ui.*;
 import org.jfree.chart.*;

diff --git a/altosuilib/AltosUIConfigure.java b/altosuilib/AltosUIConfigure.java
index 153eb8eec2558d5339ee58f336836426c28d9e15..ae7626ded1055b9fc2155056c2bb9c8065e451ff 100644 (file)
--- a/altosuilib/AltosUIConfigure.java
+++ b/altosuilib/AltosUIConfigure.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 

-package org.altusmetrum.altosuilib_1;
+package org.altusmetrum.altosuilib_2;

 
 import java.awt.*;
 import java.awt.event.*;
 
 import java.awt.*;
 import java.awt.event.*;

diff --git a/altosuilib/AltosUIDataMissing.java b/altosuilib/AltosUIDataMissing.java
index c7b01859532bccc2a5026e5453574a2bc920dd6c..353ff30ff308b4b33117a37ad4234099c6614ff3 100644 (file)
--- a/altosuilib/AltosUIDataMissing.java
+++ b/altosuilib/AltosUIDataMissing.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 

-package org.altusmetrum.altosuilib_1;
+package org.altusmetrum.altosuilib_2;

 
 public class AltosUIDataMissing extends Exception {
        public int      id;
 
 public class AltosUIDataMissing extends Exception {
        public int      id;

diff --git a/altosuilib/AltosUIDataPoint.java b/altosuilib/AltosUIDataPoint.java
index d3020410c2348614893a774f7ff2ae42017a52d6..3f16500e1d17ce5d619ca1225b702ff7e437f859 100644 (file)
--- a/altosuilib/AltosUIDataPoint.java
+++ b/altosuilib/AltosUIDataPoint.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 

-package org.altusmetrum.altosuilib_1;
+package org.altusmetrum.altosuilib_2;

 
 public interface AltosUIDataPoint {
        public abstract double x() throws AltosUIDataMissing;
 
 public interface AltosUIDataPoint {
        public abstract double x() throws AltosUIDataMissing;

diff --git a/altosuilib/AltosUIDataSet.java b/altosuilib/AltosUIDataSet.java
index 6f23ef9a606ba924135e20a81962c5e5c88b03df..ee70a3fd6a57ac52f013bc47c51dcff00e30280c 100644 (file)
--- a/altosuilib/AltosUIDataSet.java
+++ b/altosuilib/AltosUIDataSet.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 

-package org.altusmetrum.altosuilib_1;
+package org.altusmetrum.altosuilib_2;

 
 public interface AltosUIDataSet {
        public abstract String name();
 
 public interface AltosUIDataSet {
        public abstract String name();

diff --git a/altosuilib/AltosUIDialog.java b/altosuilib/AltosUIDialog.java
index e1e699a78cd4e66adae92c0eea170b168410d07b..dc737414532718a14c236925f0ce442be200ed2c 100644 (file)
--- a/altosuilib/AltosUIDialog.java
+++ b/altosuilib/AltosUIDialog.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 

-package org.altusmetrum.altosuilib_1;
+package org.altusmetrum.altosuilib_2;

 
 import java.awt.*;
 import java.awt.event.*;
 
 import java.awt.*;
 import java.awt.event.*;

diff --git a/altosuilib/AltosUIEnable.java b/altosuilib/AltosUIEnable.java
index 40b5f0877175d5f4906d7aefcd11146a197b2b58..8d42c09bfa2791a7267ee3162f0e84f8da17818a 100644 (file)
--- a/altosuilib/AltosUIEnable.java
+++ b/altosuilib/AltosUIEnable.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 

-package org.altusmetrum.altosuilib_1;
+package org.altusmetrum.altosuilib_2;

 
 import java.awt.*;
 import java.awt.event.*;
 
 import java.awt.*;
 import java.awt.event.*;


@@ -23,7 +23,7 @@ import javax.swing.*;
 import java.io.*;
 import java.util.concurrent.*;
 import java.util.*;
 import java.io.*;
 import java.util.concurrent.*;
 import java.util.*;

-import org.altusmetrum.altoslib_3.*;
+import org.altusmetrum.altoslib_4.*;

 
 import org.jfree.ui.*;
 import org.jfree.chart.*;
 
 import org.jfree.ui.*;
 import org.jfree.chart.*;

diff --git a/altosuilib/AltosUIFrame.java b/altosuilib/AltosUIFrame.java
index 3dc2a0ad3f43e8d8110e0605b89d825589e227ad..ce86ad83fbab32aa4e0aac012cff79d807ef3f5d 100644 (file)
--- a/altosuilib/AltosUIFrame.java
+++ b/altosuilib/AltosUIFrame.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 

-package org.altusmetrum.altosuilib_1;
+package org.altusmetrum.altosuilib_2;

 
 import java.awt.*;
 import java.awt.event.*;
 
 import java.awt.*;
 import java.awt.event.*;

diff --git a/altosuilib/AltosUIGraph.java b/altosuilib/AltosUIGraph.java
index 21e13cf645353e425bb1ce982b505bcb32cebc97..909c471ba4b4c8c6cd32ecb66f36238b45a8cc5c 100644 (file)
--- a/altosuilib/AltosUIGraph.java
+++ b/altosuilib/AltosUIGraph.java
@@ -15,14 +15,14 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 

-package org.altusmetrum.altosuilib_1;
+package org.altusmetrum.altosuilib_2;

 
 import java.io.*;
 import java.util.ArrayList;
 
 import java.awt.*;
 import javax.swing.*;
 
 import java.io.*;
 import java.util.ArrayList;
 
 import java.awt.*;
 import javax.swing.*;

-import org.altusmetrum.altoslib_3.*;
+import org.altusmetrum.altoslib_4.*;

 
 import org.jfree.ui.*;
 import org.jfree.chart.*;
 
 import org.jfree.ui.*;
 import org.jfree.chart.*;

diff --git a/altosuilib/AltosUIGrapher.java b/altosuilib/AltosUIGrapher.java
index 54f8d5a9b869995cff379342c4d0afe891ede2ac..724fac18de3a9ef39bfb89b8920c81e039fe3e9d 100644 (file)
--- a/altosuilib/AltosUIGrapher.java
+++ b/altosuilib/AltosUIGrapher.java
@@ -15,14 +15,14 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 

-package org.altusmetrum.altosuilib_1;
+package org.altusmetrum.altosuilib_2;

 
 import java.io.*;
 import java.util.ArrayList;
 
 import java.awt.*;
 import javax.swing.*;
 
 import java.io.*;
 import java.util.ArrayList;
 
 import java.awt.*;
 import javax.swing.*;

-import org.altusmetrum.altoslib_3.*;
+import org.altusmetrum.altoslib_4.*;

 
 import org.jfree.ui.*;
 import org.jfree.chart.*;
 
 import org.jfree.ui.*;
 import org.jfree.chart.*;

diff --git a/altosuilib/AltosUILib.java b/altosuilib/AltosUILib.java
index 76782e2e565743072940d96f63c6f90cbfe9793e..b51c5963314a41dc57d794a86e99b66d26d905c2 100644 (file)
--- a/altosuilib/AltosUILib.java
+++ b/altosuilib/AltosUILib.java
@@ -15,12 +15,12 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 

-package org.altusmetrum.altosuilib_1;
+package org.altusmetrum.altosuilib_2;

 
 import java.awt.*;
 import libaltosJNI.*;
 
 
 import java.awt.*;
 import libaltosJNI.*;
 

-import org.altusmetrum.altoslib_3.*;
+import org.altusmetrum.altoslib_4.*;

 
 public class AltosUILib extends AltosLib {
 
 
 public class AltosUILib extends AltosLib {
 

diff --git a/altosuilib/AltosUIListener.java b/altosuilib/AltosUIListener.java
index 450dc0bfc8701fb2b51152b035563932d8af064c..75a0ad949cc7e6b1555acae2874777f7792d29e6 100644 (file)
--- a/altosuilib/AltosUIListener.java
+++ b/altosuilib/AltosUIListener.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 

-package org.altusmetrum.altosuilib_1;
+package org.altusmetrum.altosuilib_2;

 
 public interface AltosUIListener {
        public void ui_changed(String look_and_feel);
 
 public interface AltosUIListener {
        public void ui_changed(String look_and_feel);

diff --git a/altosuilib/AltosUIMarker.java b/altosuilib/AltosUIMarker.java
index efd279219772df54a1bf334b431d85f0d631a405..cd6fa589a90dbc33593f4a92347c972f2168aa0e 100644 (file)
--- a/altosuilib/AltosUIMarker.java
+++ b/altosuilib/AltosUIMarker.java
@@ -15,14 +15,14 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 

-package org.altusmetrum.altosuilib_1;
+package org.altusmetrum.altosuilib_2;

 
 import java.io.*;
 import java.util.ArrayList;
 
 import java.awt.*;
 import javax.swing.*;
 
 import java.io.*;
 import java.util.ArrayList;
 
 import java.awt.*;
 import javax.swing.*;

-import org.altusmetrum.altoslib_3.*;
+import org.altusmetrum.altoslib_4.*;

 
 import org.jfree.ui.*;
 import org.jfree.chart.*;
 
 import org.jfree.ui.*;
 import org.jfree.chart.*;

diff --git a/altosuilib/AltosUIPreferences.java b/altosuilib/AltosUIPreferences.java
index 4c995f80848a15bfd7033e64bcaf54df25a0964f..7a582a7d5d3d25bb84f77dd3159a1402378aaabf 100644 (file)
--- a/altosuilib/AltosUIPreferences.java
+++ b/altosuilib/AltosUIPreferences.java
@@ -15,13 +15,13 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 

-package org.altusmetrum.altosuilib_1;
+package org.altusmetrum.altosuilib_2;

 
 import java.io.*;
 import java.util.*;
 import java.awt.Component;
 import javax.swing.*;
 
 import java.io.*;
 import java.util.*;
 import java.awt.Component;
 import javax.swing.*;

-import org.altusmetrum.altoslib_3.*;
+import org.altusmetrum.altoslib_4.*;

 
 public class AltosUIPreferences extends AltosPreferences {
 
 
 public class AltosUIPreferences extends AltosPreferences {
 

diff --git a/altosuilib/AltosUIPreferencesBackend.java b/altosuilib/AltosUIPreferencesBackend.java
index d6575717d1de312168b1c34b4dd0a4d9b42d3428..da29253dc9e57149eb8c6da774f18df865c70f64 100644 (file)
--- a/altosuilib/AltosUIPreferencesBackend.java
+++ b/altosuilib/AltosUIPreferencesBackend.java
@@ -15,11 +15,11 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 

-package org.altusmetrum.altosuilib_1;
+package org.altusmetrum.altosuilib_2;

 
 import java.io.File;
 import java.util.prefs.*;
 
 import java.io.File;
 import java.util.prefs.*;

-import org.altusmetrum.altoslib_3.*;
+import org.altusmetrum.altoslib_4.*;

 import javax.swing.filechooser.FileSystemView;
 
 public class AltosUIPreferencesBackend implements AltosPreferencesBackend {
 import javax.swing.filechooser.FileSystemView;
 
 public class AltosUIPreferencesBackend implements AltosPreferencesBackend {

diff --git a/altosuilib/AltosUISeries.java b/altosuilib/AltosUISeries.java
index 10ea161458b5e260d48667f664f3ba9a49c46d61..b0632d18937bb2840efbb2cc7fd2c522e59f4f7c 100644 (file)
--- a/altosuilib/AltosUISeries.java
+++ b/altosuilib/AltosUISeries.java
@@ -15,14 +15,14 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 

-package org.altusmetrum.altosuilib_1;
+package org.altusmetrum.altosuilib_2;

 
 import java.io.*;
 import java.util.ArrayList;
 
 import java.awt.*;
 import javax.swing.*;
 
 import java.io.*;
 import java.util.ArrayList;
 
 import java.awt.*;
 import javax.swing.*;

-import org.altusmetrum.altoslib_3.*;
+import org.altusmetrum.altoslib_4.*;

 
 import org.jfree.ui.*;
 import org.jfree.chart.*;
 
 import org.jfree.ui.*;
 import org.jfree.chart.*;

diff --git a/altosuilib/AltosUIVersion.java.in b/altosuilib/AltosUIVersion.java.in
index 169cca1b91c8997edcc281298b2481ced3888d06..3f6295609514e88f2eb2c5bc1200b347afda8d0a 100644 (file)
--- a/altosuilib/AltosUIVersion.java.in
+++ b/altosuilib/AltosUIVersion.java.in
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 

-package org.altusmetrum.altosuilib_1;
+package org.altusmetrum.altosuilib_2;

 
 public class AltosUIVersion {
        public final static String version = "@VERSION@";
 
 public class AltosUIVersion {
        public final static String version = "@VERSION@";

diff --git a/altosuilib/AltosUSBDevice.java b/altosuilib/AltosUSBDevice.java
index 4f329840bdbe88aba6b33305ee43a9e808b8e405..b70b5e83bd18911da0862c79c97df48dba93f53f 100644 (file)
--- a/altosuilib/AltosUSBDevice.java
+++ b/altosuilib/AltosUSBDevice.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 

-package org.altusmetrum.altosuilib_1;
+package org.altusmetrum.altosuilib_2;

 
 import java.util.*;
 import libaltosJNI.*;
 
 import java.util.*;
 import libaltosJNI.*;

diff --git a/configure.ac b/configure.ac
index 01867e9f1da18d2798cbb6915c09f09529b1fb41..d2d87754f3fcca52f53d38024edaa6fdcebadcc6 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -29,8 +29,8 @@ AC_SUBST(VERSION_DASH)
 dnl ==========================================================================
 dnl Java library versions
 
 dnl ==========================================================================
 dnl Java library versions
 

-ALTOSUILIB_VERSION=1
-ALTOSLIB_VERSION=3
+ALTOSUILIB_VERSION=2
+ALTOSLIB_VERSION=4

 
 AC_SUBST(ALTOSLIB_VERSION)
 AC_DEFINE(ALTOSLIB_VERSION,$ALTOSLIB_VERSION,[Version of the AltosLib package])
 
 AC_SUBST(ALTOSLIB_VERSION)
 AC_DEFINE(ALTOSLIB_VERSION,$ALTOSLIB_VERSION,[Version of the AltosLib package])

diff --git a/micropeak/MicroData.java b/micropeak/MicroData.java
index e786ff1ed136de4e6800feb1263094f38af42a30..ca211f16ee33553edfc102a71741582d817ee226 100644 (file)
--- a/micropeak/MicroData.java
+++ b/micropeak/MicroData.java
@@ -20,8 +20,8 @@ package org.altusmetrum.micropeak;
 import java.lang.*;
 import java.io.*;
 import java.util.*;
 import java.lang.*;
 import java.io.*;
 import java.util.*;

-import org.altusmetrum.altoslib_3.*;
-import org.altusmetrum.altosuilib_1.*;
+import org.altusmetrum.altoslib_4.*;
+import org.altusmetrum.altosuilib_2.*;

 
 class MicroIterator implements Iterator<MicroDataPoint> {
        int             i;
 
 class MicroIterator implements Iterator<MicroDataPoint> {
        int             i;

diff --git a/micropeak/MicroDataPoint.java b/micropeak/MicroDataPoint.java
index 61faf794e1edb10a51339726f3716a7a46230563..5a5e8c372c2d6788cad7be180e784ab0f984fd50 100644 (file)
--- a/micropeak/MicroDataPoint.java
+++ b/micropeak/MicroDataPoint.java
@@ -17,7 +17,7 @@
 
 package org.altusmetrum.micropeak;
 
 
 package org.altusmetrum.micropeak;
 

-import org.altusmetrum.altosuilib_1.*;
+import org.altusmetrum.altosuilib_2.*;

 
 public class MicroDataPoint implements AltosUIDataPoint {
        public double           time;
 
 public class MicroDataPoint implements AltosUIDataPoint {
        public double           time;

diff --git a/micropeak/MicroDeviceDialog.java b/micropeak/MicroDeviceDialog.java
index 533605d6e2a353827ead217c76119460e10836ed..305421a7b377ac45f2833ba11216baf1c3f95db9 100644 (file)
--- a/micropeak/MicroDeviceDialog.java
+++ b/micropeak/MicroDeviceDialog.java
@@ -21,7 +21,7 @@ import javax.swing.*;
 import java.awt.*;
 import java.awt.event.*;
 import java.util.*;
 import java.awt.*;
 import java.awt.event.*;
 import java.util.*;

-import org.altusmetrum.altosuilib_1.*;
+import org.altusmetrum.altosuilib_2.*;

 
 public class MicroDeviceDialog extends AltosDeviceDialog {
 
 
 public class MicroDeviceDialog extends AltosDeviceDialog {
 

diff --git a/micropeak/MicroDownload.java b/micropeak/MicroDownload.java
index 7d2e9eb4b1f42c711eca1f4c6cc1c44e2fd9a05f..1c70e1d1515da21cc94aa9bc951ea9cc123cde94 100644 (file)
--- a/micropeak/MicroDownload.java
+++ b/micropeak/MicroDownload.java
@@ -23,8 +23,8 @@ import javax.swing.*;
 import java.io.*;
 import java.util.concurrent.*;
 import java.util.*;
 import java.io.*;
 import java.util.concurrent.*;
 import java.util.*;

-import org.altusmetrum.altoslib_3.*;
-import org.altusmetrum.altosuilib_1.*;
+import org.altusmetrum.altoslib_4.*;
+import org.altusmetrum.altosuilib_2.*;

 
 public class MicroDownload extends AltosUIDialog implements Runnable, ActionListener, MicroSerialLog, WindowListener {
        MicroPeak       owner;
 
 public class MicroDownload extends AltosUIDialog implements Runnable, ActionListener, MicroSerialLog, WindowListener {
        MicroPeak       owner;

diff --git a/micropeak/MicroExport.java b/micropeak/MicroExport.java
index c170f544a45a08eded6c93524cefd793b5c5ac87..87d5499b70417d5e91c6cc906a856f3705698250 100644 (file)
--- a/micropeak/MicroExport.java
+++ b/micropeak/MicroExport.java
@@ -23,8 +23,8 @@ import java.util.ArrayList;
 import java.awt.*;
 import javax.swing.*;
 import javax.swing.filechooser.FileNameExtensionFilter;
 import java.awt.*;
 import javax.swing.*;
 import javax.swing.filechooser.FileNameExtensionFilter;

-import org.altusmetrum.altoslib_3.*;
-import org.altusmetrum.altosuilib_1.*;
+import org.altusmetrum.altoslib_4.*;
+import org.altusmetrum.altosuilib_2.*;

 
 public class MicroExport extends JFileChooser {
 
 
 public class MicroExport extends JFileChooser {
 

diff --git a/micropeak/MicroFile.java b/micropeak/MicroFile.java
index b6a9d4013756e4aed96786ad829cdec275e2ee8d..019346aef29637baaafec278776bfc3a8aa55f84 100644 (file)
--- a/micropeak/MicroFile.java
+++ b/micropeak/MicroFile.java
@@ -19,8 +19,8 @@ package org.altusmetrum.micropeak;
 
 import java.io.*;
 import java.util.*;
 
 import java.io.*;
 import java.util.*;

-import org.altusmetrum.altoslib_3.*;
-import org.altusmetrum.altosuilib_1.*;
+import org.altusmetrum.altoslib_4.*;
+import org.altusmetrum.altosuilib_2.*;

 
 public class MicroFile {
 
 
 public class MicroFile {
 

diff --git a/micropeak/MicroFileChooser.java b/micropeak/MicroFileChooser.java
index 595d1ff7dfad39df3966af0fbb610268bbdb223a..00b6690a37858de5f231315a906667375666c2ac 100644 (file)
--- a/micropeak/MicroFileChooser.java
+++ b/micropeak/MicroFileChooser.java
@@ -20,8 +20,8 @@ package org.altusmetrum.micropeak;
 import javax.swing.*;
 import javax.swing.filechooser.FileNameExtensionFilter;
 import java.io.*;
 import javax.swing.*;
 import javax.swing.filechooser.FileNameExtensionFilter;
 import java.io.*;

-import org.altusmetrum.altoslib_3.*;
-import org.altusmetrum.altosuilib_1.*;
+import org.altusmetrum.altoslib_4.*;
+import org.altusmetrum.altosuilib_2.*;

 
 public class MicroFileChooser extends JFileChooser {
        JFrame  frame;
 
 public class MicroFileChooser extends JFileChooser {
        JFrame  frame;

diff --git a/micropeak/MicroFrame.java b/micropeak/MicroFrame.java
index ef8b24cc3a370c88676d6dd4792919453cd56d7b..5bfe5bf7bd18e30851b01153568909bfeced6231 100644 (file)
--- a/micropeak/MicroFrame.java
+++ b/micropeak/MicroFrame.java
@@ -21,7 +21,7 @@ import java.awt.*;
 import java.awt.event.*;
 import javax.swing.*;
 import java.util.*;
 import java.awt.event.*;
 import javax.swing.*;
 import java.util.*;

-import org.altusmetrum.altosuilib_1.*;
+import org.altusmetrum.altosuilib_2.*;

 
 public class MicroFrame extends AltosUIFrame {
        static String[] micro_icon_names = {
 
 public class MicroFrame extends AltosUIFrame {
        static String[] micro_icon_names = {

diff --git a/micropeak/MicroGraph.java b/micropeak/MicroGraph.java
index 5960fe4dfbfc7cfce2a500bfff951997e0357785..f99689197ffa649ba95f70395965eddad149b8f0 100644 (file)
--- a/micropeak/MicroGraph.java
+++ b/micropeak/MicroGraph.java
@@ -22,8 +22,8 @@ import java.util.ArrayList;
 
 import java.awt.*;
 import javax.swing.*;
 
 import java.awt.*;
 import javax.swing.*;

-import org.altusmetrum.altoslib_3.*;
-import org.altusmetrum.altosuilib_1.*;
+import org.altusmetrum.altoslib_4.*;
+import org.altusmetrum.altosuilib_2.*;

 
 import org.jfree.ui.*;
 import org.jfree.chart.*;
 
 import org.jfree.ui.*;
 import org.jfree.chart.*;

diff --git a/micropeak/MicroPeak.java b/micropeak/MicroPeak.java
index 78bc857ec2818746a3fc9f05a5b5d97556286ce0..19e91660d6226017cddef42640a748108d2e60e4 100644 (file)
--- a/micropeak/MicroPeak.java
+++ b/micropeak/MicroPeak.java
@@ -23,8 +23,8 @@ import javax.swing.*;
 import java.io.*;
 import java.util.concurrent.*;
 import java.util.*;
 import java.io.*;
 import java.util.concurrent.*;
 import java.util.*;

-import org.altusmetrum.altoslib_3.*;
-import org.altusmetrum.altosuilib_1.*;
+import org.altusmetrum.altoslib_4.*;
+import org.altusmetrum.altosuilib_2.*;

 
 public class MicroPeak extends MicroFrame implements ActionListener, ItemListener {
 
 
 public class MicroPeak extends MicroFrame implements ActionListener, ItemListener {
 

diff --git a/micropeak/MicroRaw.java b/micropeak/MicroRaw.java
index d64da387c27e6530b91f2ae6cafe7f5c4ad687e7..26d62012982f097df604e45a93a0249edc0f402d 100644 (file)
--- a/micropeak/MicroRaw.java
+++ b/micropeak/MicroRaw.java
@@ -20,8 +20,8 @@ package org.altusmetrum.micropeak;
 import java.awt.*;
 import java.io.*;
 import javax.swing.*;
 import java.awt.*;
 import java.io.*;
 import javax.swing.*;

-import org.altusmetrum.altoslib_3.*;
-import org.altusmetrum.altosuilib_1.*;
+import org.altusmetrum.altoslib_4.*;
+import org.altusmetrum.altosuilib_2.*;

 
 public class MicroRaw extends JTextArea {
 
 
 public class MicroRaw extends JTextArea {
 

diff --git a/micropeak/MicroSave.java b/micropeak/MicroSave.java
index 0addfa8861c8008eacec07e8abf7bd076aea7908..7c5d6abe99dcfb093d848d7e266237fe90126707 100644 (file)
--- a/micropeak/MicroSave.java
+++ b/micropeak/MicroSave.java
@@ -24,8 +24,8 @@ import javax.swing.filechooser.FileNameExtensionFilter;
 import java.io.*;
 import java.util.concurrent.*;
 import java.util.*;
 import java.io.*;
 import java.util.concurrent.*;
 import java.util.*;

-import org.altusmetrum.altoslib_3.*;
-import org.altusmetrum.altosuilib_1.*;
+import org.altusmetrum.altoslib_4.*;
+import org.altusmetrum.altosuilib_2.*;

 
 public class MicroSave extends JFileChooser {
 
 
 public class MicroSave extends JFileChooser {
 

diff --git a/micropeak/MicroSerial.java b/micropeak/MicroSerial.java
index 39f421ec6b7fb3f1ccb7ed3fd6cc4396d90ef550..37b68636b73dd639d3e57445b6e4bf6b6fcd5859 100644 (file)
--- a/micropeak/MicroSerial.java
+++ b/micropeak/MicroSerial.java
@@ -20,7 +20,7 @@ package org.altusmetrum.micropeak;
 import java.util.*;
 import java.io.*;
 import libaltosJNI.*;
 import java.util.*;
 import java.io.*;
 import libaltosJNI.*;

-import org.altusmetrum.altosuilib_1.*;
+import org.altusmetrum.altosuilib_2.*;

 
 public class MicroSerial extends InputStream {
        SWIGTYPE_p_altos_file   file;
 
 public class MicroSerial extends InputStream {
        SWIGTYPE_p_altos_file   file;

diff --git a/micropeak/MicroSerialLog.java b/micropeak/MicroSerialLog.java
index 0a5a0b91de84018054ea088158f081da60b11a36..7300f06d33856e8b47a3d43528303a837c29bb96 100644 (file)
--- a/micropeak/MicroSerialLog.java
+++ b/micropeak/MicroSerialLog.java
@@ -20,7 +20,7 @@ package org.altusmetrum.micropeak;
 import java.util.*;
 import java.io.*;
 import libaltosJNI.*;
 import java.util.*;
 import java.io.*;
 import libaltosJNI.*;

-import org.altusmetrum.altosuilib_1.*;
+import org.altusmetrum.altosuilib_2.*;

 
 public interface MicroSerialLog {
 
 
 public interface MicroSerialLog {
 

diff --git a/micropeak/MicroStats.java b/micropeak/MicroStats.java
index 765525b0959f48caf277ccd401d45d1730997df4..45c9f225131b5babf3212622a7d85e4d20984e53 100644 (file)
--- a/micropeak/MicroStats.java
+++ b/micropeak/MicroStats.java
@@ -18,8 +18,8 @@
 package org.altusmetrum.micropeak;
 
 import java.io.*;
 package org.altusmetrum.micropeak;
 
 import java.io.*;

-import org.altusmetrum.altoslib_3.*;
-import org.altusmetrum.altosuilib_1.*;
+import org.altusmetrum.altoslib_4.*;
+import org.altusmetrum.altosuilib_2.*;

 
 public class MicroStats {
        double          coast_height;
 
 public class MicroStats {
        double          coast_height;

diff --git a/micropeak/MicroStatsTable.java b/micropeak/MicroStatsTable.java
index ea1609ac7fac43ef935bdd7fce910261035b8bd7..268a7ff0e7edb425a7e53ee8d681e5e799c163f7 100644 (file)
--- a/micropeak/MicroStatsTable.java
+++ b/micropeak/MicroStatsTable.java
@@ -19,8 +19,8 @@ package org.altusmetrum.micropeak;
 
 import java.awt.*;
 import javax.swing.*;
 
 import java.awt.*;
 import javax.swing.*;

-import org.altusmetrum.altoslib_3.*;
-import org.altusmetrum.altosuilib_1.*;
+import org.altusmetrum.altoslib_4.*;
+import org.altusmetrum.altosuilib_2.*;

 
 public class MicroStatsTable extends JComponent implements AltosFontListener {
        GridBagLayout   layout;
 
 public class MicroStatsTable extends JComponent implements AltosFontListener {
        GridBagLayout   layout;

diff --git a/micropeak/MicroUSB.java b/micropeak/MicroUSB.java
index 3bd61470cc847c4eb0d763562014f10c73f23ab7..437fa0bcde45c54374d2591814d0fca144b47460 100644 (file)
--- a/micropeak/MicroUSB.java
+++ b/micropeak/MicroUSB.java
@@ -19,7 +19,7 @@ package org.altusmetrum.micropeak;
 
 import java.util.*;
 import libaltosJNI.*;
 
 import java.util.*;
 import libaltosJNI.*;

-import org.altusmetrum.altosuilib_1.*;
+import org.altusmetrum.altosuilib_2.*;

 
 public class MicroUSB extends altos_device implements AltosDevice {
 
 
 public class MicroUSB extends altos_device implements AltosDevice {