Changeset 11920 in osm for applications/editors/josm/plugins/lakewalker

Timestamp:

2008-11-14T01:25:22+01:00 (16 years ago)

Author:

frederik

Message:

bugfix lakewalker NPE by Stephan <osm@…>

Location:

applications/editors/josm/plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker

Files:

• LakewalkerAction.java (modified) (1 diff)
• LakewalkerWMS.java (modified) (2 diffs)

applications/editors/josm/plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java

@@ -176 +176 @@
         System.out.println("After removing duplicate nodes, "+nodelist.size()+" nodes remain.");
           
+        
+        // if for some reason (image loading failed, ...) nodelist is empty, no more processing required.
+        if (nodelist.size() == 0) {
+                return;
+        }
         
         /**

applications/editors/josm/plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java

@@ -123 +123 @@
                         // Read from a URL
                         URL url = new URL(urlloc);
-                        this.image = ImageIO.read(url);
+                        this.image = ImageIO.read(url); // this can return null!
                 } catch(MalformedURLException e){
                         System.out.println(e.getMessage());
@@ -132 +132 @@
                     }
                 
-                this.images.add(this.image);
-                this.imageindex.put(hashkey,this.images.size()-1);
-                
-                this.saveimage(file,this.image);
+                if (this.image != null) {
+                        this.images.add(this.image);
+                        this.imageindex.put(hashkey,this.images.size()-1);
+                        
+                        this.saveimage(file,this.image);
+                }
             }