Changeset 4715 in josm for trunk/src

Timestamp:

2011-12-26T23:27:03+01:00 (13 years ago)

Author:

simon04

Message:

see #7182 - Individual Icons for Imagery Background (make loading more robust)

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/AddImageryLayerAction.java (modified) (1 diff)
• tools/ImageRequest.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/AddImageryLayerAction.java

@@ -28 +28 @@
         try {
             if (info.getIcon() != null) {
-                ImageIcon i = new ImageRequest().setName(info.getIcon()).setMaxHeight(MAX_ICON_SIZE).setMaxWidth(MAX_ICON_SIZE).get();
-                putValue(Action.SMALL_ICON, i);
+                ImageIcon i = new ImageRequest().setOptional(true).setName(info.getIcon()).
+                        setMaxHeight(MAX_ICON_SIZE).setMaxWidth(MAX_ICON_SIZE).get();
+                if (i != null) {
+                    putValue(Action.SMALL_ICON, i);
+                }
             }
         } catch (Exception ex) {

trunk/src/org/openstreetmap/josm/tools/ImageRequest.java

@@ -93 +93 @@
                 String ext = name.indexOf('.') != -1 ? "" : ".???";
                 throw new RuntimeException(tr("Fatal: failed to locate image ''{0}''. This is a serious configuration problem. JOSM will stop working.", name + ext));
-            } else
+            } else {
+                System.out.println(tr("Failed to locate image ''{0}''", name));
                 return null;
+            }
         }
         if (maxWidth != -1 || maxHeight != -1)