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

Timestamp:

2020-01-22T21:18:17+01:00 (4 years ago)

Author:

simon04

Message:

fix #18598 - CopyKeyValueAction: count values going to be copied

This fixes the nasty i18n string "Copy selected Key(s)/Value(s)".

Location:

trunk/src/org/openstreetmap/josm/gui/dialogs/properties

Files:

• AbstractCopyAction.java (modified) (2 diffs)
• CopyKeyValueAction.java (modified) (5 diffs)
• PropertiesDialog.java (modified) (1 diff)

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

@@ -9 +9 @@
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import javax.swing.AbstractAction;
@@ -40 +41 @@
     protected abstract Collection<String> getString(Tagged p, String key);
 
-    @Override
-    public void actionPerformed(ActionEvent ae) {
+    protected Stream<String> valueStream() {
         int[] rows = tagTable.getSelectedRows();
         Collection<? extends Tagged> sel = objectSupplier.get();
-        if (rows.length == 0 || sel == null || sel.isEmpty()) return;
-
-        final String values = Arrays.stream(rows)
+        if (rows.length == 0 || sel == null || sel.isEmpty()) return Stream.empty();
+        return Arrays.stream(rows)
                 .mapToObj(keySupplier)
                 .flatMap(key -> sel.stream().map(p -> getString(p, key)))
                 .filter(Objects::nonNull)
-                .flatMap(Collection::stream)
+                .flatMap(Collection::stream);
+    }
+
+    @Override
+    public void actionPerformed(ActionEvent ae) {
+        final String values = valueStream()
                 .sorted()
                 .collect(Collectors.joining("\n"));

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

@@ -3 +3 @@
 
 import static org.openstreetmap.josm.tools.I18n.tr;
+import static org.openstreetmap.josm.tools.I18n.trn;
 
 import java.util.Collection;
@@ -10 +11 @@
 
 import javax.swing.JTable;
+import javax.swing.event.PopupMenuEvent;
+import javax.swing.event.PopupMenuListener;
 
 import org.openstreetmap.josm.data.osm.Tag;
@@ -18 +21 @@
  * @since 13521
  */
-public class CopyKeyValueAction extends AbstractCopyAction {
+public class CopyKeyValueAction extends AbstractCopyAction implements PopupMenuListener {
 
     /**
@@ -28 +31 @@
     public CopyKeyValueAction(JTable tagTable, IntFunction<String> keyFn, Supplier<Collection<? extends Tagged>> objectSp) {
         super(tagTable, keyFn, objectSp);
-        putValue(NAME, tr("Copy selected Key(s)/Value(s)"));
+        setName(0);
         putValue(SHORT_DESCRIPTION, tr("Copy the key and value of the selected tag(s) to clipboard"));
+    }
+
+    private void setName(long n) {
+        putValue(NAME, trn("Copy selected {0} Key/Value", "Copy selected {0} Keys/Values", n, n));
     }
 
@@ -37 +44 @@
         return v == null ? null : Collections.singleton(new Tag(key, v).toString());
     }
+
+    @Override
+    public void popupMenuWillBecomeVisible(PopupMenuEvent e) {
+        setName(valueStream().count());
+    }
+
+    @Override
+    public void popupMenuWillBecomeInvisible(PopupMenuEvent e) {
+        // Do nothing
+    }
+
+    @Override
+    public void popupMenuCanceled(PopupMenuEvent e) {
+        // Do nothing
+    }
 }

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

@@ -447 +447 @@
         tagMenu.add(copyValueAction);
         tagMenu.add(copyKeyValueAction);
+        tagMenu.addPopupMenuListener(copyKeyValueAction);
         tagMenu.add(copyAllKeyValueAction);
         tagMenu.addSeparator();