Changeset 8604 in josm for trunk

Timestamp:

2015-07-15T21:20:51+02:00 (9 years ago)

Author:

wiktorn

Message:

Better error reporting in JCS, checkstyle fixes

Location:

trunk

Files:

• src/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJob.java (modified) (3 diffs)
• src/org/openstreetmap/josm/data/imagery/WMTSTileSource.java (modified) (1 diff)
• src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java (modified) (1 diff)
• src/org/openstreetmap/josm/gui/preferences/imagery/CacheContentsPanel.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/data/cache (added)
• test/unit/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJobTest.java (added)

trunk/src/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJob.java

@@ -199 +199 @@
      */
     protected boolean isObjectLoadable() {
+        if (cacheData == null) {
+            return false;
+        }
         byte[] content = cacheData.getContent();
         return content != null && content.length > 0;
@@ -338 +341 @@
 
                 attributes.setResponseCode(urlConn.getResponseCode());
-                byte[] raw = Utils.readBytesFromStream(urlConn.getInputStream());
+                byte[] raw;
+                if (urlConn.getResponseCode() == 200) {
+                    raw = Utils.readBytesFromStream(urlConn.getInputStream());
+                } else {
+                    raw = new byte[]{};
+                }
 
                 if (isResponseLoadable(urlConn.getHeaderFields(), urlConn.getResponseCode(), raw)) {
@@ -440 +448 @@
         urlConn.setReadTimeout(readTimeout); // 30 seconds read timeout
         urlConn.setConnectTimeout(connectTimeout);
-        for (Map.Entry<String, String> e: headers.entrySet()) {
-            urlConn.setRequestProperty(e.getKey(), e.getValue());
+        if (headers != null) {
+            for (Map.Entry<String, String> e: headers.entrySet()) {
+                urlConn.setRequestProperty(e.getKey(), e.getValue());
+            }
         }
         if (force) {

trunk/src/org/openstreetmap/josm/data/imagery/WMTSTileSource.java

@@ -142 +142 @@
         }
 
-        private static final String[] getLayerNames(Collection<Layer> layers) {
+        private static String[] getLayerNames(Collection<Layer> layers) {
             Collection<String> ret = new ArrayList<>();
             for (Layer layer: layers) {

trunk/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java

@@ -186 +186 @@
         }
 
-
         if (tileLoader == null)
             tileLoader = new OsmTileLoader(this);

trunk/src/org/openstreetmap/josm/gui/preferences/imagery/CacheContentsPanel.java

@@ -55 +55 @@
 public class CacheContentsPanel extends JPanel {
 
-    private static class ButtonColumn extends AbstractCellEditor implements TableCellRenderer, TableCellEditor, ActionListener {
+    private static final class ButtonColumn extends AbstractCellEditor implements TableCellRenderer, TableCellEditor, ActionListener {
         private final Action action;
         private final JButton renderButton;