diff options
author | Keith Packard <keithp@keithp.com> | 2013-01-10 21:48:12 -0800 |
---|---|---|
committer | Keith Packard <keithp@keithp.com> | 2013-01-10 21:48:12 -0800 |
commit | 1ed6b13e87c1cc2d6618b6ba3a293ea6e3b5752e (patch) | |
tree | 10adf6f3c6b6c1ed2bf7540a9972fe72253cfa81 /altosui/AltosIdleMonitorUI.java | |
parent | acff2f466031fd1a8533fc315411c3734a8bacc6 (diff) | |
parent | d409417ff8e9ed9d406bf1c04542a4ecb574768b (diff) |
Merge remote-tracking branch 'origin/micropeak-logging'
Diffstat (limited to 'altosui/AltosIdleMonitorUI.java')
-rw-r--r-- | altosui/AltosIdleMonitorUI.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/altosui/AltosIdleMonitorUI.java b/altosui/AltosIdleMonitorUI.java index 6f696009..1b3dd547 100644 --- a/altosui/AltosIdleMonitorUI.java +++ b/altosui/AltosIdleMonitorUI.java @@ -23,8 +23,9 @@ import javax.swing.*; import java.io.*; import java.util.concurrent.*; import org.altusmetrum.AltosLib.*; +import org.altusmetrum.altosuilib.*; -public class AltosIdleMonitorUI extends AltosFrame implements AltosFlightDisplay, AltosFontListener, AltosIdleMonitorListener { +public class AltosIdleMonitorUI extends AltosUIFrame implements AltosFlightDisplay, AltosFontListener, AltosIdleMonitorListener { AltosDevice device; JTabbedPane pane; AltosPad pad; @@ -90,7 +91,7 @@ public class AltosIdleMonitorUI extends AltosFrame implements AltosFlightDisplay public AltosIdleMonitorUI(JFrame in_owner) throws FileNotFoundException, AltosSerialInUseException, TimeoutException, InterruptedException { - device = AltosDeviceDialog.show(in_owner, Altos.product_any); + device = AltosDeviceUIDialog.show(in_owner, Altos.product_any); remote = false; if (!device.matchProduct(Altos.product_altimeter)) remote = true; |