Add version numbers to java libraries

Make our private java library names include a version number so we can
ship and install multiple versions at the same time.

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

diff --git a/altosdroid/Makefile.am b/altosdroid/Makefile.am
index 3860e110b1804357e8f070e792280852aa39f175..cc74b7a85395b817e653792cdaec4d048ebe9cd0 100644 (file)
--- a/altosdroid/Makefile.am
+++ b/altosdroid/Makefile.am
@@ -17,7 +17,7 @@ ZIPALIGN=$(SDK)/tools/zipalign
 SRC_DIR=src/org/altusmetrum/AltosDroid
 EXT_LIBDIR=libs
 ALTOSLIB_SRCDIR=../altoslib
 SRC_DIR=src/org/altusmetrum/AltosDroid
 EXT_LIBDIR=libs
 ALTOSLIB_SRCDIR=../altoslib

-ALTOSLIB_JAR=AltosLib.jar
+ALTOSLIB_JAR=altoslib_$(ALTOSLIB_VERSION).jar

 
 ALTOSLIB=$(EXT_LIBDIR)/$(ALTOSLIB_JAR)
 
 
 ALTOSLIB=$(EXT_LIBDIR)/$(ALTOSLIB_JAR)
 


@@ -56,7 +56,10 @@ bin/AltosDroid-release.apk: $(SRC) $(ALTOSLIB)
        ant release
 endif
 
        ant release
 endif
 

-clean:
+clean: clean-local

        $(clean_command)
 
        $(clean_command)
 

+clean-local:
+       rm -rf $(EXT_LIBDIR)
+

 .PHONY: $(SRC_DIR)/BuildInfo.java
 .PHONY: $(SRC_DIR)/BuildInfo.java

diff --git a/altosdroid/libs/.gitignore b/altosdroid/libs/.gitignore
deleted file mode 100644 (file)
index b4e68f6..0000000
--- a/altosdroid/libs/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-AltosLib.jar

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosBluetooth.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosBluetooth.java
index 9fcc4eba68a2016419417b65133019c3a4bf76c0..0aea06f1cf22a242cf89489768070522caafdf15 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.*;
+import org.altusmetrum.altoslib_1.*;

 
 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 ab1fb0dee09f837cf56df1b4ddb00efc8c550337..fe4907dd584f700727afc1e4a07d27ad151b0777 100644 (file)
--- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
@@ -43,7 +43,7 @@ import android.widget.TextView;
 import android.widget.Toast;
 import android.app.AlertDialog;
 
 import android.widget.Toast;
 import android.app.AlertDialog;
 

-import org.altusmetrum.AltosLib.*;
+import org.altusmetrum.altoslib_1.*;

 
 /**
  * This is the main Activity that displays the current chat session.
 
 /**
  * This is the main Activity that displays the current chat session.

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidPreferences.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidPreferences.java
index 3b4bdcf85ecac3f1e7c50792a7cd8198403542b6..fd4b0768ac33f8d60e55946be7f0d6bb1ad39d09 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.*;
+import org.altusmetrum.altoslib_1.*;

 
 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/AltosVoice.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosVoice.java
index 264e35c6be17466929fa8c274b1037c32c1bbf8b..7da5c4a982647120c39b9e00e7654c1e42b47b37 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;\r
 import android.speech.tts.TextToSpeech.OnInitListener;\r
 \r
 import android.speech.tts.TextToSpeech;\r
 import android.speech.tts.TextToSpeech.OnInitListener;\r
 \r

-import org.altusmetrum.AltosLib.*;\r
+import org.altusmetrum.altoslib_1.*;\r

 \r
 public class AltosVoice {\r
 \r
 \r
 public class AltosVoice {\r
 \r

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryLogger.java b/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryLogger.java
index b2dcdb48ecbe7d370df0500975415cb8b1a1533d..3ece04ac3e8596b0ef1f64b40f430e5280c13d74 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.*;
+import org.altusmetrum.altoslib_1.*;

 
 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 66e9c6bdd5c25c9b5cfa84999587830e0f96c6ff..9460bdbc2817e904646a1430caf8e7944321cf78 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;\r
 import android.os.Handler;\r
 \r
 import android.util.Log;\r
 import android.os.Handler;\r
 \r

-import org.altusmetrum.AltosLib.*;\r
+import org.altusmetrum.altoslib_1.*;\r

 \r
 \r
 public class TelemetryReader extends Thread {\r
 \r
 \r
 public class TelemetryReader extends Thread {\r

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java b/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java
index 3cb498e8a1995c05ddc2edc954846016dfe83c79..5ff00a680a5d50c974419242a3be74fe054f8126 100644 (file)
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java
@@ -38,7 +38,7 @@ import android.os.RemoteException;
 import android.util.Log;
 import android.widget.Toast;
 
 import android.util.Log;
 import android.widget.Toast;
 

-import org.altusmetrum.AltosLib.*;
+import org.altusmetrum.altoslib_1.*;

 
 public class TelemetryService extends Service {
 
 
 public class TelemetryService extends Service {
 

diff --git a/altoslib/AltosAccel.java b/altoslib/AltosAccel.java
index 9cb9a14bccd9b41c921d9dc2e6a5afaf38c5db41..af8c36b9f2a9db7e69ff80ce54f51d8cbb25560f 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;
+package org.altusmetrum.altoslib_1;

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

diff --git a/altoslib/AltosCRCException.java b/altoslib/AltosCRCException.java
index 1dd33ce905c5fc252123385fabeaf7fb84a1774d..76e79add1255c1cb9157564c59ae7851d15a5864 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;
+package org.altusmetrum.altoslib_1;

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

diff --git a/altoslib/AltosConfigData.java b/altoslib/AltosConfigData.java
index 387d106780a5785175e191e87a627af5cd975e8d..24ab255602b2afe2cf22baf9db3cc873aca67b2f 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;
+package org.altusmetrum.altoslib_1;

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

diff --git a/altoslib/AltosConfigValues.java b/altoslib/AltosConfigValues.java
index 2ec4b2a62571321aec786809cc348d73112e7327..027d10f4dfb92be98d04d41a5a161b2d48c64dbb 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;
+package org.altusmetrum.altoslib_1;

 
 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 6345e522fbed9d1eb8d189804b391b0ffb2d91a8..8adec068df82018e3f24c4a774adffb5cdb53d9f 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;
+package org.altusmetrum.altoslib_1;

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

diff --git a/altoslib/AltosDistance.java b/altoslib/AltosDistance.java
index 3e9946180a664e0f258e18c4f07c0a71fa31ce41..9d98f6b6c83ab2a178065f7b0010e48837c24269 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;
+package org.altusmetrum.altoslib_1;

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

diff --git a/altoslib/AltosEepromChunk.java b/altoslib/AltosEepromChunk.java
index a1fc7d117241bea7c2b61136a1f252e90c98f6e1..b1bba3bb56d67154c8cc49f23e3ab76c6cd84c02 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;
+package org.altusmetrum.altoslib_1;

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

diff --git a/altoslib/AltosEepromIterable.java b/altoslib/AltosEepromIterable.java
index 2e8715bafe76c8456230be7f9623867f6c9aa888..bc698c8064a50723bf0d279f148b44c2043e6342 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;
+package org.altusmetrum.altoslib_1;

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

diff --git a/altoslib/AltosEepromLog.java b/altoslib/AltosEepromLog.java
index 8a631c3cf476f234667ebb52d42154acc8b30a64..20026c6d33139a76b4c8014f15e284defd0c3b48 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;
+package org.altusmetrum.altoslib_1;

 
 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 0c38a91546f053a14bc42b2e5971f5a1bcdb9940..b077e26cefd582d104963478d7eab42c633d06bd 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;
+package org.altusmetrum.altoslib_1;

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

diff --git a/altoslib/AltosEepromMegaIterable.java b/altoslib/AltosEepromMegaIterable.java
index 05fc1f4ab2a6ba72ef9edd1cf932f814ac73b2a4..a127f435e3b2042d3a68c1d95ada50956b0aa968 100644 (file)
--- a/altoslib/AltosEepromMegaIterable.java
+++ b/altoslib/AltosEepromMegaIterable.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;
+package org.altusmetrum.altoslib_1;

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

diff --git a/altoslib/AltosEepromRecord.java b/altoslib/AltosEepromRecord.java
index 0c914aca347ecdb4b775ba94f742e8ad282162b1..70ac11136814558ae5e954705ffdd853352c5137 100644 (file)
--- a/altoslib/AltosEepromRecord.java
+++ b/altoslib/AltosEepromRecord.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;
+package org.altusmetrum.altoslib_1;

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

diff --git a/altoslib/AltosEepromTeleScience.java b/altoslib/AltosEepromTeleScience.java
index c983131ec0c52df1a5014bd3ffe3766cdf2526d3..2a828cf3c97742026e77f39d61e209ce38fec126 100644 (file)
--- a/altoslib/AltosEepromTeleScience.java
+++ b/altoslib/AltosEepromTeleScience.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;
+package org.altusmetrum.altoslib_1;

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

diff --git a/altoslib/AltosFile.java b/altoslib/AltosFile.java
index a2ff261ac463ab3c9ff513049fa5a19237f8d7ba..90dbc6dbea8ecf069dbedbf530b88e33ee865ea3 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; 
+package org.altusmetrum.altoslib_1; 

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

diff --git a/altoslib/AltosFlightReader.java b/altoslib/AltosFlightReader.java
index 87a53222c435b77dc296ca0b9d0fa90e635cc08a..3039b4dcbaf22b018ee1ecf057a81224ebdf844b 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;
+package org.altusmetrum.altoslib_1;

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

diff --git a/altoslib/AltosFrequency.java b/altoslib/AltosFrequency.java
index 2e55d3b9177b7871f630368ef7b1adbc596bea4a..484a2fd9d56e084f99c130185bf33fb2ad21711a 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;
+package org.altusmetrum.altoslib_1;

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

diff --git a/altoslib/AltosGPS.java b/altoslib/AltosGPS.java
index 6405579b36e73efa9fdc1bb16a90e561aa98187f..068d8c9c75f5dd2c9315c456fcc2ba63b3c64d17 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;
+package org.altusmetrum.altoslib_1;

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

diff --git a/altoslib/AltosGPSQuery.java b/altoslib/AltosGPSQuery.java
index fe453e0d3afe1ff49f4cf12f1e22020a60e7706a..deb9d201052a6bdc780dd47b2280c16c4b537909 100644 (file)
--- a/altoslib/AltosGPSQuery.java
+++ b/altoslib/AltosGPSQuery.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;
+package org.altusmetrum.altoslib_1;

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

diff --git a/altoslib/AltosGPSSat.java b/altoslib/AltosGPSSat.java
index 605c592a29381e4681b66775624430df251db5b7..8714dd8aa42f98e217764fc80c3c8718f8be9e05 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;
+package org.altusmetrum.altoslib_1;

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

diff --git a/altoslib/AltosGreatCircle.java b/altoslib/AltosGreatCircle.java
index ad7849a3ba06259b7ce490c77df9926855000d77..921356a59f0cc36ae9bfda643b8f300ea423a096 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;
+package org.altusmetrum.altoslib_1;

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

diff --git a/altoslib/AltosHeight.java b/altoslib/AltosHeight.java
index d7192e0b6512d5dccf8c9e9150d70a8a810f19a7..e0fef5f6023f37b1933be1754e872eebbdbe6a55 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;
+package org.altusmetrum.altoslib_1;

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

diff --git a/altoslib/AltosIMU.java b/altoslib/AltosIMU.java
index cf37eba1fff577285e8636c16f615ac7066f5d93..8f6731faa5a9bebbbbf1712d0502a4bf4d471042 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;
+package org.altusmetrum.altoslib_1;

 
 public class AltosIMU {
        public int              accel_x;
 
 public class AltosIMU {
        public int              accel_x;

diff --git a/altoslib/AltosIMUQuery.java b/altoslib/AltosIMUQuery.java
index f2ada8d40cf63f789aed371afda7b71bb8bbf343..4ea5d9636018106137fe60caa10ce492d8924573 100644 (file)
--- a/altoslib/AltosIMUQuery.java
+++ b/altoslib/AltosIMUQuery.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;
+package org.altusmetrum.altoslib_1;

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

diff --git a/altoslib/AltosIdleMonitor.java b/altoslib/AltosIdleMonitor.java
index 0a80ca6b83270e69e1bc3b58b309f9d3046b56dd..6b20b3f17342b0b3f528969e973a946a57da537b 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;
+package org.altusmetrum.altoslib_1;

 
 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 580626dd9e8bfca7f344a4166f298da60c4084d8..7f58d61c5d78740464a78a8419b082b986249a7e 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;
+package org.altusmetrum.altoslib_1;

 
 public interface AltosIdleMonitorListener {
        public void update(AltosState state);
 
 public interface AltosIdleMonitorListener {
        public void update(AltosState state);

diff --git a/altoslib/AltosIgnite.java b/altoslib/AltosIgnite.java
index 41f1faaf1dc9b75ee47928db1eee31e8c2220dbe..859059008cbfd838e8c9ff3aadd0704c8fe230f1 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;
+package org.altusmetrum.altoslib_1;

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

diff --git a/altoslib/AltosLib.java b/altoslib/AltosLib.java
index b3fe2968eeb466f472a3028e1edc68bac09e5e51..cb5d467bcf1070f6b9bffef77c5309abfb7dd64f 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;
+package org.altusmetrum.altoslib_1;

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

diff --git a/altoslib/AltosLine.java b/altoslib/AltosLine.java
index efa7df7ab0fb1b634a3a3e76ce39adc5fdb793dd..b3bd20f97bc71071ddf49d751ae1101012a56afe 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;
+package org.altusmetrum.altoslib_1;

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

diff --git a/altoslib/AltosLink.java b/altoslib/AltosLink.java
index 02880ec9246af6268091d170a59408f9c1f0218a..2b5909aa26b377cd86b5c3ae309e506709ff37d5 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;
+package org.altusmetrum.altoslib_1;

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

diff --git a/altoslib/AltosLog.java b/altoslib/AltosLog.java
index ab707edd40b74c46d7fa6019b43d22b48a286b77..974c9f0f90ab6c189c1dbb718a6d0e02af809207 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;
+package org.altusmetrum.altoslib_1;

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

diff --git a/altoslib/AltosMag.java b/altoslib/AltosMag.java
index 760cc623e6c357fc9f85b448cf0af8afff44c3d2..b3bbd92fa9843acbcbdf633489e7c0c741357af2 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;
+package org.altusmetrum.altoslib_1;

 
 public class AltosMag {
        public int              x;
 
 public class AltosMag {
        public int              x;

diff --git a/altoslib/AltosMs5607.java b/altoslib/AltosMs5607.java
index da64a0eab26a40d8cdbaa01baa2ba1d975ac7ebd..606916b7b46ec84f14de302b2d7e2a011056c5f2 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;
+package org.altusmetrum.altoslib_1;

 
 public class AltosMs5607 {
        public int      reserved;
 
 public class AltosMs5607 {
        public int      reserved;

diff --git a/altoslib/AltosMs5607Query.java b/altoslib/AltosMs5607Query.java
index 08089b076b158be6f3224b363295d5d12f19ddd5..d39dbf260bcb49a5f55c96a7d6888e4cc2c785c6 100644 (file)
--- a/altoslib/AltosMs5607Query.java
+++ b/altoslib/AltosMs5607Query.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;
+package org.altusmetrum.altoslib_1;

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

diff --git a/altoslib/AltosOrderedMegaRecord.java b/altoslib/AltosOrderedMegaRecord.java
index 4db0bcf831943dd151442ffc04f02d5ee173bcc4..b20a5bbdaf846f4f76a935ee0958f82ebf7c4e22 100644 (file)
--- a/altoslib/AltosOrderedMegaRecord.java
+++ b/altoslib/AltosOrderedMegaRecord.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;
+package org.altusmetrum.altoslib_1;

 
 import java.text.ParseException;
 
 
 import java.text.ParseException;
 

diff --git a/altoslib/AltosOrderedRecord.java b/altoslib/AltosOrderedRecord.java
index 73b4d3f87fd4801ef40d42a2199f907521a88ec8..63507d39fc7fb8f128118938103aee0216a351cb 100644 (file)
--- a/altoslib/AltosOrderedRecord.java
+++ b/altoslib/AltosOrderedRecord.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;
+package org.altusmetrum.altoslib_1;

 
 import java.text.ParseException;
 
 
 import java.text.ParseException;
 

diff --git a/altoslib/AltosParse.java b/altoslib/AltosParse.java
index e4ab662ae01056f53f40212a96b2f861beeb16f9..66bbeed5eb185f5b101b54a1bfad369d1fb44a0b 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;
+package org.altusmetrum.altoslib_1;

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

diff --git a/altoslib/AltosPreferences.java b/altoslib/AltosPreferences.java
index 65a46eb6f87f38675e99c76b5e3a58f63ec55d09..392497ef6909de1324a26d62d47db3aba8b1624e 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;
+package org.altusmetrum.altoslib_1;

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

diff --git a/altoslib/AltosPreferencesBackend.java b/altoslib/AltosPreferencesBackend.java
index 99ca9432d728a54d278e424ad0b29a37a4de1add..fb8a235a8d5ede79f5b13f2019e2a897bc2e2808 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;
+package org.altusmetrum.altoslib_1;

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

diff --git a/altoslib/AltosPyro.java b/altoslib/AltosPyro.java
index 0554ff114af3cd22971ece618b24fae12eb7ec39..4dbb42234a346c1806d606b70bad05e5a079ffcd 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;
+package org.altusmetrum.altoslib_1;

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

diff --git a/altoslib/AltosRecord.java b/altoslib/AltosRecord.java
index b519807bb2c766b1ebd109930f3387072f07e4f2..f8c44cc5a06a9f2f5092bd7eef316eb334d6b9d3 100644 (file)
--- a/altoslib/AltosRecord.java
+++ b/altoslib/AltosRecord.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;
+package org.altusmetrum.altoslib_1;

 
 public abstract class AltosRecord implements Comparable <AltosRecord>, Cloneable {
 
 
 public abstract class AltosRecord implements Comparable <AltosRecord>, Cloneable {
 

diff --git a/altoslib/AltosRecordCompanion.java b/altoslib/AltosRecordCompanion.java
index ffb114ec5ab0b3e6e28c4fb8db61a3353f063601..b153fb5b1f6ed00df1efc145676781cb9d7c2995 100644 (file)
--- a/altoslib/AltosRecordCompanion.java
+++ b/altoslib/AltosRecordCompanion.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;
+package org.altusmetrum.altoslib_1;

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

diff --git a/altoslib/AltosRecordIterable.java b/altoslib/AltosRecordIterable.java
index 17b13c7d3779f4ffab7b6cb8ca7b66c4ee958f9a..62dbdfe352c2d06f7e3bdec40ad1991ee23caa13 100644 (file)
--- a/altoslib/AltosRecordIterable.java
+++ b/altoslib/AltosRecordIterable.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;
+package org.altusmetrum.altoslib_1;

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

diff --git a/altoslib/AltosRecordMM.java b/altoslib/AltosRecordMM.java
index f950d1703afa453af8b6afbf138ef693fda6e8be..bf64192c5888abe1a75e8050e72d2329db4fb154 100644 (file)
--- a/altoslib/AltosRecordMM.java
+++ b/altoslib/AltosRecordMM.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;
+package org.altusmetrum.altoslib_1;

 
 public class AltosRecordMM extends AltosRecord {
 
 
 public class AltosRecordMM extends AltosRecord {
 

diff --git a/altoslib/AltosRecordNone.java b/altoslib/AltosRecordNone.java
index 3fab11219e013ddb214eeca5b6b1ebddfbcec60f..a95b6a9ce0197c04da5e85fd91b32791d8598c36 100644 (file)
--- a/altoslib/AltosRecordNone.java
+++ b/altoslib/AltosRecordNone.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;
+package org.altusmetrum.altoslib_1;

 
 public class AltosRecordNone extends AltosRecord {
 
 
 public class AltosRecordNone extends AltosRecord {
 

diff --git a/altoslib/AltosRecordTM.java b/altoslib/AltosRecordTM.java
index eb6935d5c67f7eec076927cd4da9f79eb8f34edf..c6cf36460ed2c2ffba949c29deb900eccbb971da 100644 (file)
--- a/altoslib/AltosRecordTM.java
+++ b/altoslib/AltosRecordTM.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;
+package org.altusmetrum.altoslib_1;

 
 public class AltosRecordTM extends AltosRecord {
 
 
 public class AltosRecordTM extends AltosRecord {
 

diff --git a/altoslib/AltosReplayReader.java b/altoslib/AltosReplayReader.java
index 7184206c31ac4ead0f2c71439c3dd2bb082dc7ad..a7e30370d2696da8db29aedbdb461e3808a332ac 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;
+package org.altusmetrum.altoslib_1;

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

diff --git a/altoslib/AltosSensorMM.java b/altoslib/AltosSensorMM.java
index c29aa3dc33b0753ac87b056e0bf828b2b5d5fe1a..8372d0477ffdc3c827c91e956f9e7adfe9bca55f 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;
+package org.altusmetrum.altoslib_1;

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

diff --git a/altoslib/AltosSensorTM.java b/altoslib/AltosSensorTM.java
index c3cbe7bbb52a387a2045bf9d3fa946645692b13f..f5fa83a595a94a6cc7196d3159f1d9ab0234ebfa 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;
+package org.altusmetrum.altoslib_1;

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

diff --git a/altoslib/AltosSpeed.java b/altoslib/AltosSpeed.java
index 230457dd475b5f5dd3a2955922d24f4f8b8bc971..020c137708c19f70c4e61d4f98ba24f0332ea04f 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;
+package org.altusmetrum.altoslib_1;

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

diff --git a/altoslib/AltosState.java b/altoslib/AltosState.java
index 1838f12d43e2ba03665aabbe7b2d63e077da3170..32d02f21d1923ba934cb756e7d013196aac3ec6d 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;
+package org.altusmetrum.altoslib_1;

 
 public class AltosState {
        public AltosRecord data;
 
 public class AltosState {
        public AltosRecord data;

diff --git a/altoslib/AltosTelemetry.java b/altoslib/AltosTelemetry.java
index 26d79cd8ad407842ee8e931d7994a6adaf3f7275..e73223499a2f42ed91950b0a70e778e3541b3a12 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;
+package org.altusmetrum.altoslib_1;

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

diff --git a/altoslib/AltosTelemetryIterable.java b/altoslib/AltosTelemetryIterable.java
index 092051a167dcd20923f5b2b8439e29ae181d567a..570336387640c1ae77560e4dcf038967e3c08465 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;
+package org.altusmetrum.altoslib_1;

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

diff --git a/altoslib/AltosTelemetryMap.java b/altoslib/AltosTelemetryMap.java
index 529176d252aa5f690143e9874f24c8e80e746162..7cca98b09acc39e46c9cf0091434c679541bbcb6 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;
+package org.altusmetrum.altoslib_1;

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

diff --git a/altoslib/AltosTelemetryReader.java b/altoslib/AltosTelemetryReader.java
index 7139644edda8e9af37d521c9620ece8277321cfc..f365b82118eb320e6fd8421d804517db95818af6 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;
+package org.altusmetrum.altoslib_1;

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

diff --git a/altoslib/AltosTelemetryRecord.java b/altoslib/AltosTelemetryRecord.java
index 22da28369731e11e4e6899dbee62c2928bcdf2b6..01215968427069b36aa585090404f58ff9b57af6 100644 (file)
--- a/altoslib/AltosTelemetryRecord.java
+++ b/altoslib/AltosTelemetryRecord.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;
+package org.altusmetrum.altoslib_1;

 import java.text.*;
 
 public abstract class AltosTelemetryRecord {
 import java.text.*;
 
 public abstract class AltosTelemetryRecord {

diff --git a/altoslib/AltosTelemetryRecordCompanion.java b/altoslib/AltosTelemetryRecordCompanion.java
index d68120c09abcff6c98c1ef40cea7fdbfbccc2021..e016dd016e757a93b94715fe81f00c3228a186b7 100644 (file)
--- a/altoslib/AltosTelemetryRecordCompanion.java
+++ b/altoslib/AltosTelemetryRecordCompanion.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;
+package org.altusmetrum.altoslib_1;

 
 public class AltosTelemetryRecordCompanion extends AltosTelemetryRecordRaw {
 
 
 public class AltosTelemetryRecordCompanion extends AltosTelemetryRecordRaw {
 

diff --git a/altoslib/AltosTelemetryRecordConfiguration.java b/altoslib/AltosTelemetryRecordConfiguration.java
index 7482ef5b80ec2f0a9ed3ad71f4f3606c6f3feb90..472a631860ea9c23cdd23f4f3d7a04db34b1479d 100644 (file)
--- a/altoslib/AltosTelemetryRecordConfiguration.java
+++ b/altoslib/AltosTelemetryRecordConfiguration.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;
+package org.altusmetrum.altoslib_1;

 
 
 public class AltosTelemetryRecordConfiguration extends AltosTelemetryRecordRaw {
 
 
 public class AltosTelemetryRecordConfiguration extends AltosTelemetryRecordRaw {

diff --git a/altoslib/AltosTelemetryRecordGeneral.java b/altoslib/AltosTelemetryRecordGeneral.java
index f3985211efda56252c68604786e06cb34e711260..08cd60651d2dc50eb8b30c23ba471c877dce5050 100644 (file)
--- a/altoslib/AltosTelemetryRecordGeneral.java
+++ b/altoslib/AltosTelemetryRecordGeneral.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;
+package org.altusmetrum.altoslib_1;

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

diff --git a/altoslib/AltosTelemetryRecordLegacy.java b/altoslib/AltosTelemetryRecordLegacy.java
index 1202099adee6f28c5a842ec1283c75da8b38fbcd..a734b188e852e1aaeeef5e0211beab9fac38abe9 100644 (file)
--- a/altoslib/AltosTelemetryRecordLegacy.java
+++ b/altoslib/AltosTelemetryRecordLegacy.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;
+package org.altusmetrum.altoslib_1;

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

diff --git a/altoslib/AltosTelemetryRecordLocation.java b/altoslib/AltosTelemetryRecordLocation.java
index a0a8ab8159cd0f4e5aeb2edc2cf7693c7b50ed2a..469a5400d28bf9f8a0e679463ad86c2621fa9d31 100644 (file)
--- a/altoslib/AltosTelemetryRecordLocation.java
+++ b/altoslib/AltosTelemetryRecordLocation.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;
+package org.altusmetrum.altoslib_1;

 
 
 public class AltosTelemetryRecordLocation extends AltosTelemetryRecordRaw {
 
 
 public class AltosTelemetryRecordLocation extends AltosTelemetryRecordRaw {

diff --git a/altoslib/AltosTelemetryRecordMegaData.java b/altoslib/AltosTelemetryRecordMegaData.java
index 72af6a226126619d7653b50a0e598c11cee7c446..08df9ee1ef15105460e487e08cd1bd95206d77bf 100644 (file)
--- a/altoslib/AltosTelemetryRecordMegaData.java
+++ b/altoslib/AltosTelemetryRecordMegaData.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;
+package org.altusmetrum.altoslib_1;

 
 
 public class AltosTelemetryRecordMegaData extends AltosTelemetryRecordRaw {
 
 
 public class AltosTelemetryRecordMegaData extends AltosTelemetryRecordRaw {

diff --git a/altoslib/AltosTelemetryRecordMegaSensor.java b/altoslib/AltosTelemetryRecordMegaSensor.java
index 16b8896945ec5091371c77a26a043560d3ad627a..7548d69942af15ce6a055a1e45a4989fe27cc28a 100644 (file)
--- a/altoslib/AltosTelemetryRecordMegaSensor.java
+++ b/altoslib/AltosTelemetryRecordMegaSensor.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;
+package org.altusmetrum.altoslib_1;

 
 
 public class AltosTelemetryRecordMegaSensor extends AltosTelemetryRecordRaw {
 
 
 public class AltosTelemetryRecordMegaSensor extends AltosTelemetryRecordRaw {

diff --git a/altoslib/AltosTelemetryRecordRaw.java b/altoslib/AltosTelemetryRecordRaw.java
index 9749aa5c86329a8d77af5ee45bb39c1ac93007d5..a06348c19d2e379a3733b7cd0e2214b034d34834 100644 (file)
--- a/altoslib/AltosTelemetryRecordRaw.java
+++ b/altoslib/AltosTelemetryRecordRaw.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;
+package org.altusmetrum.altoslib_1;

 
 public class AltosTelemetryRecordRaw extends AltosTelemetryRecord {
        int[]   bytes;
 
 public class AltosTelemetryRecordRaw extends AltosTelemetryRecord {
        int[]   bytes;

diff --git a/altoslib/AltosTelemetryRecordSatellite.java b/altoslib/AltosTelemetryRecordSatellite.java
index b9418f27e98f389e57932b096e6b27621ce6bb2f..3e93b3377fb156941e1d53f158b8c400d90e1421 100644 (file)
--- a/altoslib/AltosTelemetryRecordSatellite.java
+++ b/altoslib/AltosTelemetryRecordSatellite.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;
+package org.altusmetrum.altoslib_1;

 
 public class AltosTelemetryRecordSatellite extends AltosTelemetryRecordRaw {
        int             channels;
 
 public class AltosTelemetryRecordSatellite extends AltosTelemetryRecordRaw {
        int             channels;

diff --git a/altoslib/AltosTelemetryRecordSensor.java b/altoslib/AltosTelemetryRecordSensor.java
index 92375fb0a64f22b548d24d17373f234b2f8c4980..767a464a7e5e046e8534481d89f46e21345e1516 100644 (file)
--- a/altoslib/AltosTelemetryRecordSensor.java
+++ b/altoslib/AltosTelemetryRecordSensor.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;
+package org.altusmetrum.altoslib_1;

 
 
 public class AltosTelemetryRecordSensor extends AltosTelemetryRecordRaw {
 
 
 public class AltosTelemetryRecordSensor extends AltosTelemetryRecordRaw {

diff --git a/altoslib/AltosUnits.java b/altoslib/AltosUnits.java
index fcc9a97304276e06990b662b0f519bcb7fbff3c1..4351123b3ce846335226404385d57d98c199f996 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;
+package org.altusmetrum.altoslib_1;

 
 public abstract class AltosUnits {
 
 
 public abstract class AltosUnits {
 

diff --git a/altoslib/AltosUnitsListener.java b/altoslib/AltosUnitsListener.java
index 680d5cb41ee593ca9e6e7a8ee0ddc0790276b3bb..61a181a4da7853b9d9e80767ff8841b6fe381342 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;
+package org.altusmetrum.altoslib_1;

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

diff --git a/altoslib/Makefile.am b/altoslib/Makefile.am
index bab7d6d3635ef0c4099cbc229b99291e8670a7f0..b3c2673a855cad8173b01d34c70dfde685e4adcc 100644 (file)
--- a/altoslib/Makefile.am
+++ b/altoslib/Makefile.am
@@ -7,89 +7,88 @@ VERSION=1
 CLASSPATH_ENV=mkdir -p $(JAVAROOT); CLASSPATH="bin:$(FREETTS)/*:/usr/share/java/*"
 
 SRC=.
 CLASSPATH_ENV=mkdir -p $(JAVAROOT); CLASSPATH="bin:$(FREETTS)/*:/usr/share/java/*"
 
 SRC=.

-BIN=bin/org/altusmetrum/AltosLib

 
 

-AltosLibdir = $(datadir)/java
+altoslibdir = $(datadir)/java

 
 

-AltosLib_JAVA = \
-       $(SRC)/AltosLib.java \
-       $(SRC)/AltosConfigData.java \
-       $(SRC)/AltosConfigValues.java \
-       $(SRC)/AltosConvert.java \
-       $(SRC)/AltosCRCException.java \
-       $(SRC)/AltosEepromChunk.java \
-       $(SRC)/AltosEepromIterable.java \
-       $(SRC)/AltosEepromLog.java \
-       $(SRC)/AltosEepromMega.java \
-       $(SRC)/AltosEepromMegaIterable.java \
-       $(SRC)/AltosEepromRecord.java \
-       $(SRC)/AltosEepromTeleScience.java \
-       $(SRC)/AltosFile.java \
-       $(SRC)/AltosFlightReader.java \
-       $(SRC)/AltosFrequency.java \
-       $(SRC)/AltosGPS.java \
-       $(SRC)/AltosGPSQuery.java \
-       $(SRC)/AltosGPSSat.java \
-       $(SRC)/AltosGreatCircle.java \
-       $(SRC)/AltosIdleMonitor.java \
-       $(SRC)/AltosIdleMonitorListener.java \
-       $(SRC)/AltosIgnite.java \
-       $(SRC)/AltosIMU.java \
-       $(SRC)/AltosIMUQuery.java \
-       $(SRC)/AltosLine.java \
-       $(SRC)/AltosLink.java \
-       $(SRC)/AltosLog.java \
-       $(SRC)/AltosMs5607.java \
-       $(SRC)/AltosMs5607Query.java \
-       $(SRC)/AltosOrderedRecord.java \
-       $(SRC)/AltosOrderedMegaRecord.java \
-       $(SRC)/AltosParse.java \
-       $(SRC)/AltosPreferences.java \
-       $(SRC)/AltosPreferencesBackend.java \
-       $(SRC)/AltosRecordCompanion.java \
-       $(SRC)/AltosRecordIterable.java \
-       $(SRC)/AltosRecord.java \
-       $(SRC)/AltosRecordNone.java \
-       $(SRC)/AltosRecordTM.java \
-       $(SRC)/AltosRecordMM.java \
-       $(SRC)/AltosReplayReader.java \
-       $(SRC)/AltosSensorMM.java \
-       $(SRC)/AltosSensorTM.java \
-       $(SRC)/AltosState.java \
-       $(SRC)/AltosTelemetry.java \
-       $(SRC)/AltosTelemetryIterable.java \
-       $(SRC)/AltosTelemetryMap.java \
-       $(SRC)/AltosTelemetryReader.java \
-       $(SRC)/AltosTelemetryRecordCompanion.java \
-       $(SRC)/AltosTelemetryRecordConfiguration.java \
-       $(SRC)/AltosTelemetryRecordGeneral.java \
-       $(SRC)/AltosTelemetryRecord.java \
-       $(SRC)/AltosTelemetryRecordLegacy.java \
-       $(SRC)/AltosTelemetryRecordLocation.java \
-       $(SRC)/AltosTelemetryRecordRaw.java \
-       $(SRC)/AltosTelemetryRecordSatellite.java \
-       $(SRC)/AltosTelemetryRecordSensor.java \
-       $(SRC)/AltosTelemetryRecordMegaSensor.java \
-       $(SRC)/AltosTelemetryRecordMegaData.java \
-       $(SRC)/AltosUnitsListener.java \
-       $(SRC)/AltosMs5607.java \
-       $(SRC)/AltosIMU.java \
-       $(SRC)/AltosMag.java \
-       $(SRC)/AltosUnits.java \
-       $(SRC)/AltosDistance.java \
-       $(SRC)/AltosHeight.java \
-       $(SRC)/AltosSpeed.java \
-       $(SRC)/AltosAccel.java \
-       $(SRC)/AltosPyro.java
+altoslib_JAVA = \
+       AltosLib.java \
+       AltosConfigData.java \
+       AltosConfigValues.java \
+       AltosConvert.java \
+       AltosCRCException.java \
+       AltosEepromChunk.java \
+       AltosEepromIterable.java \
+       AltosEepromLog.java \
+       AltosEepromMega.java \
+       AltosEepromMegaIterable.java \
+       AltosEepromRecord.java \
+       AltosEepromTeleScience.java \
+       AltosFile.java \
+       AltosFlightReader.java \
+       AltosFrequency.java \
+       AltosGPS.java \
+       AltosGPSQuery.java \
+       AltosGPSSat.java \
+       AltosGreatCircle.java \
+       AltosIdleMonitor.java \
+       AltosIdleMonitorListener.java \
+       AltosIgnite.java \
+       AltosIMU.java \
+       AltosIMUQuery.java \
+       AltosLine.java \
+       AltosLink.java \
+       AltosLog.java \
+       AltosMs5607.java \
+       AltosMs5607Query.java \
+       AltosOrderedRecord.java \
+       AltosOrderedMegaRecord.java \
+       AltosParse.java \
+       AltosPreferences.java \
+       AltosPreferencesBackend.java \
+       AltosRecordCompanion.java \
+       AltosRecordIterable.java \
+       AltosRecord.java \
+       AltosRecordNone.java \
+       AltosRecordTM.java \
+       AltosRecordMM.java \
+       AltosReplayReader.java \
+       AltosSensorMM.java \
+       AltosSensorTM.java \
+       AltosState.java \
+       AltosTelemetry.java \
+       AltosTelemetryIterable.java \
+       AltosTelemetryMap.java \
+       AltosTelemetryReader.java \
+       AltosTelemetryRecordCompanion.java \
+       AltosTelemetryRecordConfiguration.java \
+       AltosTelemetryRecordGeneral.java \
+       AltosTelemetryRecord.java \
+       AltosTelemetryRecordLegacy.java \
+       AltosTelemetryRecordLocation.java \
+       AltosTelemetryRecordRaw.java \
+       AltosTelemetryRecordSatellite.java \
+       AltosTelemetryRecordSensor.java \
+       AltosTelemetryRecordMegaSensor.java \
+       AltosTelemetryRecordMegaData.java \
+       AltosUnitsListener.java \
+       AltosMs5607.java \
+       AltosIMU.java \
+       AltosMag.java \
+       AltosUnits.java \
+       AltosDistance.java \
+       AltosHeight.java \
+       AltosSpeed.java \
+       AltosAccel.java \
+       AltosPyro.java

 
 

-JAR=AltosLib.jar
+JAR=altoslib_$(ALTOSLIB_VERSION).jar

 
 all-local: $(JAR)
 
 clean-local:
        -rm -rf bin $(JAR)
 
 
 all-local: $(JAR)
 
 clean-local:
        -rm -rf bin $(JAR)
 

-install-AltosLibJAVA: $(JAR)
+install-altoslibJAVA: $(JAR)

        @$(NORMAL_INSTALL)
        test -z "$(AltosLibdir)" || $(MKDIR_P) "$(DESTDIR)$(AltosLibdir)"
        echo " $(INSTALL_DATA)" "$<" "'$(DESTDIR)$(AltosLibdir)/$(JAR)"; \
        @$(NORMAL_INSTALL)
        test -z "$(AltosLibdir)" || $(MKDIR_P) "$(DESTDIR)$(AltosLibdir)"
        echo " $(INSTALL_DATA)" "$<" "'$(DESTDIR)$(AltosLibdir)/$(JAR)"; \

diff --git a/altosui/Altos.java b/altosui/Altos.java
index 170201ce736bfcc395d573d92b2fdc76589b0950..d25736bf36da3d77134663a27ce6fe6d8d6744dc 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.*;
-import org.altusmetrum.altosuilib.*;
+import org.altusmetrum.altoslib_1.*;
+import org.altusmetrum.altosuilib_1.*;

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

diff --git a/altosui/AltosAscent.java b/altosui/AltosAscent.java
index 29693da10cbfaedcd9643febc473e4c26fc79916..e90e0e232003c99548bbaf7c5d84a2a7b6dab0f8 100644 (file)
--- a/altosui/AltosAscent.java
+++ b/altosui/AltosAscent.java
@@ -19,7 +19,7 @@ package altosui;
 
 import java.awt.*;
 import javax.swing.*;
 
 import java.awt.*;
 import javax.swing.*;

-import org.altusmetrum.altoslib.*;
+import org.altusmetrum.altoslib_1.*;

 
 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 222b3c97a1e6cb90b2ef50f899ff8d07fe9eba91..727a9f6625ce7953e251c94817cc9f5832c4b1ad 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.*;
+import org.altusmetrum.altosuilib_1.*;

 
 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 f8efeef7d587bf160360e4e3afd0f752647ece3e..1d42365ba858281e82ca43eb2914cd33a962a046 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.*;
-import org.altusmetrum.altosuilib.*;
+import org.altusmetrum.altoslib_1.*;
+import org.altusmetrum.altosuilib_1.*;

 
 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 b7b632a72bc5729438f851cbea98209a253cfc56..4c9b7a6c405f5f827968dd95715b3a71ae50a1f3 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.*;
+import org.altusmetrum.altosuilib_1.*;

 
 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/AltosCSV.java b/altosui/AltosCSV.java
index 11b64bfc1a455d298179528a2bbd3ac263b2fe91..0676f99d38fb63478f4da9c32f5a9535e02743d1 100644 (file)
--- a/altosui/AltosCSV.java
+++ b/altosui/AltosCSV.java
@@ -19,7 +19,7 @@ package altosui;
 
 import java.io.*;
 import java.util.*;
 
 import java.io.*;
 import java.util.*;

-import org.altusmetrum.altoslib.*;
+import org.altusmetrum.altoslib_1.*;

 
 public class AltosCSV implements AltosWriter {
        File                    name;
 
 public class AltosCSV implements AltosWriter {
        File                    name;

diff --git a/altosui/AltosCSVUI.java b/altosui/AltosCSVUI.java
index 152b4b279b84a60031b4eabb9bb39efdf14b1eea..4250834691755ad725dd948d98deedb7b6030a38 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.*;
-import org.altusmetrum.altosuilib.*;
+import org.altusmetrum.altoslib_1.*;
+import org.altusmetrum.altosuilib_1.*;

 
 public class AltosCSVUI
        extends AltosUIDialog
 
 public class AltosCSVUI
        extends AltosUIDialog

diff --git a/altosui/AltosCompanionInfo.java b/altosui/AltosCompanionInfo.java
index 8ccccfac904ef85f118097bb9e8a4b54a519dbc9..7dd36aec08ecbf2835e9a6dfd9ea874d38f02c2d 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.*;
+import org.altusmetrum.altoslib_1.*;

 
 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 c4dba735184b23d204c8e4ebe8bc26ccdc0d58b9..4927d3f822e0ad9b73fc2cf6c1fab9c9137eb456 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.*;
-import org.altusmetrum.altosuilib.*;
+import org.altusmetrum.altoslib_1.*;
+import org.altusmetrum.altosuilib_1.*;

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

diff --git a/altosui/AltosConfigFreqUI.java b/altosui/AltosConfigFreqUI.java
index 074f337aef9dd607b42997f7ddddde24f406935e..c90b168f3359ff236f368d08564f0d97e83f6dcd 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.*;
-import org.altusmetrum.altosuilib.*;
+import org.altusmetrum.altoslib_1.*;
+import org.altusmetrum.altosuilib_1.*;

 
 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 13652e813b6704d1a86ab9b8d5a0c9490dc07f2b..3cac56c3a576425f2d826c43bf9e3e91aebe21fc 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.*;
-import org.altusmetrum.altosuilib.*;
+import org.altusmetrum.altoslib_1.*;
+import org.altusmetrum.altosuilib_1.*;

 
 public class AltosConfigPyroUI
        extends AltosUIDialog
 
 public class AltosConfigPyroUI
        extends AltosUIDialog

diff --git a/altosui/AltosConfigTD.java b/altosui/AltosConfigTD.java
index 480139cbbb1890ed631fe54f3d6df61cfaa40b66..16c9e357134c58ded5f2a8e545c3f902781669ac 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.*;
-import org.altusmetrum.altosuilib.*;
+import org.altusmetrum.altoslib_1.*;
+import org.altusmetrum.altosuilib_1.*;

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

diff --git a/altosui/AltosConfigTDUI.java b/altosui/AltosConfigTDUI.java
index d9df9d79c2ca69b3e42bf43724915f8ad96b557f..125780a99f9813c723677080e4802c8b383eb36e 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.*;
-import org.altusmetrum.altosuilib.*;
+import org.altusmetrum.altoslib_1.*;
+import org.altusmetrum.altosuilib_1.*;

 
 public class AltosConfigTDUI
        extends AltosUIDialog
 
 public class AltosConfigTDUI
        extends AltosUIDialog

diff --git a/altosui/AltosConfigUI.java b/altosui/AltosConfigUI.java
index 08dccd09381e646950260a199bea42392b6f7631..4fd0647efa860a3d47f8d4732a479e69cea14314 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.*;
-import org.altusmetrum.altosuilib.*;
+import org.altusmetrum.altoslib_1.*;
+import org.altusmetrum.altosuilib_1.*;

 
 public class AltosConfigUI
        extends AltosUIDialog
 
 public class AltosConfigUI
        extends AltosUIDialog

diff --git a/altosui/AltosConfigureUI.java b/altosui/AltosConfigureUI.java
index fad23f59fcfabe8a7f1c83a022798ff0bc98fbe0..5e42f43055ec55d9b13dabe3044f789d04693785 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.*;
+import org.altusmetrum.altosuilib_1.*;

 
 public class AltosConfigureUI
        extends AltosUIConfigure
 
 public class AltosConfigureUI
        extends AltosUIConfigure

diff --git a/altosui/AltosDataChooser.java b/altosui/AltosDataChooser.java
index eddbb120b5271feaa624c219e6c09d9781d8d883..7de18afba43a871a7b73cdc6d77c396d546b73a6 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.*;
-import org.altusmetrum.altosuilib.*;
+import org.altusmetrum.altoslib_1.*;
+import org.altusmetrum.altosuilib_1.*;

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

diff --git a/altosui/AltosDataPointReader.java b/altosui/AltosDataPointReader.java
index 2bdb4d96dd9d11f2f04c7c38ff10e0d965461478..0b4bd6c19f79a2a80f02bc7333c1e8907c55ac9f 100644 (file)
--- a/altosui/AltosDataPointReader.java
+++ b/altosui/AltosDataPointReader.java
@@ -7,7 +7,7 @@ package altosui;
 import java.lang.UnsupportedOperationException;
 import java.util.NoSuchElementException;
 import java.util.Iterator;
 import java.lang.UnsupportedOperationException;
 import java.util.NoSuchElementException;
 import java.util.Iterator;

-import org.altusmetrum.altoslib.*;
+import org.altusmetrum.altoslib_1.*;

 
 class AltosDataPointReader implements Iterable<AltosDataPoint> {
     Iterator<AltosRecord> iter;
 
 class AltosDataPointReader implements Iterable<AltosDataPoint> {
     Iterator<AltosRecord> iter;

diff --git a/altosui/AltosDebug.java b/altosui/AltosDebug.java
index 482f4c3650d918a16c2651840196387e6c9b4960..c69369ef26a10683da2f6324642d6db1c6b09681 100644 (file)
--- a/altosui/AltosDebug.java
+++ b/altosui/AltosDebug.java
@@ -18,7 +18,7 @@
 package altosui;
 
 import java.io.*;
 package altosui;
 
 import java.io.*;

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

 
 public class AltosDebug extends AltosSerial {
 
 
 public class AltosDebug extends AltosSerial {
 

diff --git a/altosui/AltosDescent.java b/altosui/AltosDescent.java
index df151086d39023b74cb501cdd76a0a3028a7980f..821e3963f976ac7ae296ee80c9df8f16bf66a898 100644 (file)
--- a/altosui/AltosDescent.java
+++ b/altosui/AltosDescent.java
@@ -19,7 +19,7 @@ package altosui;
 
 import java.awt.*;
 import javax.swing.*;
 
 import java.awt.*;
 import javax.swing.*;

-import org.altusmetrum.altoslib.*;
+import org.altusmetrum.altoslib_1.*;

 
 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 7ed599a342b0708585fcc8956a02693cb1c8f3cc..ceabe84339e240e4531c51279fef95ba2a922112 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.*;
+import org.altusmetrum.altosuilib_1.*;

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

diff --git a/altosui/AltosDisplayThread.java b/altosui/AltosDisplayThread.java
index b52a57701ad176679554e42b95ab549f81e7788b..6f8aa9ee3293556caba705c9bbb3aa55e7ca6f94 100644 (file)
--- a/altosui/AltosDisplayThread.java
+++ b/altosui/AltosDisplayThread.java
@@ -21,7 +21,7 @@ import java.awt.*;
 import javax.swing.*;
 import java.io.*;
 import java.text.*;
 import javax.swing.*;
 import java.io.*;
 import java.text.*;

-import org.altusmetrum.altoslib.*;
+import org.altusmetrum.altoslib_1.*;

 
 public class AltosDisplayThread extends Thread {
 
 
 public class AltosDisplayThread extends Thread {
 

diff --git a/altosui/AltosEepromDelete.java b/altosui/AltosEepromDelete.java
index 0161213ba9b151144c44590afb7f69a5934fadac..e81a35d1133fd0249581fced0298b2780f18dc0b 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.*;
+import org.altusmetrum.altoslib_1.*;

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

diff --git a/altosui/AltosEepromDownload.java b/altosui/AltosEepromDownload.java
index 612b838063c3183084e8cadae9cecd43d2866aad..8fbd661ba1f563992b40350146b809830a7daa20 100644 (file)
--- a/altosui/AltosEepromDownload.java
+++ b/altosui/AltosEepromDownload.java
@@ -23,7 +23,7 @@ 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.*;
+import org.altusmetrum.altoslib_1.*;

 
 public class AltosEepromDownload implements Runnable {
 
 
 public class AltosEepromDownload implements Runnable {
 

diff --git a/altosui/AltosEepromList.java b/altosui/AltosEepromList.java
index 0cddec76e1325554bff1703ae50de9d503f19e63..a63d173de36f275dc69bdf3b7b326cbd95e7c39d 100644 (file)
--- a/altosui/AltosEepromList.java
+++ b/altosui/AltosEepromList.java
@@ -21,7 +21,7 @@ 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.*;
+import org.altusmetrum.altoslib_1.*;

 
 /*
  * Temporary structure to hold the list of stored flights;
 
 /*
  * Temporary structure to hold the list of stored flights;

diff --git a/altosui/AltosEepromManage.java b/altosui/AltosEepromManage.java
index c69f1f53dcff66d5bd97733038cb0d7fd4cfd5c2..dbcc50483cfe80b10bf5f7abfa9346c655b8d440 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.*;
-import org.altusmetrum.altosuilib.*;
+import org.altusmetrum.altoslib_1.*;
+import org.altusmetrum.altosuilib_1.*;

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

diff --git a/altosui/AltosEepromMonitor.java b/altosui/AltosEepromMonitor.java
index 8eae5eb841345c0202144e2c15af58d8d177af83..5b9e5171bc8b89586fef1f44bafc8e7c1eebd82f 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.*;
+import org.altusmetrum.altosuilib_1.*;

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

diff --git a/altosui/AltosEepromSelect.java b/altosui/AltosEepromSelect.java
index b0b08d3b0fe32bf1037e1318f111f8c29581184b..a451aa3afbbe8b88793f77675e15dc1ed8b1cbe9 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.*;
-import org.altusmetrum.altosuilib.*;
+import org.altusmetrum.altoslib_1.*;
+import org.altusmetrum.altosuilib_1.*;

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

diff --git a/altosui/AltosFlash.java b/altosui/AltosFlash.java
index 7a98ee144cd2c4ee6391317e07862d57cdf86f98..239d4dd77c9c6ddd0ef35b0660b4c9a6ac57d86c 100644 (file)
--- a/altosui/AltosFlash.java
+++ b/altosui/AltosFlash.java
@@ -20,7 +20,7 @@ package altosui;
 import java.awt.event.*;
 import javax.swing.*;
 import java.io.*;
 import java.awt.event.*;
 import javax.swing.*;
 import java.io.*;

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

 
 public class AltosFlash {
        File            file;
 
 public class AltosFlash {
        File            file;

diff --git a/altosui/AltosFlashUI.java b/altosui/AltosFlashUI.java
index 921207bc4f399bed6ff046ae0ba9b884ab4b1c73..f26a391614e17275f5451d94517daa661b2019b5 100644 (file)
--- a/altosui/AltosFlashUI.java
+++ b/altosui/AltosFlashUI.java
@@ -23,7 +23,7 @@ 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.altosuilib.*;
+import org.altusmetrum.altosuilib_1.*;

 
 public class AltosFlashUI
        extends AltosUIDialog
 
 public class AltosFlashUI
        extends AltosUIDialog

diff --git a/altosui/AltosFlightDisplay.java b/altosui/AltosFlightDisplay.java
index 4219112226fbc32e96420cf5d4eef9e573e2c655..d1ed7d2faf4139da8e27cd2674484eeefd6a7f47 100644 (file)
--- a/altosui/AltosFlightDisplay.java
+++ b/altosui/AltosFlightDisplay.java
@@ -17,7 +17,7 @@
 
 package altosui;
 
 
 package altosui;
 

-import org.altusmetrum.altoslib.*;
+import org.altusmetrum.altoslib_1.*;

 
 public interface AltosFlightDisplay {
        void reset();
 
 public interface AltosFlightDisplay {
        void reset();

diff --git a/altosui/AltosFlightStats.java b/altosui/AltosFlightStats.java
index 967f094f3516322f3660416d0d09b9f636324ca5..0f32ae5e5b23f4c394c5b80cd80107fa9b895d38 100644 (file)
--- a/altosui/AltosFlightStats.java
+++ b/altosui/AltosFlightStats.java
@@ -18,7 +18,7 @@
 package altosui;
 
 import java.io.*;
 package altosui;
 
 import java.io.*;

-import org.altusmetrum.altoslib.*;
+import org.altusmetrum.altoslib_1.*;

 
 public class AltosFlightStats {
        double          max_height;
 
 public class AltosFlightStats {
        double          max_height;

diff --git a/altosui/AltosFlightStatsTable.java b/altosui/AltosFlightStatsTable.java
index 7a91d642a44cea3e888c00fdea81fac82519b5d1..2b3e4d5ddf5b866080b2af839f142a6c36aa455b 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.*;
+import org.altusmetrum.altoslib_1.*;

 
 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 8eaf5db7f27f5026ae39d02c40d932a37c5c9706..20539a9f6c2d98c4621cd088526bae2d1d133415 100644 (file)
--- a/altosui/AltosFlightStatus.java
+++ b/altosui/AltosFlightStatus.java
@@ -19,7 +19,7 @@ package altosui;
 
 import java.awt.*;
 import javax.swing.*;
 
 import java.awt.*;
 import javax.swing.*;

-import org.altusmetrum.altoslib.*;
+import org.altusmetrum.altoslib_1.*;

 
 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 060ba3017a31953e856f16738c1dbdd63734869a..6a327841bf10553b63e8ecaab258a3af83394580 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.*;
+import org.altusmetrum.altoslib_1.*;

 
 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 6b48a2c01d3cd63cc5b28d4fdd37f4254beb9abc..bf679b857cc4abfccd28d21f256acdbc84d52248 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.*;
+import org.altusmetrum.altoslib_1.*;

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

diff --git a/altosui/AltosFlightUI.java b/altosui/AltosFlightUI.java
index 7860b218d4a6f42789957a12f8e09c68a1799e3d..c8faab90f4086ad31f87cdae42bf037268f27255 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.*;
-import org.altusmetrum.altosuilib.*;
+import org.altusmetrum.altoslib_1.*;
+import org.altusmetrum.altosuilib_1.*;

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

diff --git a/altosui/AltosFreqList.java b/altosui/AltosFreqList.java
index 98fe27d534cc6046e068d5ca19b922ff134e3b39..7464ac3ee5f244c67e7fec24ca535a2231ea8c5c 100644 (file)
--- a/altosui/AltosFreqList.java
+++ b/altosui/AltosFreqList.java
@@ -18,8 +18,8 @@
 package altosui;
 
 import javax.swing.*;
 package altosui;
 
 import javax.swing.*;

-import org.altusmetrum.altoslib.*;
-import org.altusmetrum.altosuilib.*;
+import org.altusmetrum.altoslib_1.*;
+import org.altusmetrum.altosuilib_1.*;

 
 public class AltosFreqList extends JComboBox {
 
 
 public class AltosFreqList extends JComboBox {
 

diff --git a/altosui/AltosGraphUI.java b/altosui/AltosGraphUI.java
index 4b40ba1f59d1decae98f9ef295fa6313ce524765..c45c1124a93d89ba985572daf5b76decd2fec96c 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.*;
-import org.altusmetrum.altosuilib.*;
+import org.altusmetrum.altoslib_1.*;
+import org.altusmetrum.altosuilib_1.*;

 
 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 a3b1a49e1daaa1ce7e9cd567d37b6da32e369668..89a3c1222686d70bdf88fbd862e4d206e0d34138 100644 (file)
--- a/altosui/AltosIdleMonitorUI.java
+++ b/altosui/AltosIdleMonitorUI.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.*;
-import org.altusmetrum.altosuilib.*;
+import org.altusmetrum.altoslib_1.*;
+import org.altusmetrum.altosuilib_1.*;

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

diff --git a/altosui/AltosIgniteUI.java b/altosui/AltosIgniteUI.java
index 8c2ac242699065b4efc8aa89f8c1c02bfe4cc463..14d4eebcbaf210013215e704ae3b7849613a2161 100644 (file)
--- a/altosui/AltosIgniteUI.java
+++ b/altosui/AltosIgniteUI.java
@@ -23,8 +23,8 @@ 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.altoslib.*;
-import org.altusmetrum.altosuilib.*;
+import org.altusmetrum.altoslib_1.*;
+import org.altusmetrum.altosuilib_1.*;

 
 public class AltosIgniteUI
        extends AltosUIDialog
 
 public class AltosIgniteUI
        extends AltosUIDialog

diff --git a/altosui/AltosInfoTable.java b/altosui/AltosInfoTable.java
index 579d720b0493b042dada3c48e9d18cf89feecae8..c06f57eca3f155281f6eb6a940cb74f6a8fee53b 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.*;
+import org.altusmetrum.altoslib_1.*;

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

diff --git a/altosui/AltosKML.java b/altosui/AltosKML.java
index 5fa03fc1c5a3373ebd3a6939f002fae7f6f7bda3..84f9dc7a1997d0cf05b0928ac76b83b9e5220016 100644 (file)
--- a/altosui/AltosKML.java
+++ b/altosui/AltosKML.java
@@ -18,7 +18,7 @@
 package altosui;
 
 import java.io.*;
 package altosui;
 
 import java.io.*;

-import org.altusmetrum.altoslib.*;
+import org.altusmetrum.altoslib_1.*;

 
 public class AltosKML implements AltosWriter {
 
 
 public class AltosKML implements AltosWriter {
 

diff --git a/altosui/AltosLanded.java b/altosui/AltosLanded.java
index d03e5ac56da3562a34ba9aa56b62ee6ccb221f8c..3994e5de9638c77d28e1f618015cca4b84b7dec5 100644 (file)
--- a/altosui/AltosLanded.java
+++ b/altosui/AltosLanded.java
@@ -21,7 +21,7 @@ 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.*;
+import org.altusmetrum.altoslib_1.*;

 
 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 0bad80aac459d16ada7b64207bf062e4e36eddc7..04948ee6647baedbe1222ec9b4f96ceba85ca28e 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.*;
+import org.altusmetrum.altosuilib_1.*;

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

diff --git a/altosui/AltosLaunchUI.java b/altosui/AltosLaunchUI.java
index 7e7ed010af487dc5dce5ebac84f06af076adce65..4d9fbda563c552c86331524a860d7bdaab584060 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.*;
+import org.altusmetrum.altosuilib_1.*;

 
 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 0eac0ebcf14fece1c02edcf21c61abb8bc210f36..d13f69458c4705470cfc6cf398af73aee44f7d45 100644 (file)
--- a/altosui/AltosPad.java
+++ b/altosui/AltosPad.java
@@ -19,7 +19,7 @@ package altosui;
 
 import java.awt.*;
 import javax.swing.*;
 
 import java.awt.*;
 import javax.swing.*;

-import org.altusmetrum.altoslib.*;
+import org.altusmetrum.altoslib_1.*;

 
 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 5fc786e2f1247402aaed4cf60620abda4efbd89e..cf4658affb7ef1a82297497fdb7c5c9eae52d102 100644 (file)
--- a/altosui/AltosRomconfigUI.java
+++ b/altosui/AltosRomconfigUI.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.*;
+import org.altusmetrum.altosuilib_1.*;

 
 public class AltosRomconfigUI
        extends AltosUIDialog
 
 public class AltosRomconfigUI
        extends AltosUIDialog

diff --git a/altosui/AltosScanUI.java b/altosui/AltosScanUI.java
index 9fdec1cf102d6c11827b86bfc11a6efe8ffc711c..0c903873b45fd69a9a8268e4ac9dc7cfd6814737 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.*;
-import org.altusmetrum.altosuilib.*;
+import org.altusmetrum.altoslib_1.*;
+import org.altusmetrum.altosuilib_1.*;

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

diff --git a/altosui/AltosSerial.java b/altosui/AltosSerial.java
index feca8b95d05be308f9fb498fb8b1994cb3350469..710aa1450b762d995a75744af1fdfa58eb5b786e 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.*;
-import org.altusmetrum.altosuilib.*;
+import org.altusmetrum.altoslib_1.*;
+import org.altusmetrum.altosuilib_1.*;

 
 import libaltosJNI.*;
 
 
 import libaltosJNI.*;
 

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

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

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

diff --git a/altosui/AltosSiteMap.java b/altosui/AltosSiteMap.java
index 7c5d406c3a3796e0f23c27109c87cb6d797f2c04..f111e62d45066d0d4dd6e6295a4fb44df955a0c8 100644 (file)
--- a/altosui/AltosSiteMap.java
+++ b/altosui/AltosSiteMap.java
@@ -23,8 +23,8 @@ import java.io.*;
 import java.lang.Math;
 import java.awt.geom.Point2D;
 import java.util.concurrent.*;
 import java.lang.Math;
 import java.awt.geom.Point2D;
 import java.util.concurrent.*;

-import org.altusmetrum.altoslib.*;
-import org.altusmetrum.altosuilib.*;
+import org.altusmetrum.altoslib_1.*;
+import org.altusmetrum.altosuilib_1.*;

 
 public class AltosSiteMap extends JScrollPane implements AltosFlightDisplay {
        // preferred vertical step in a tile in naut. miles
 
 public class AltosSiteMap extends JScrollPane implements AltosFlightDisplay {
        // preferred vertical step in a tile in naut. miles

diff --git a/altosui/AltosSiteMapPreload.java b/altosui/AltosSiteMapPreload.java
index f4dcc9033f4904dae8ba4c15a66e54bb83b10c58..fd648abccc2424d5bad08c2ee7c9f85e08796bf7 100644 (file)
--- a/altosui/AltosSiteMapPreload.java
+++ b/altosui/AltosSiteMapPreload.java
@@ -26,7 +26,7 @@ import java.text.*;
 import java.lang.Math;
 import java.net.URL;
 import java.net.URLConnection;
 import java.lang.Math;
 import java.net.URL;
 import java.net.URLConnection;

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

 
 class AltosMapPos extends Box {
        AltosUI         owner;
 
 class AltosMapPos extends Box {
        AltosUI         owner;

diff --git a/altosui/AltosSiteMapTile.java b/altosui/AltosSiteMapTile.java
index aeb9de805426376d89c292be25b88a15df1a2a7d..10e65bcda81ed5410d9056fc1434572528a1a47a 100644 (file)
--- a/altosui/AltosSiteMapTile.java
+++ b/altosui/AltosSiteMapTile.java
@@ -22,7 +22,7 @@ import java.awt.image.*;
 import javax.swing.*;
 import java.awt.geom.Point2D;
 import java.awt.geom.Line2D;
 import javax.swing.*;
 import java.awt.geom.Point2D;
 import java.awt.geom.Line2D;

-import org.altusmetrum.altoslib.*;
+import org.altusmetrum.altoslib_1.*;

 
 public class AltosSiteMapTile extends JLayeredPane {
        JLabel mapLabel;
 
 public class AltosSiteMapTile extends JLayeredPane {
        JLabel mapLabel;

diff --git a/altosui/AltosUI.java b/altosui/AltosUI.java
index d89b3daa8e7267cb93107c33d4c33bf035ff7401..49e3097e34b99843669fd4f33d360b9f489563b8 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.*;
-import org.altusmetrum.altosuilib.*;
+import org.altusmetrum.altoslib_1.*;
+import org.altusmetrum.altosuilib_1.*;

 
 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 3e6ff97debd6c20da4625b1780f25ca9e9cb4379..0dac9fc74f3dc3dad4c222824eeb10b0fd1be77f 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.*;
+import org.altusmetrum.altoslib_1.*;

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

diff --git a/altosui/AltosVoice.java b/altosui/AltosVoice.java
index 775c13d51f39c83c9ad2c5c2975d51fcbc12ba7f..2ed6a8c2834256d1f32faa93fc2b4c60f5bb61cf 100644 (file)
--- a/altosui/AltosVoice.java
+++ b/altosui/AltosVoice.java
@@ -20,7 +20,7 @@ package altosui;
 import com.sun.speech.freetts.Voice;
 import com.sun.speech.freetts.VoiceManager;
 import java.util.concurrent.LinkedBlockingQueue;
 import com.sun.speech.freetts.Voice;
 import com.sun.speech.freetts.VoiceManager;
 import java.util.concurrent.LinkedBlockingQueue;

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

 
 public class AltosVoice implements Runnable {
        VoiceManager                    voice_manager;
 
 public class AltosVoice implements Runnable {
        VoiceManager                    voice_manager;

diff --git a/altosui/AltosWriter.java b/altosui/AltosWriter.java
index 31c1807f14dd50145c313dad6673dbda946787e7..2f70b472b8906a2030873a01c0f5f512851dca70 100644 (file)
--- a/altosui/AltosWriter.java
+++ b/altosui/AltosWriter.java
@@ -17,7 +17,7 @@
 
 package altosui;
 
 
 package altosui;
 

-import org.altusmetrum.altoslib.*;
+import org.altusmetrum.altoslib_1.*;

 
 
 public interface AltosWriter {
 
 
 public interface AltosWriter {

diff --git a/altosuilib/AltosDevice.java b/altosuilib/AltosDevice.java
index 69b025ba1d3c855c8224052bee3c448092bcd608..2461df1b08f8f04bb519e020750d637453c8467d 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;
+package org.altusmetrum.altosuilib_1;

 
 import libaltosJNI.*;
 
 
 import libaltosJNI.*;
 

diff --git a/altosuilib/AltosDeviceDialog.java b/altosuilib/AltosDeviceDialog.java
index cde545a72b10852ca0be857a87a0d8c1876b83ec..73bc0b2f5141cd117b15c0c2d7d2e3f458556bc4 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;
+package org.altusmetrum.altosuilib_1;

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

diff --git a/altosuilib/AltosFontListener.java b/altosuilib/AltosFontListener.java
index ef5432648dca363010b685e45942fdf475d160f1..da9033525976225311d84822f292c67656ec7c18 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;
+package org.altusmetrum.altosuilib_1;

 
 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 4f90446c9c74914266d16a484cfbab80898ffb2b..e75d2de566a9bdcb009e80ab14a1656aaf01c930 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;
+package org.altusmetrum.altosuilib_1;

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

diff --git a/altosuilib/AltosUIConfigure.java b/altosuilib/AltosUIConfigure.java
index 90b413d64a3328006e88c956e2d95835e6b8f21b..9e72e403a877abf8c5677588530f110a08291836 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;
+package org.altusmetrum.altosuilib_1;

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

diff --git a/altosuilib/AltosUIDialog.java b/altosuilib/AltosUIDialog.java
index c0c33ba64d1fd0cf544e005581cef8135cd67bde..e1e699a78cd4e66adae92c0eea170b168410d07b 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;
+package org.altusmetrum.altosuilib_1;

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

diff --git a/altosuilib/AltosUIFrame.java b/altosuilib/AltosUIFrame.java
index b93b2d219c1dcca501dc9b4c17d397618584ad79..3fc99910d8c6f016d4770311146cf923dc7345b0 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;
+package org.altusmetrum.altosuilib_1;

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

diff --git a/altosuilib/AltosUILib.java b/altosuilib/AltosUILib.java
index e9daf821755509b5846a3005e70c9fe0a436de74..1b1214052f8f9598f46b8895456d6a3f95a23b76 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;
+package org.altusmetrum.altosuilib_1;

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

-import org.altusmetrum.altoslib.*;
+import org.altusmetrum.altoslib_1.*;

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

diff --git a/altosuilib/AltosUIListener.java b/altosuilib/AltosUIListener.java
index f4127f589a94a481cd7b8278786d6d71c4c0e732..450dc0bfc8701fb2b51152b035563932d8af064c 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;
+package org.altusmetrum.altosuilib_1;

 
 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/AltosUIPreferences.java b/altosuilib/AltosUIPreferences.java
index 98f325ce4443cb4ddc945786e49e178c361b0efa..49321bcec358500809bb9edd1ccfbd2f4871d71a 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;
+package org.altusmetrum.altosuilib_1;

 
 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.*;
+import org.altusmetrum.altoslib_1.*;

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

diff --git a/altosuilib/AltosUIPreferencesBackend.java b/altosuilib/AltosUIPreferencesBackend.java
index 7a2f91f02f643d7a20ecd0a095787e387f5b356b..8a5386c3328c0dd0bd3e9c66f811cf2ad2b5801c 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;
+package org.altusmetrum.altosuilib_1;

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

-import org.altusmetrum.altoslib.*;
+import org.altusmetrum.altoslib_1.*;

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

diff --git a/altosuilib/AltosUIVersion.java.in b/altosuilib/AltosUIVersion.java.in
index 6fb3b38b729b698a5d0fe7cc09247d559e9a283d..169cca1b91c8997edcc281298b2481ced3888d06 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;
+package org.altusmetrum.altosuilib_1;

 
 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 bab16fb039a06342b2f4bd630ad754af649a76f5..a54965977cacd1903c103465aa3559ef3b89682a 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;
+package org.altusmetrum.altosuilib_1;

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

diff --git a/altosuilib/AltosUnitsListener.java b/altosuilib/AltosUnitsListener.java
index 22c66cd43fbd9b027cfc1c20baae46ce71109eb6..c0a5e8b26d098adc6e142e4850abe349f7e72b15 100644 (file)
--- a/altosuilib/AltosUnitsListener.java
+++ b/altosuilib/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.altosuilib;
+package org.altusmetrum.altosuilib_1;

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

diff --git a/altosuilib/Makefile.am b/altosuilib/Makefile.am
index 5fb82793cfd73a748aac0f275315326554874b53..25d5722e39844b09bafe86e8221e4f9bbe1d56b5 100644 (file)
--- a/altosuilib/Makefile.am
+++ b/altosuilib/Makefile.am
@@ -24,7 +24,7 @@ altosuilib_JAVA = \
        AltosUIVersion.java \
        AltosUnitsListener.java
 
        AltosUIVersion.java \
        AltosUnitsListener.java
 

-JAR=altosuilib.jar
+JAR=altosuilib_$(ALTOSUILIB_VERSION).jar

 
 all-local: $(JAR)
 
 
 all-local: $(JAR)
 

diff --git a/fix-java-versions b/fix-java-versions
new file mode 100755 (executable)
index 0000000..a417b67
--- /dev/null
+++ b/fix-java-versions
@@ -0,0 +1,11 @@
+#!/bin/sh -vx
+
+sed_opts='-i'
+
+for i in "$@"; do
+       name=`echo $i | sed 's/=.*$//'`
+       value=`echo $i | sed 's/.*=//'`
+       sed_opts="$sed_opts -e s/${name}_*[0-9]*/${name}_${value}/g"
+done
+
+find . -name '*.java*' -print0 | xargs -0 sed $sed_opts

diff --git a/micropeak/MicroData.java b/micropeak/MicroData.java
index a2e30f3cffc2501a3e93df2ba575c9fff25077ae..473af44bc691da619c51deef5988039717d0582f 100644 (file)
--- a/micropeak/MicroData.java
+++ b/micropeak/MicroData.java
@@ -20,7 +20,7 @@ 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.*;
+import org.altusmetrum.altoslib_1.*;

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

diff --git a/micropeak/MicroDeviceDialog.java b/micropeak/MicroDeviceDialog.java
index 23195dac135a50d5b24ea78b80d0020afd649e53..533605d6e2a353827ead217c76119460e10836ed 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.*;
+import org.altusmetrum.altosuilib_1.*;

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

diff --git a/micropeak/MicroDownload.java b/micropeak/MicroDownload.java
index cc4046268537dd47610f8bf113a5b014671259ad..6f0ca4f653b400ef5a817baed849d877bb14e2e0 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.*;
-import org.altusmetrum.altosuilib.*;
+import org.altusmetrum.altoslib_1.*;
+import org.altusmetrum.altosuilib_1.*;

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

diff --git a/micropeak/MicroExport.java b/micropeak/MicroExport.java
index 8163b4ca69ef062cb84a718d3709ef1f91da596f..20a6f79a4cd2f5dde791f03ee116674b75283d49 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.*;
-import org.altusmetrum.altosuilib.*;
+import org.altusmetrum.altoslib_1.*;
+import org.altusmetrum.altosuilib_1.*;

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

diff --git a/micropeak/MicroFile.java b/micropeak/MicroFile.java
index ae80134ed2052228a08d7bf678d3f77b239c9e02..cdd42e667657d377334a5afe9ef309ab4ea78be9 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.*;
-import org.altusmetrum.altosuilib.*;
+import org.altusmetrum.altoslib_1.*;
+import org.altusmetrum.altosuilib_1.*;

 
 public class MicroFile {
 
 
 public class MicroFile {
 

diff --git a/micropeak/MicroFileChooser.java b/micropeak/MicroFileChooser.java
index ea5c34894fbc9ddce801a76a772c7f2abdd07091..7a3423b4e255c056caf29d7776ff72c1721185aa 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.*;
-import org.altusmetrum.altosuilib.*;
+import org.altusmetrum.altoslib_1.*;
+import org.altusmetrum.altosuilib_1.*;

 
 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 03e3af0ce7cd8e07d655bf8e07ba0018a71526b5..ef8b24cc3a370c88676d6dd4792919453cd56d7b 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.*;
+import org.altusmetrum.altosuilib_1.*;

 
 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 8cb9504bd12170ec68ad3fa834316c8a22347ff4..e8a6ea16f7967ee034e9f7ee1661217673d86d86 100644 (file)
--- a/micropeak/MicroGraph.java
+++ b/micropeak/MicroGraph.java
@@ -22,7 +22,7 @@ import java.util.ArrayList;
 
 import java.awt.*;
 import javax.swing.*;
 
 import java.awt.*;
 import javax.swing.*;

-import org.altusmetrum.altoslib.*;
+import org.altusmetrum.altoslib_1.*;

 
 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 e6aa9ab027dbd1768d42acd776fce06a0bdf9d3f..63387ed1fc0f26d60999e2954ebcdbe35df645cd 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.*;
-import org.altusmetrum.altosuilib.*;
+import org.altusmetrum.altoslib_1.*;
+import org.altusmetrum.altosuilib_1.*;

 
 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 8cd7afd459105e25f1e9c3db3d28cff6923efa95..7337a1dec58b38f6ccdb75c87e402c297ca31e74 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.*;
-import org.altusmetrum.altosuilib.*;
+import org.altusmetrum.altoslib_1.*;
+import org.altusmetrum.altosuilib_1.*;

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

diff --git a/micropeak/MicroSave.java b/micropeak/MicroSave.java
index dae72779aa3e25be56f2a8278b0cc2a1a22e7a91..5088b7d7b0379769f796f07639f1cc910b3ef829 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.*;
-import org.altusmetrum.altosuilib.*;
+import org.altusmetrum.altoslib_1.*;
+import org.altusmetrum.altosuilib_1.*;

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

diff --git a/micropeak/MicroSerial.java b/micropeak/MicroSerial.java
index 15ef858244bcfa5cc3efee138d56caf008115bdc..376223f16098a38e8fe262a5f40161b7aba3e5f2 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.*;
+import org.altusmetrum.altosuilib_1.*;

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

diff --git a/micropeak/MicroStats.java b/micropeak/MicroStats.java
index 151f40da75479deb5a28e786922c8f273efa0430..abc1296bbcee04d4abca80aa2b253bcd1e8ab0a0 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.*;
-import org.altusmetrum.altosuilib.*;
+import org.altusmetrum.altoslib_1.*;
+import org.altusmetrum.altosuilib_1.*;

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

diff --git a/micropeak/MicroStatsTable.java b/micropeak/MicroStatsTable.java
index 7387fdd7761ebe7640e98b765ceb8026bcf44388..5bdf5cb616a942b04ed10074cf6da1f7e763ba29 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.*;
-import org.altusmetrum.altosuilib.*;
+import org.altusmetrum.altoslib_1.*;
+import org.altusmetrum.altosuilib_1.*;

 
 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 f56d81d40b087fc5de6be346e800660fd821ab98..3bd61470cc847c4eb0d763562014f10c73f23ab7 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.*;
+import org.altusmetrum.altosuilib_1.*;

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