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/AltosGraphUI.java | |
| parent | 50c9a54ac6b04458970eedfa6d3e0e25f41c765f (diff) | |
| parent | 639e461ded29a48c155afea12171cbfc191ccfd7 (diff) | |
Merge branch 'branch-1.6' into debian
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); } |