projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: Add debugging to ublox GPS driver
[fw/altos]
/
altosui
/
AltosSiteMapCache.java
diff --git
a/altosui/AltosSiteMapCache.java
b/altosui/AltosSiteMapCache.java
index cfad52a9d5e3cbe7ba631c77725192afb126ed9a..40c8ff6bf0dc078beff6f8b5016f8910ffe2f4c4 100644
(file)
--- a/
altosui/AltosSiteMapCache.java
+++ b/
altosui/AltosSiteMapCache.java
@@
-17,16
+17,10
@@
package altosui;
package altosui;
-import java.awt.*;
-import java.awt.image.*;
-import java.awt.event.*;
import javax.swing.*;
import javax.imageio.ImageIO;
import javax.swing.*;
import javax.imageio.ImageIO;
-import java
x.swing.tabl
e.*;
+import java
.awt.imag
e.*;
import java.io.*;
import java.io.*;
-import java.util.*;
-import java.text.*;
-import java.util.prefs.*;
import java.net.URL;
import java.net.URLConnection;
import java.net.URL;
import java.net.URLConnection;
@@
-37,7
+31,6
@@
public class AltosSiteMapCache extends JLabel {
try {
u = new URL(url);
} catch (java.net.MalformedURLException e) {
try {
u = new URL(url);
} catch (java.net.MalformedURLException e) {
- System.out.printf("Malformed URL '%s'\n", url);
return false;
}
return false;
}
@@
-58,12
+51,9
@@
public class AltosSiteMapCache extends JLabel {
in.close();
if (offset != contentLength) {
in.close();
if (offset != contentLength) {
- System.out.printf("Bad length %d != %d\n",
- offset, contentLength);
return false;
}
} catch (IOException e) {
return false;
}
} catch (IOException e) {
- System.out.printf("IO exception reading URL\n");
return false;
}
return false;
}
@@
-73,13
+63,11
@@
public class AltosSiteMapCache extends JLabel {
out.flush();
out.close();
} catch (FileNotFoundException e) {
out.flush();
out.close();
} catch (FileNotFoundException e) {
- System.out.printf("Can't create file\n");
return false;
} catch (IOException e) {
if (file.exists()) {
file.delete();
}
return false;
} catch (IOException e) {
if (file.exists()) {
file.delete();
}
- System.out.printf("IO exception writing file\n");
return false;
}
return true;
return false;
}
return true;
@@
-100,7
+88,14
@@
public class AltosSiteMapCache extends JLabel {
}
try {
}
try {
- return new ImageIcon(ImageIO.read(pngfile));
+ BufferedImage img;
+
+ img = ImageIO.read(pngfile);
+ if (img == null) {
+ System.out.printf("# Can't read pngfile %s\n", pngfile);
+ return null;
+ }
+ return new ImageIcon(img);
} catch (IOException e) {
System.out.printf("# IO error trying to load %s\n", pngfile);
return null;
} catch (IOException e) {
System.out.printf("# IO error trying to load %s\n", pngfile);
return null;