projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: Other half of the ms5607 prom reporting patch
[fw/altos]
/
altosui
/
AltosDeviceDialog.java
diff --git
a/altosui/AltosDeviceDialog.java
b/altosui/AltosDeviceDialog.java
index e17504e2475580c4c75364ab060391cc1357a425..e53e75c197bdd064988f2c18b375a7d5acbb2627 100644
(file)
--- a/
altosui/AltosDeviceDialog.java
+++ b/
altosui/AltosDeviceDialog.java
@@
-24,7
+24,7
@@
import java.awt.*;
import java.awt.event.*;
import libaltosJNI.*;
import java.awt.event.*;
import libaltosJNI.*;
-public class AltosDeviceDialog extends
J
Dialog implements ActionListener {
+public class AltosDeviceDialog extends
Altos
Dialog implements ActionListener {
private AltosDevice value;
private JList list;
private AltosDevice value;
private JList list;
@@
-40,8
+40,10
@@
public class AltosDeviceDialog extends JDialog implements ActionListener {
private AltosDevice[] devices() {
java.util.List<AltosDevice> usb_devices = AltosUSBDevice.list(product);
private AltosDevice[] devices() {
java.util.List<AltosDevice> usb_devices = AltosUSBDevice.list(product);
+ int num_devices = usb_devices.size();
java.util.List<AltosDevice> bt_devices = Altos.bt_known.list(product);
java.util.List<AltosDevice> bt_devices = Altos.bt_known.list(product);
- AltosDevice[] devices = new AltosDevice[usb_devices.size() + bt_devices.size()];
+ num_devices += bt_devices.size();
+ AltosDevice[] devices = new AltosDevice[num_devices];
for (int i = 0; i < usb_devices.size(); i++)
devices[i] = usb_devices.get(i);
for (int i = 0; i < usb_devices.size(); i++)
devices[i] = usb_devices.get(i);