projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bump version to 1.2.9.3
[fw/altos]
/
altosui
/
AltosFlightUI.java
diff --git
a/altosui/AltosFlightUI.java
b/altosui/AltosFlightUI.java
index c04a4357f6f898bb5a54882abf7a9366cbeee76c..c151177e73e1915fae355b66fc9939ff33507b56 100644
(file)
--- a/
altosui/AltosFlightUI.java
+++ b/
altosui/AltosFlightUI.java
@@
-21,7
+21,7
@@
import java.awt.*;
import java.awt.event.*;
import javax.swing.*;
import java.util.concurrent.*;
import java.awt.event.*;
import javax.swing.*;
import java.util.concurrent.*;
-import org.altusmetrum.altoslib_
1
.*;
+import org.altusmetrum.altoslib_
2
.*;
import org.altusmetrum.altosuilib_1.*;
public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay, AltosFontListener {
import org.altusmetrum.altosuilib_1.*;
public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay, AltosFontListener {
@@
-98,11
+98,13
@@
public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay, A
AltosFlightStatusUpdate status_update;
AltosFlightStatusUpdate status_update;
- public void show(AltosState state,
int crc_errors
) {
+ public void show(AltosState state,
AltosListenerState listener_state
) {
status_update.saved_state = state;
status_update.saved_state = state;
- JComponent tab = which_tab(state);
- try {
- pad.show(state, crc_errors);
+
+ if (state == null)
+ state = new AltosState();
+
+ pad.show(state, listener_state);
if (state.state != Altos.ao_flight_startup) {
if (!has_state) {
if (state.state != Altos.ao_flight_startup) {
if (!has_state) {
@@
-114,25
+116,26
@@
public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay, A
}
}
}
}
- ascent.show(state,
crc_errors
);
- descent.show(state,
crc_errors
);
- landed.show(state,
crc_errors
);
+ ascent.show(state,
listener_state
);
+ descent.show(state,
listener_state
);
+ landed.show(state,
listener_state
);
+ JComponent tab = which_tab(state);
if (tab != cur_tab) {
if (cur_tab == pane.getSelectedComponent()) {
pane.setSelectedComponent(tab);
}
cur_tab = tab;
}
if (tab != cur_tab) {
if (cur_tab == pane.getSelectedComponent()) {
pane.setSelectedComponent(tab);
}
cur_tab = tab;
}
- flightStatus.show(state,
crc_errors
);
- flightInfo.show(state,
crc_errors
);
+ flightStatus.show(state,
listener_state
);
+ flightInfo.show(state,
listener_state
);
- if (state.
data.
companion != null) {
+ if (state.companion != null) {
if (!has_companion) {
pane.add("Companion", companion);
has_companion= true;
}
if (!has_companion) {
pane.add("Companion", companion);
has_companion= true;
}
- companion.show(state,
crc_errors
);
+ companion.show(state,
listener_state
);
} else {
if (has_companion) {
pane.remove(companion);
} else {
if (has_companion) {
pane.remove(companion);
@@
-144,17
+147,13
@@
public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay, A
pane.add("Site Map", sitemap);
has_map = true;
}
pane.add("Site Map", sitemap);
has_map = true;
}
- sitemap.show(state,
crc_errors
);
+ sitemap.show(state,
listener_state
);
} else {
if (has_map) {
pane.remove(sitemap);
has_map = false;
}
}
} else {
if (has_map) {
pane.remove(sitemap);
has_map = false;
}
}
- } catch (Exception e) {
- System.out.print("Show exception " + e + "\n");
- e.printStackTrace();
- }
}
public void set_exit_on_close() {
}
public void set_exit_on_close() {