Changeset 16593 in josm for trunk/src

Timestamp:

2020-06-10T23:43:36+02:00 (4 years ago)

Author:

simon04

Message:

fix #17688 - TagInfoViewer: allow to "restore selected tags" (via popup menu)

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/RestorePropertyAction.java (added)
• gui/history/TagInfoViewer.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/history/TagInfoViewer.java

@@ -16 +16 @@
 import javax.swing.ListSelectionModel;
 
+import org.openstreetmap.josm.actions.RestorePropertyAction;
+import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.PrimitiveId;
 import org.openstreetmap.josm.data.osm.Tagged;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.dialogs.properties.CopyAllKeyValueAction;
 import org.openstreetmap.josm.gui.dialogs.properties.CopyKeyValueAction;
@@ -72 +77 @@
 
         IntFunction<String> tagKeyFn = x -> (String) table.getValueAt(x, 0);
+        IntFunction<String> tagValueFn = x -> tagTableModel.getValue(tagKeyFn.apply(x));
         IntFunction<Map<String, Integer>> tagValuesFn = x -> {
-            String key = tagTableModel.getValue((String) table.getValueAt(x, 0));
-            if (key != null) {
-                return Collections.singletonMap(key, 1);
-            }
-            return Collections.emptyMap();
+            String value = tagValueFn.apply(x);
+            return value != null ? Collections.singletonMap(value, 1) : Collections.emptyMap();
         };
         Supplier<Collection<? extends Tagged>> objectSp = () -> Collections.singletonList(model.getPointInTime(pointInTime));
+        Supplier<OsmPrimitive> primitiveSupplier = () -> {
+            DataSet dataSet = MainApplication.getLayerManager().getEditDataSet();
+            PrimitiveId primitiveId = model.getPointInTime(pointInTime);
+            if (dataSet == null || primitiveId == null) {
+                return null;
+            }
+            return dataSet.getPrimitiveById(primitiveId.getUniqueId(), primitiveId.getType());
+        };
 
         tagMenu.add(trackJosmAction(new CopyValueAction(table, tagKeyFn, objectSp)));
@@ -86 +97 @@
         tagMenu.addPopupMenuListener(copyKeyValueAction);
         tagMenu.add(trackJosmAction(new CopyAllKeyValueAction(table, tagKeyFn, objectSp)));
+        tagMenu.add(new RestorePropertyAction(tagKeyFn, tagValueFn, primitiveSupplier, table.getSelectionModel()));
         tagMenu.addSeparator();
         tagMenu.add(trackJosmAction(new HelpTagAction(table, tagKeyFn, tagValuesFn)));