Changeset 4853 in josm for trunk/src

Timestamp:

2012-01-22T21:14:40+01:00 (13 years ago)

Author:

bastiK

Message:

fixed #7248 - not worcked

Location:

trunk/src/org/openstreetmap/josm/data/imagery

Files:

• ImageryInfo.java (modified) (3 diffs)
• ImageryLayerInfo.java (modified) (1 diff)

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

@@ -23 +23 @@
 import org.openstreetmap.gui.jmapviewer.tilesources.OsmTileSource.Mapnik;
 import org.openstreetmap.gui.jmapviewer.tilesources.AbstractTileSource;
+import org.openstreetmap.josm.tools.CheckParameterUtil;
 
 /**
@@ -187 +188 @@
 
     public ImageryInfo(ImageryPreferenceEntry e) {
+        CheckParameterUtil.ensureParameterNotNull(e.name, "name");
+        CheckParameterUtil.ensureParameterNotNull(e.url, "url");
         name = e.name;
         url = e.url;
@@ -197 +200 @@
             }
         }
+        if (imageryType == null) throw new IllegalArgumentException("unkown type");
         pixelPerDegree = e.pixel_per_eastnorth;
         defaultMaxZoom = e.max_zoom;

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

@@ -52 +52 @@
         } else {
             for (ImageryPreferenceEntry prefEntry : entries) {
-                ImageryInfo i = new ImageryInfo(prefEntry);
-                add(i);
+                try {
+                    ImageryInfo i = new ImageryInfo(prefEntry);
+                    add(i);
+                } catch (IllegalArgumentException e) {
+                    System.err.println("Warning: Unable to load imagery preference entry:"+e);
+                }
             }
             Collections.sort(layers);