Changeset 4714 in josm for trunk/src/org/openstreetmap

Timestamp:

2011-12-26T22:20:52+01:00 (13 years ago)

Author:

bastiK

Message:

change wording for ImageRequest builder (see #7182)

File:

• trunk/src/org/openstreetmap/josm/tools/ImageRequest.java (modified) (4 diffs)

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

@@ -17 +17 @@
  * or in funky double-brace style
  *
- * ImageIcon icon = new ImageProvider.Request(){{name=imgName; width=100; height=120;}}.get();
+ * ImageIcon icon = new ImageRequest(){{name=imgName; width=100; height=120;}}.get();
  */
 public class ImageRequest {
@@ -30 +30 @@
     protected int maxHeight = -1;
     protected boolean sanitize;
-    protected boolean required = true;
+    protected boolean optional;
 
     public ImageRequest setDirs(Collection<String> dirs) {
@@ -82 +82 @@
     }
 
-    public ImageRequest setRequired(boolean required) {
-        this.required = required;
+    public ImageRequest setOptional(boolean optional) {
+        this.optional = optional;
         return this;
     }
@@ -90 +90 @@
         ImageResource ir = ImageProvider.getIfAvailableImpl(dirs, id, subdir, name, archive);
         if (ir == null) {
-            if (required) {
+            if (!optional) {
                 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));