projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos/easymega-v2.0: Add adxl375, replace mpu6000 with 9250 [v2]
[fw/altos]
/
altosui
/
AltosFlightUI.java
diff --git
a/altosui/AltosFlightUI.java
b/altosui/AltosFlightUI.java
index eaf19256c57ff8bdffde39c029d5e337a746ecaf..8742b8ca33210b8983c2d5504b2266a472d8e58d 100644
(file)
--- a/
altosui/AltosFlightUI.java
+++ b/
altosui/AltosFlightUI.java
@@
-23,8
+23,8
@@
import java.awt.event.*;
import javax.swing.*;
import java.util.*;
import java.util.concurrent.*;
import javax.swing.*;
import java.util.*;
import java.util.concurrent.*;
-import org.altusmetrum.altoslib_1
1
.*;
-import org.altusmetrum.altosuilib_1
1
.*;
+import org.altusmetrum.altoslib_1
3
.*;
+import org.altusmetrum.altosuilib_1
3
.*;
public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay {
AltosVoice voice;
public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay {
AltosVoice voice;
@@
-115,9
+115,8
@@
public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay {
JComponent tab = which_tab(state);
if (tab != cur_tab) {
JComponent tab = which_tab(state);
if (tab != cur_tab) {
- if (cur_tab == pane.getSelectedComponent())
{
+ if (cur_tab == pane.getSelectedComponent())
pane.setSelectedComponent(tab);
pane.setSelectedComponent(tab);
- }
cur_tab = tab;
}
cur_tab = tab;
}
@@
-145,7
+144,7
@@
public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay {
}
}
}
}
- if (state.gps != null
&& state.gps.connected
) {
+ if (state.gps != null) {
if (!has_map) {
pane.add("Site Map", sitemap);
has_map = true;
if (!has_map) {
pane.add("Site Map", sitemap);
has_map = true;