diff options
| author | Bdale Garbee <bdale@gag.com> | 2016-06-17 10:02:00 -0600 |
|---|---|---|
| committer | Bdale Garbee <bdale@gag.com> | 2016-06-17 10:02:00 -0600 |
| commit | 085336c45ce0577031a7af5de117a8b856160708 (patch) | |
| tree | 13a145eab69e38f2658359fa8395e7257b3c3fb9 /altosui/AltosFlightUI.java | |
| parent | 50c9a54ac6b04458970eedfa6d3e0e25f41c765f (diff) | |
| parent | 639e461ded29a48c155afea12171cbfc191ccfd7 (diff) | |
Merge branch 'branch-1.6' into debian
Diffstat (limited to 'altosui/AltosFlightUI.java')
| -rw-r--r-- | altosui/AltosFlightUI.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/altosui/AltosFlightUI.java b/altosui/AltosFlightUI.java index a1526cb5..63f8c670 100644 --- a/altosui/AltosFlightUI.java +++ b/altosui/AltosFlightUI.java @@ -22,8 +22,8 @@ import java.awt.event.*; import javax.swing.*; import java.util.*; import java.util.concurrent.*; -import org.altusmetrum.altoslib_10.*; -import org.altusmetrum.altosuilib_10.*; +import org.altusmetrum.altoslib_11.*; +import org.altusmetrum.altosuilib_11.*; public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay { AltosVoice voice; @@ -40,7 +40,7 @@ public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay { AltosDescent descent; AltosLanded landed; AltosCompanionInfo companion; - AltosUIMapNew sitemap; + AltosUIMap sitemap; boolean has_map; boolean has_companion; boolean has_state; @@ -289,7 +289,7 @@ public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay { has_companion = false; has_state = false; - sitemap = new AltosUIMapNew(); + sitemap = new AltosUIMap(); displays.add(sitemap); has_map = false; |