Changeset 16274 in josm for trunk

Timestamp:

2020-04-12T16:21:14+02:00 (4 years ago)

Author:

simon04

Message:

see #19075 - Generify HelpTagAction

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/properties/HelpTagAction.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/properties/HelpTagAction.java

@@ -8 +8 @@
 import java.util.Objects;
 import java.util.function.IntFunction;
+import java.util.function.Supplier;
 
 import javax.swing.JTable;
 
+import org.openstreetmap.josm.data.osm.Tag;
 import org.openstreetmap.josm.gui.MainApplication;
 
@@ -18 +20 @@
  */
 public class HelpTagAction extends HelpAction {
-    private final JTable tagTable;
-    private final IntFunction<String> tagKeySupplier;
-    private final IntFunction<Map<String, Integer>> tagValuesSupplier;
+    private final Supplier<Tag> tagSupplier;
+
+    /**
+     * Constructs a new {@code HelpAction}.
+     * @param tagSupplier Supplies the tag for which the help should be shown
+     * @since 16274
+     */
+    public HelpTagAction(Supplier<Tag> tagSupplier) {
+        this.tagSupplier = Objects.requireNonNull(tagSupplier);
+        putValue(NAME, tr("Go to OSM wiki for tag help"));
+    }
 
     /**
@@ -29 +39 @@
      */
     public HelpTagAction(JTable tagTable, IntFunction<String> tagKeySupplier, IntFunction<Map<String, Integer>> tagValuesSupplier) {
-        this.tagTable = Objects.requireNonNull(tagTable);
-        this.tagKeySupplier = Objects.requireNonNull(tagKeySupplier);
-        this.tagValuesSupplier = Objects.requireNonNull(tagValuesSupplier);
+        this.tagSupplier = () -> {
+            if (tagTable.getSelectedRowCount() == 1) {
+                int row = tagTable.getSelectedRow();
+                String key = tagKeySupplier.apply(row);
+                Map<String, Integer> m = tagValuesSupplier.apply(row);
+                if (!m.isEmpty()) {
+                    String val = m.entrySet().iterator().next().getKey();
+                    return new Tag(key, val);
+                }
+            }
+            return null;
+        };
         putValue(NAME, tr("Go to OSM wiki for tag help"));
     }
@@ -37 +56 @@
     @Override
     public void actionPerformed(ActionEvent e) {
-        if (tagTable.getSelectedRowCount() == 1) {
-            int row = tagTable.getSelectedRow();
-            String key = tagKeySupplier.apply(row);
-            Map<String, Integer> m = tagValuesSupplier.apply(row);
-            if (!m.isEmpty()) {
-                String val = m.entrySet().iterator().next().getKey();
-                MainApplication.worker.execute(() -> displayTagHelp(key, val));
-            }
+        Tag tag = tagSupplier.get();
+        if (tag != null) {
+            MainApplication.worker.execute(() -> displayTagHelp(tag.getKey(), tag.getValue()));
         } else {
             super.actionPerformed(e);