projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altosui: AltosDbm class was missing somehow
[fw/altos]
/
altosui
/
AltosIdleMonitorUI.java
diff --git
a/altosui/AltosIdleMonitorUI.java
b/altosui/AltosIdleMonitorUI.java
index 462bff181a3613fa4783162d9742b2f51cde842c..bbab017f1c525779c622e1623f1db541c8d72fba 100644
(file)
--- a/
altosui/AltosIdleMonitorUI.java
+++ b/
altosui/AltosIdleMonitorUI.java
@@
-37,11
+37,8
@@
public class AltosIdleMonitorUI extends AltosUIFrame implements AltosFlightDispl
boolean remote;
void stop_display() {
boolean remote;
void stop_display() {
- if (thread != null && thread.isAlive()) {
- thread.interrupt();
- try {
- thread.join();
- } catch (InterruptedException ie) {}
+ if (thread != null) {
+ thread.abort();
}
thread = null;
}
}
thread = null;
}
@@
-66,21
+63,21
@@
public class AltosIdleMonitorUI extends AltosUIFrame implements AltosFlightDispl
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;
try {
status_update.saved_state = state;
try {
- pad.show(state,
crc_errors
);
- flightStatus.show(state,
crc_errors
);
- flightInfo.show(state,
crc_errors
);
+ pad.show(state,
listener_state
);
+ flightStatus.show(state,
listener_state
);
+ flightInfo.show(state,
listener_state
);
} catch (Exception e) {
System.out.print("Show exception" + e);
}
}
} catch (Exception e) {
System.out.print("Show exception" + e);
}
}
- public void update(final AltosState state) {
+ public void update(final AltosState state
, final AltosListenerState listener_state
) {
Runnable r = new Runnable() {
public void run() {
Runnable r = new Runnable() {
public void run() {
- show(state,
0
);
+ show(state,
listener_state
);
}
};
SwingUtilities.invokeLater(r);
}
};
SwingUtilities.invokeLater(r);
@@
-92,8
+89,11
@@
public class AltosIdleMonitorUI extends AltosUIFrame implements AltosFlightDispl
/* DocumentListener interface methods */
public void changedUpdate(DocumentEvent e) {
/* DocumentListener interface methods */
public void changedUpdate(DocumentEvent e) {
- if (callsign_value != null)
- AltosUIPreferences.set_callsign(callsign_value.getText());
+ if (callsign_value != null) {
+ String callsign = callsign_value.getText();
+ thread.set_callsign(callsign);
+ AltosUIPreferences.set_callsign(callsign);
+ }
}
public void insertUpdate(DocumentEvent e) {
}
public void insertUpdate(DocumentEvent e) {