Changeset 15581 in josm for trunk

Timestamp:

2019-12-11T01:34:19+01:00 (4 years ago)

Author:

Don-vip

Message:

fix #18409 - distinct label for relation wiki link in Membership Context Menu

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• dialogs/properties/HelpAction.java (modified) (4 diffs)
• dialogs/properties/HelpMembershipAction.java (added)
• dialogs/properties/HelpTagAction.java (added)
• dialogs/properties/PropertiesDialog.java (modified) (4 diffs)
• history/TagInfoViewer.java (modified) (2 diffs)

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

@@ -10 +10 @@
 import java.util.Arrays;
 import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.function.IntFunction;
 
 import javax.swing.AbstractAction;
-import javax.swing.JTable;
 import javax.swing.KeyStroke;
 import javax.xml.parsers.ParserConfigurationException;
@@ -35 +31 @@
  * @since 13521
  */
-public class HelpAction extends AbstractAction {
-    private final JTable tagTable;
-    private final IntFunction<String> tagKeySupplier;
-    private final IntFunction<Map<String, Integer>> tagValuesSupplier;
-
-    private final JTable membershipTable;
-    private final IntFunction<IRelation<?>> memberValueSupplier;
+public abstract class HelpAction extends AbstractAction {
 
     /**
      * Constructs a new {@code HelpAction}.
-     * @param tagTable The tag table. Cannot be null
-     * @param tagKeySupplier Finds the key from given row of tag table. Cannot be null
-     * @param tagValuesSupplier Finds the values from given row of tag table (map of values and number of occurrences). Cannot be null
-     * @param membershipTable The membership table. Can be null
-     * @param memberValueSupplier Finds the parent relation from given row of membership table. Can be null
-     * @since 13959 (signature)
      */
-    public HelpAction(JTable tagTable, IntFunction<String> tagKeySupplier, IntFunction<Map<String, Integer>> tagValuesSupplier,
-            JTable membershipTable, IntFunction<IRelation<?>> memberValueSupplier) {
-        this.tagTable = Objects.requireNonNull(tagTable);
-        this.tagKeySupplier = Objects.requireNonNull(tagKeySupplier);
-        this.tagValuesSupplier = Objects.requireNonNull(tagValuesSupplier);
-        this.membershipTable = membershipTable;
-        this.memberValueSupplier = memberValueSupplier;
-        putValue(NAME, tr("Go to OSM wiki for tag help"));
+    public HelpAction() {
         putValue(SHORT_DESCRIPTION, tr("Launch browser with wiki help for selected object"));
         new ImageProvider("dialogs", "search").getResource().attachImageIcon(this, true);
@@ -69 +46 @@
      * @return the keystroke launching this action
      */
-    public KeyStroke getKeyStroke() {
+    public static KeyStroke getKeyStroke() {
         return KeyStroke.getKeyStroke(KeyEvent.VK_F1, 0);
     }
@@ -75 +52 @@
     @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));
-            }
-        } else if (membershipTable != null && membershipTable.getSelectedRowCount() == 1) {
-            int row = membershipTable.getSelectedRow();
-            final IRelation<?> relation = memberValueSupplier.apply(row);
-            MainApplication.worker.execute(() -> displayRelationHelp(relation));
-        } else {
-            // give the generic help page, if more than one element is selected
-            MainApplication.worker.execute(HelpAction::displayGenericHelp);
-        }
+        // give the generic help page, if more than one element is selected
+        MainApplication.worker.execute(HelpAction::displayGenericHelp);
     }
 

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

@@ -185 +185 @@
 
     private final transient DataSetListenerAdapter dataChangedAdapter = new DataSetListenerAdapter(this);
-    private final HelpAction helpAction = new HelpAction(tagTable, editHelper::getDataKey, editHelper::getDataValues,
-            membershipTable, x -> (IRelation<?>) membershipData.getValueAt(x, 0));
+    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(tagTable, editHelper::getDataKey, editHelper::getDataValues,
             membershipTable, x -> (IRelation<?>) membershipData.getValueAt(x, 0));
@@ -389 +389 @@
         RelationPopupMenus.setupHandler(membershipMenuHandler, EditRelationAction.class, DeleteRelationsAction.class);
         membershipMenu.addSeparator();
-        membershipMenu.add(helpAction);
+        membershipMenu.add(helpRelAction);
         membershipMenu.add(taginfoAction);
 
@@ -441 +441 @@
         tagMenu.add(searchActionSame);
         tagMenu.addSeparator();
-        tagMenu.add(helpAction);
+        tagMenu.add(helpTagAction);
         tagMenu.add(taginfoAction);
         tagTable.addMouseListener(new PopupMenuLauncher(tagMenu));
@@ -486 +486 @@
         // F1 button = custom help action
         getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put(
-                helpAction.getKeyStroke(), "onHelp");
-        getActionMap().put("onHelp", helpAction);
+                HelpAction.getKeyStroke(), "onHelp");
+        getActionMap().put("onHelp", new AbstractAction() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                if (membershipTable.getSelectedRowCount() == 1) {
+                    helpRelAction.actionPerformed(e);
+                } else {
+                    helpTagAction.actionPerformed(e);
+                }
+            }
+        });
     }
 

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

@@ -20 +20 @@
 import org.openstreetmap.josm.gui.dialogs.properties.CopyKeyValueAction;
 import org.openstreetmap.josm.gui.dialogs.properties.CopyValueAction;
-import org.openstreetmap.josm.gui.dialogs.properties.HelpAction;
+import org.openstreetmap.josm.gui.dialogs.properties.HelpTagAction;
 import org.openstreetmap.josm.gui.dialogs.properties.TaginfoAction;
 import org.openstreetmap.josm.gui.widgets.PopupMenuLauncher;
@@ -95 +95 @@
         tagMenu.add(trackJosmAction(new CopyAllKeyValueAction(table, tagKeyFn, objectSp)));
         tagMenu.addSeparator();
-        tagMenu.add(trackJosmAction(new HelpAction(table, tagKeyFn, tagValuesFn, null, null)));
+        tagMenu.add(trackJosmAction(new HelpTagAction(table, tagKeyFn, tagValuesFn)));
         tagMenu.add(trackJosmAction(new TaginfoAction(table, tagKeyFn, tagValuesFn, null, null)));