diff options
| author | Bdale Garbee <bdale@gag.com> | 2016-06-17 10:00:10 -0600 |
|---|---|---|
| committer | Bdale Garbee <bdale@gag.com> | 2016-06-17 10:00:10 -0600 |
| commit | 31cf047113ec72a78f4b500223a2c6be23bc86fd (patch) | |
| tree | 4f171ddf642fb06bd1b520cd98a242efe5f8320f /altosui/AltosGraphUI.java | |
| parent | 2f0c977c747824d0798550ac64eceb1d66c50efd (diff) | |
| parent | afe74c067a31ce420d0d4cdac2069c1d258a5114 (diff) | |
Merge branch 'master' into branch-1.6
Diffstat (limited to 'altosui/AltosGraphUI.java')
| -rw-r--r-- | altosui/AltosGraphUI.java | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/altosui/AltosGraphUI.java b/altosui/AltosGraphUI.java index 34d56b24..4f394d73 100644 --- a/altosui/AltosGraphUI.java +++ b/altosui/AltosGraphUI.java @@ -23,8 +23,8 @@ import java.util.ArrayList; import java.awt.*; import java.awt.event.*; import javax.swing.*; -import org.altusmetrum.altoslib_10.*; -import org.altusmetrum.altosuilib_10.*; +import org.altusmetrum.altoslib_11.*; +import org.altusmetrum.altosuilib_11.*; import org.jfree.chart.ChartPanel; import org.jfree.chart.JFreeChart; @@ -35,7 +35,7 @@ public class AltosGraphUI extends AltosUIFrame implements AltosFontListener, Alt JTabbedPane pane; AltosGraph graph; AltosUIEnable enable; - AltosUIMapNew map; + AltosUIMap map; AltosState state; AltosGraphDataSet graphDataSet; AltosFlightStats stats; @@ -47,7 +47,7 @@ public class AltosGraphUI extends AltosUIFrame implements AltosFontListener, Alt for (AltosState state : states) { if (state.gps != null && state.gps.locked && state.gps.nsat >= 4) { if (map == null) - map = new AltosUIMapNew(); + map = new AltosUIMap(); map.show(state, null); has_gps = true; } @@ -100,8 +100,6 @@ public class AltosGraphUI extends AltosUIFrame implements AltosFontListener, Alt addWindowListener(new WindowAdapter() { @Override public void windowClosing(WindowEvent e) { - setVisible(false); - dispose(); AltosUIPreferences.unregister_font_listener(AltosGraphUI.this); AltosPreferences.unregister_units_listener(AltosGraphUI.this); } |