X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltosFlightUI.java;h=cf03d2dc3732562185f8c4ca4c33bbd2c4b18acd;hp=939c468852efebc0885ba0fdb5e7aefb9b6f75f5;hb=0d685ac0916229c23a299b11dad48af749eb27ea;hpb=0afa07d3c1dcb5e301fcb8b4edfecdd961662478 diff --git a/altosui/AltosFlightUI.java b/altosui/AltosFlightUI.java index 939c4688..cf03d2dc 100644 --- a/altosui/AltosFlightUI.java +++ b/altosui/AltosFlightUI.java @@ -3,7 +3,8 @@ * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 2 of the License. + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of @@ -22,8 +23,8 @@ import java.awt.event.*; import javax.swing.*; import java.util.*; import java.util.concurrent.*; -import org.altusmetrum.altoslib_8.*; -import org.altusmetrum.altosuilib_8.*; +import org.altusmetrum.altoslib_11.*; +import org.altusmetrum.altosuilib_11.*; public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay { AltosVoice voice; @@ -40,7 +41,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 +290,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;