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/AltosUI.java | |
| parent | 8c5ebaf88b459b09924753a8077393a7b0639133 (diff) | |
| parent | d374d6be7eb040457f4df6c38b5d057f26ee741c (diff) | |
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
Diffstat (limited to 'altosui/AltosUI.java')
| -rw-r--r-- | altosui/AltosUI.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/altosui/AltosUI.java b/altosui/AltosUI.java index dcc0de60..70142a93 100644 --- a/altosui/AltosUI.java +++ b/altosui/AltosUI.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 AltosUI extends AltosFrame { +public class AltosUI extends AltosUIFrame { public AltosVoice voice = new AltosVoice(); public static boolean load_library(Frame frame) { @@ -241,7 +242,7 @@ public class AltosUI extends AltosFrame { } private void ConnectToDevice() { - AltosDevice device = AltosDeviceDialog.show(AltosUI.this, + AltosDevice device = AltosDeviceUIDialog.show(AltosUI.this, Altos.product_basestation); if (device != null) |