diff options
| author | Bdale Garbee <bdale@gag.com> | 2013-01-12 10:57:22 -0700 |
|---|---|---|
| committer | Bdale Garbee <bdale@gag.com> | 2013-01-12 10:57:22 -0700 |
| commit | 670034eef48d63cdaec8d271fa93da984ffe2ea9 (patch) | |
| tree | 422713fba95404876049f785255942ce6d9c4afd /altosui/AltosConfig.java | |
| parent | 8c5ebaf88b459b09924753a8077393a7b0639133 (diff) | |
| parent | d374d6be7eb040457f4df6c38b5d057f26ee741c (diff) | |
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
Diffstat (limited to 'altosui/AltosConfig.java')
| -rw-r--r-- | altosui/AltosConfig.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/altosui/AltosConfig.java b/altosui/AltosConfig.java index e1ffebb4..1cd61a89 100644 --- a/altosui/AltosConfig.java +++ b/altosui/AltosConfig.java @@ -21,8 +21,9 @@ import java.awt.event.*; import javax.swing.*; import java.io.*; import java.util.concurrent.*; -import org.altusmetrum.AltosLib.*; import java.text.*; +import org.altusmetrum.AltosLib.*; +import org.altusmetrum.altosuilib.*; public class AltosConfig implements ActionListener { @@ -270,7 +271,7 @@ public class AltosConfig implements ActionListener { public AltosConfig(JFrame given_owner) { owner = given_owner; - device = AltosDeviceDialog.show(owner, Altos.product_any); + device = AltosDeviceUIDialog.show(owner, Altos.product_any); if (device != null) { try { serial_line = new AltosSerial(device); |