projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altosui: Display block number while downloading flights. Track #51
[fw/altos]
/
altosui
/
AltosUI.java
diff --git
a/altosui/AltosUI.java
b/altosui/AltosUI.java
index 0efe27a0b92985eb662948784860979936f6c272..a6742f2f360d04e47b3de019a18602fead237d19 100644
(file)
--- a/
altosui/AltosUI.java
+++ b/
altosui/AltosUI.java
@@
-22,8
+22,8
@@
import java.awt.event.*;
import javax.swing.*;
import java.io.*;
import java.util.concurrent.*;
import javax.swing.*;
import java.io.*;
import java.util.concurrent.*;
-import org.altusmetrum.
AltosLib
.*;
-import org.altusmetrum.altosuilib.*;
+import org.altusmetrum.
altoslib_1
.*;
+import org.altusmetrum.altosuilib
_1
.*;
public class AltosUI extends AltosUIFrame {
public AltosVoice voice = new AltosVoice();
public class AltosUI extends AltosUIFrame {
public AltosVoice voice = new AltosVoice();
@@
-48,7
+48,7
@@
public class AltosUI extends AltosUIFrame {
} catch (FileNotFoundException ee) {
JOptionPane.showMessageDialog(AltosUI.this,
ee.getMessage(),
} catch (FileNotFoundException ee) {
JOptionPane.showMessageDialog(AltosUI.this,
ee.getMessage(),
-
"Cannot open target device"
,
+
String.format ("Cannot open %s", device.toShortString())
,
JOptionPane.ERROR_MESSAGE);
} catch (AltosSerialInUseException si) {
JOptionPane.showMessageDialog(AltosUI.this,
JOptionPane.ERROR_MESSAGE);
} catch (AltosSerialInUseException si) {
JOptionPane.showMessageDialog(AltosUI.this,
@@
-58,17
+58,17
@@
public class AltosUI extends AltosUIFrame {
JOptionPane.ERROR_MESSAGE);
} catch (IOException ee) {
JOptionPane.showMessageDialog(AltosUI.this,
JOptionPane.ERROR_MESSAGE);
} catch (IOException ee) {
JOptionPane.showMessageDialog(AltosUI.this,
-
device.toShortString(
),
- "Unk
on
wn I/O error",
+
String.format ("Unknown I/O error on %s", device.toShortString()
),
+ "Unk
no
wn I/O error",
JOptionPane.ERROR_MESSAGE);
} catch (TimeoutException te) {
JOptionPane.showMessageDialog(this,
JOptionPane.ERROR_MESSAGE);
} catch (TimeoutException te) {
JOptionPane.showMessageDialog(this,
-
device.toShortString(
),
+
String.format ("Timeout on %s", device.toShortString()
),
"Timeout error",
JOptionPane.ERROR_MESSAGE);
} catch (InterruptedException ie) {
JOptionPane.showMessageDialog(this,
"Timeout error",
JOptionPane.ERROR_MESSAGE);
} catch (InterruptedException ie) {
JOptionPane.showMessageDialog(this,
-
device.toShortString(
),
+
String.format("Interrupted %s", device.toShortString()
),
"Interrupted exception",
JOptionPane.ERROR_MESSAGE);
}
"Interrupted exception",
JOptionPane.ERROR_MESSAGE);
}