diff options
| -rw-r--r-- | altosui/AltosEepromDelete.java | 3 | ||||
| -rw-r--r-- | altosui/Makefile.am | 12 | ||||
| -rw-r--r-- | altosuilib/AltosBTDevice.java (renamed from altosui/AltosBTDevice.java) | 19 | ||||
| -rw-r--r-- | altosuilib/AltosBTDeviceIterator.java (renamed from altosui/AltosBTDeviceIterator.java) | 4 | ||||
| -rw-r--r-- | altosuilib/AltosBTKnown.java (renamed from altosui/AltosBTKnown.java) | 4 | ||||
| -rw-r--r-- | altosuilib/AltosBTManage.java (renamed from altosui/AltosBTManage.java) | 4 | ||||
| -rw-r--r-- | altosuilib/AltosDeviceUIDialog.java (renamed from altosui/AltosDeviceUIDialog.java) | 3 | ||||
| -rw-r--r-- | altosuilib/AltosSerial.java (renamed from altosui/AltosSerial.java) | 6 | ||||
| -rw-r--r-- | altosuilib/AltosSerialInUseException.java (renamed from altosui/AltosSerialInUseException.java) | 3 | ||||
| -rw-r--r-- | altosuilib/Makefile.am | 10 |
10 files changed, 33 insertions, 35 deletions
diff --git a/altosui/AltosEepromDelete.java b/altosui/AltosEepromDelete.java index b6ac7edb..df2ade78 100644 --- a/altosui/AltosEepromDelete.java +++ b/altosui/AltosEepromDelete.java @@ -21,6 +21,7 @@ import java.awt.event.*; import javax.swing.*; import java.io.*; import java.util.concurrent.*; +import org.altusmetrum.altosuilib_2.*; import org.altusmetrum.altoslib_4.*; public class AltosEepromDelete implements Runnable { @@ -140,4 +141,4 @@ public class AltosEepromDelete implements Runnable { flights = given_flights; success = false; } -}
\ No newline at end of file +} diff --git a/altosui/Makefile.am b/altosui/Makefile.am index df9fe5d1..6f491d7d 100644 --- a/altosui/Makefile.am +++ b/altosui/Makefile.am @@ -10,12 +10,6 @@ CLASSPATH_ENV=mkdir -p $(JAVAROOT); CLASSPATH="$(JAVAROOT):../altoslib/*:../alto bin_SCRIPTS=altosui -altosui_BT = \ - AltosBTDevice.java \ - AltosBTDeviceIterator.java \ - AltosBTManage.java \ - AltosBTKnown.java - altosui_JAVA = \ AltosAscent.java \ AltosChannelMenu.java \ @@ -29,7 +23,6 @@ altosui_JAVA = \ AltosConfigTDUI.java \ AltosCSVUI.java \ AltosDescent.java \ - AltosDeviceUIDialog.java \ AltosEepromDelete.java \ AltosEepromManage.java \ AltosEepromMonitorUI.java \ @@ -54,15 +47,12 @@ altosui_JAVA = \ AltosUIPreferencesBackend.java \ AltosRomconfigUI.java \ AltosScanUI.java \ - AltosSerial.java \ - AltosSerialInUseException.java \ AltosUI.java \ AltosGraph.java \ AltosGraphDataPoint.java \ AltosGraphDataSet.java \ AltosGraphUI.java \ - AltosDataChooser.java \ - $(altosui_BT) + AltosDataChooser.java JFREECHART_CLASS= \ jfreechart.jar diff --git a/altosui/AltosBTDevice.java b/altosuilib/AltosBTDevice.java index e920803a..beefa532 100644 --- a/altosui/AltosBTDevice.java +++ b/altosuilib/AltosBTDevice.java @@ -15,9 +15,10 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -package altosui; +package org.altusmetrum.altosuilib_2; + import libaltosJNI.*; -import org.altusmetrum.altosuilib_2.*; +import org.altusmetrum.altoslib_4.*; public class AltosBTDevice extends altos_bt_device implements AltosDevice { @@ -32,8 +33,8 @@ public class AltosBTDevice extends altos_bt_device implements AltosDevice { } public int getProduct() { - if (Altos.bt_product_telebt.equals(getProductName())) - return Altos.product_telebt; + if (AltosLib.bt_product_telebt.equals(getProductName())) + return AltosLib.product_telebt; return 0; } @@ -91,11 +92,11 @@ public class AltosBTDevice extends altos_bt_device implements AltosDevice { // if (!isAltusMetrum()) // return false; - if (want_product == Altos.product_any) + if (want_product == AltosLib.product_any) return true; - if (want_product == Altos.product_basestation) - return matchProduct(Altos.product_telebt); + if (want_product == AltosLib.product_basestation) + return matchProduct(AltosLib.product_telebt); if (want_product == getProduct()) return true; @@ -115,10 +116,10 @@ public class AltosBTDevice extends altos_bt_device implements AltosDevice { } public AltosBTDevice(String name, String addr) { - Altos.load_library(); + AltosUILib.load_library(); libaltos.altos_bt_fill_in(name, addr,this); } public AltosBTDevice() { } -}
\ No newline at end of file +} diff --git a/altosui/AltosBTDeviceIterator.java b/altosuilib/AltosBTDeviceIterator.java index 4be5edf5..cad60ffb 100644 --- a/altosui/AltosBTDeviceIterator.java +++ b/altosuilib/AltosBTDeviceIterator.java @@ -15,9 +15,11 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -package altosui; +package org.altusmetrum.altosuilib_2; + import java.util.*; import libaltosJNI.*; +import org.altusmetrum.altoslib_4.*; public class AltosBTDeviceIterator implements Iterator<AltosBTDevice> { AltosBTDevice current; diff --git a/altosui/AltosBTKnown.java b/altosuilib/AltosBTKnown.java index 3abbbe08..02883c75 100644 --- a/altosui/AltosBTKnown.java +++ b/altosuilib/AltosBTKnown.java @@ -15,10 +15,10 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -package altosui; +package org.altusmetrum.altosuilib_2; + import java.util.*; import org.altusmetrum.altoslib_4.*; -import org.altusmetrum.altosuilib_2.*; public class AltosBTKnown implements Iterable<AltosBTDevice> { LinkedList<AltosBTDevice> devices = new LinkedList<AltosBTDevice>(); diff --git a/altosui/AltosBTManage.java b/altosuilib/AltosBTManage.java index e6e7efd4..6da0a3eb 100644 --- a/altosui/AltosBTManage.java +++ b/altosuilib/AltosBTManage.java @@ -15,7 +15,7 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -package altosui; +package org.altusmetrum.altosuilib_2; import java.awt.*; import java.awt.event.*; @@ -23,7 +23,7 @@ import javax.swing.*; import javax.swing.plaf.basic.*; import java.util.*; import java.util.concurrent.*; -import org.altusmetrum.altosuilib_2.*; +import org.altusmetrum.altoslib_4.*; public class AltosBTManage extends AltosUIDialog implements ActionListener, Iterable<AltosBTDevice> { LinkedBlockingQueue<AltosBTDevice> found_devices; diff --git a/altosui/AltosDeviceUIDialog.java b/altosuilib/AltosDeviceUIDialog.java index 307c77f8..3013612a 100644 --- a/altosui/AltosDeviceUIDialog.java +++ b/altosuilib/AltosDeviceUIDialog.java @@ -15,12 +15,11 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -package altosui; +package org.altusmetrum.altosuilib_2; import javax.swing.*; import java.awt.*; import java.awt.event.*; -import org.altusmetrum.altosuilib_2.*; public class AltosDeviceUIDialog extends AltosDeviceDialog { diff --git a/altosui/AltosSerial.java b/altosuilib/AltosSerial.java index 9b2180ba..0632ca70 100644 --- a/altosui/AltosSerial.java +++ b/altosuilib/AltosSerial.java @@ -19,15 +19,13 @@ * Deal with TeleDongle on a serial port */ -package altosui; +package org.altusmetrum.altosuilib_2; import java.io.*; import java.util.*; import java.awt.*; import javax.swing.*; import org.altusmetrum.altoslib_4.*; -import org.altusmetrum.altosuilib_2.*; - import libaltosJNI.*; /* @@ -40,7 +38,7 @@ public class AltosSerial extends AltosLink { static java.util.List<String> devices_opened = Collections.synchronizedList(new LinkedList<String>()); - AltosDevice device; + public AltosDevice device; SWIGTYPE_p_altos_file altos; Thread input_thread; String line; diff --git a/altosui/AltosSerialInUseException.java b/altosuilib/AltosSerialInUseException.java index 318155c8..1e8207d1 100644 --- a/altosui/AltosSerialInUseException.java +++ b/altosuilib/AltosSerialInUseException.java @@ -15,8 +15,7 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -package altosui; -import org.altusmetrum.altosuilib_2.*; +package org.altusmetrum.altosuilib_2; public class AltosSerialInUseException extends Exception { public AltosDevice device; diff --git a/altosuilib/Makefile.am b/altosuilib/Makefile.am index 10b756b8..fe0c3ec7 100644 --- a/altosuilib/Makefile.am +++ b/altosuilib/Makefile.am @@ -40,7 +40,15 @@ altosuilib_JAVA = \ AltosSiteMapImage.java \ AltosVoice.java \ AltosDisplayThread.java \ - AltosFreqList.java + AltosDeviceUIDialog.java \ + AltosFreqList.java \ + AltosSerial.java \ + AltosSerialInUseException.java \ + AltosBTDevice.java \ + AltosBTDeviceIterator.java \ + AltosBTManage.java \ + AltosBTKnown.java + JAR=altosuilib_$(ALTOSUILIB_VERSION).jar |