projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Ignore 32 and 64 bit cjnitest apps
[fw/altos]
/
altosui
/
AltosIdleMonitorUI.java
diff --git
a/altosui/AltosIdleMonitorUI.java
b/altosui/AltosIdleMonitorUI.java
index 1ef30f0a29a17dcd7db0a7e70932b9d305ca989b..88779c93440295132b28ed87da472008c9a37cff 100644
(file)
--- a/
altosui/AltosIdleMonitorUI.java
+++ b/
altosui/AltosIdleMonitorUI.java
@@
-23,7
+23,8
@@
import javax.swing.*;
import javax.swing.event.*;
import java.io.*;
import java.util.concurrent.*;
import javax.swing.event.*;
import java.io.*;
import java.util.concurrent.*;
-import org.altusmetrum.altoslib_1.*;
+import java.util.Arrays;
+import org.altusmetrum.altoslib_3.*;
import org.altusmetrum.altosuilib_1.*;
public class AltosIdleMonitorUI extends AltosUIFrame implements AltosFlightDisplay, AltosFontListener, AltosIdleMonitorListener, DocumentListener {
import org.altusmetrum.altosuilib_1.*;
public class AltosIdleMonitorUI extends AltosUIFrame implements AltosFlightDisplay, AltosFontListener, AltosIdleMonitorListener, DocumentListener {
@@
-38,7
+39,10
@@
public class AltosIdleMonitorUI extends AltosUIFrame implements AltosFlightDispl
void stop_display() {
if (thread != null) {
void stop_display() {
if (thread != null) {
- thread.abort();
+ try {
+ thread.abort();
+ } catch (InterruptedException ie) {
+ }
}
thread = null;
}
}
thread = null;
}
@@
-65,19
+69,19
@@
public class AltosIdleMonitorUI extends AltosUIFrame implements AltosFlightDispl
public void show(AltosState state, AltosListenerState listener_state) {
status_update.saved_state = state;
public void show(AltosState state, AltosListenerState listener_state) {
status_update.saved_state = state;
-
try {
+
//
try {
pad.show(state, listener_state);
flightStatus.show(state, listener_state);
flightInfo.show(state, listener_state);
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,
null
);
+ show(state,
listener_state
);
}
};
SwingUtilities.invokeLater(r);
}
};
SwingUtilities.invokeLater(r);
@@
-191,7
+195,11
@@
public class AltosIdleMonitorUI extends AltosUIFrame implements AltosFlightDispl
addWindowListener(new WindowAdapter() {
@Override
public void windowClosing(WindowEvent e) {
addWindowListener(new WindowAdapter() {
@Override
public void windowClosing(WindowEvent e) {
- disconnect();
+ try {
+ disconnect();
+ } catch (Exception ex) {
+ System.out.println(Arrays.toString(ex.getStackTrace()));
+ }
setVisible(false);
dispose();
AltosUIPreferences.unregister_font_listener(AltosIdleMonitorUI.this);
setVisible(false);
dispose();
AltosUIPreferences.unregister_font_listener(AltosIdleMonitorUI.this);