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

Timestamp:

2018-11-25T15:00:02+01:00 (7 years ago)

Author:

Don-vip

Message:

fix #17027 - clean output of TaggingPresetPreferenceTestIT

Location:

trunk/src/org/openstreetmap/josm

Files:

• gui/tagging/presets/TaggingPreset.java (modified) (4 diffs)
• tools/XmlObjectParser.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPreset.java

@@ -21 +21 @@
 import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.CompletableFuture;
 import java.util.function.Predicate;
 
@@ -128 +129 @@
     private boolean originalSelectionEmpty;
 
+    /** The completable future task of asynchronous icon loading */
+    private CompletableFuture<Void> iconFuture;
+
     /**
      * Create an empty tagging preset. This will not have any items and
@@ -215 +219 @@
         File arch = TaggingPresetReader.getZipIcons();
         final Collection<String> s = Config.getPref().getList("taggingpreset.icon.sources", null);
-        ImageProvider imgProv = new ImageProvider(iconName);
-        imgProv.setDirs(s);
-        imgProv.setId("presets");
-        imgProv.setArchive(arch);
-        imgProv.setOptional(true);
-        imgProv.getResourceAsync(result -> {
-            if (result != null) {
-                GuiHelper.runInEDT(() -> result.attachImageIcon(this));
-            } else {
-                Logging.warn(toString() + ": " + PRESET_ICON_ERROR_MSG_PREFIX + iconName);
-            }
-        });
+        this.iconFuture = new ImageProvider(iconName)
+            .setDirs(s)
+            .setId("presets")
+            .setArchive(arch)
+            .setOptional(true)
+            .getResourceAsync(result -> {
+                if (result != null) {
+                    GuiHelper.runInEDT(() -> result.attachImageIcon(this));
+                } else {
+                    Logging.warn(toString() + ": " + PRESET_ICON_ERROR_MSG_PREFIX + iconName);
+                }
+            });
     }
 
@@ -648 +652 @@
         return actionParser.saveAction(new ToolbarPreferences.ActionDefinition(this));
     }
+
+    /**
+     * Returns the completable future task that performs icon loading, if any.
+     * @return the completable future task that performs icon loading, or null
+     * @since 14449
+     */
+    public CompletableFuture<Void> getIconLoadingTask() {
+        return iconFuture;
+    }
 }

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

@@ -146 +146 @@
                     f.set(c, getValueForClass(f.getType(), value));
                 } else {
+                    String setter;
                     if (fieldName.startsWith(lang)) {
                         int l = lang.length();
-                        fieldName = "set" + fieldName.substring(l, l + 1).toUpperCase(Locale.ENGLISH) + fieldName.substring(l + 1);
+                        setter = "set" + fieldName.substring(l, l + 1).toUpperCase(Locale.ENGLISH) + fieldName.substring(l + 1);
                     } else {
-                        fieldName = "set" + fieldName.substring(0, 1).toUpperCase(Locale.ENGLISH) + fieldName.substring(1);
+                        setter = "set" + fieldName.substring(0, 1).toUpperCase(Locale.ENGLISH) + fieldName.substring(1);
                     }
-                    Method m = entry.getMethod(fieldName);
+                    Method m = entry.getMethod(setter);
                     if (m != null) {
                         m.invoke(c, getValueForClass(m.getParameterTypes()[0], value));