Changeset 16597 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java

Timestamp:

2020-06-11T11:32:21+02:00 (4 years ago)

Author:

simon04

Message:

see #19369 - TaginfoAction.withTaginfoUrl: simplify construction of custom instances, share Consumer objects

File:

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

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

@@ -192 +192 @@
     private final HelpAction helpTagAction = new HelpTagAction(tagTable, editHelper::getDataKey, editHelper::getDataValues);
     private final HelpAction helpRelAction = new HelpMembershipAction(membershipTable, x -> (IRelation<?>) membershipData.getValueAt(x, 0));
-    private final TaginfoAction taginfoAction = new TaginfoAction(tr("Go to Taginfo"),
+    private final TaginfoAction taginfoAction = new TaginfoAction(
             tagTable, editHelper::getDataKey, editHelper::getDataValues,
-            membershipTable, x -> (IRelation<?>) membershipData.getValueAt(x, 0), null);
+            membershipTable, x -> (IRelation<?>) membershipData.getValueAt(x, 0));
     private final TaginfoAction tagHistoryAction = taginfoAction.toTagHistoryAction();
     private final Collection<TaginfoAction> taginfoNationalActions = new ArrayList<>();
@@ -375 +375 @@
             final LatLon center = newSel.iterator().next().getBBox().getCenter();
             Territories.getRegionalTaginfoUrls(center).stream()
-                    .map(taginfo -> new TaginfoAction(tr("Go to Taginfo ({0})", taginfo.toString()),
-                            tagTable, editHelper::getDataKey, editHelper::getDataValues,
-                            membershipTable, x -> (IRelation<?>) membershipData.getValueAt(x, 0), taginfo.getUrl())
+                    .map(taginfo -> taginfoAction.withTaginfoUrl(tr("Go to Taginfo ({0})", taginfo.toString()), taginfo.getUrl())
                     ).forEach(taginfoNationalActions::add);
             taginfoNationalActions.stream().map(membershipMenu::add).forEach(membershipMenuTagInfoNatItems::add);