Changeset 15673 in josm

Timestamp:

2020-01-10T00:07:24+01:00 (4 years ago)

Author:

simon04

Message:

see #13901 - Reimplement Tag2Link in core

The plugin tag2link has been created and maintained by Don-vip.

Location:

trunk

Files:

• src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java (modified) (2 diffs)
• src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java (modified) (3 diffs)
• src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java (modified) (4 diffs)
• src/org/openstreetmap/josm/gui/history/OpenChangesetPopupMenu.java (modified) (4 diffs)
• src/org/openstreetmap/josm/gui/util/AbstractTag2LinkPopupListener.java (added)
• src/org/openstreetmap/josm/gui/util/OpenBrowserAction.java (added)
• src/org/openstreetmap/josm/gui/util/Tag2Link.java (added)
• test/unit/org/openstreetmap/josm/gui/util/Tag2LinkTest.java (added)

trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java

@@ -78 +78 @@
 import org.openstreetmap.josm.gui.layer.MainLayerManager.ActiveLayerChangeEvent;
 import org.openstreetmap.josm.gui.layer.MainLayerManager.ActiveLayerChangeListener;
+import org.openstreetmap.josm.gui.util.AbstractTag2LinkPopupListener;
 import org.openstreetmap.josm.gui.util.HighlightHelper;
 import org.openstreetmap.josm.gui.widgets.CompileSearchTextDecorator;
@@ -662 +663 @@
             }
         });
+
+        popupMenuHandler.addListener(new AbstractTag2LinkPopupListener() {
+            @Override
+            public void popupMenuWillBecomeVisible(PopupMenuEvent e) {
+                final IRelation<?> selection = getSelected();
+                if (selection != null) {
+                    selection.visitKeys((primitive, key, value) -> addLinks(popupMenu, key, value));
+                }
+            }
+        });
     }
 

trunk/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java

@@ -36 +36 @@
 import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
+import javax.swing.event.PopupMenuEvent;
 
 import org.openstreetmap.josm.actions.AbstractSelectAction;
@@ -74 +75 @@
 import org.openstreetmap.josm.gui.layer.MainLayerManager.ActiveLayerChangeEvent;
 import org.openstreetmap.josm.gui.layer.MainLayerManager.ActiveLayerChangeListener;
+import org.openstreetmap.josm.gui.util.AbstractTag2LinkPopupListener;
 import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.gui.util.HighlightHelper;
@@ -231 +233 @@
         handler.addAction(actZoomToListSelection);
         handler.addSeparator();
+        handler.addListener(new AbstractTag2LinkPopupListener() {
+            @Override
+            public void popupMenuWillBecomeVisible(PopupMenuEvent e) {
+                final Collection<OsmPrimitive> selection = getSelectedPrimitives();
+                if (!selection.isEmpty()) {
+                    selection.iterator().next().visitKeys((primitive, key, value) -> addLinks(popupMenu, key, value));
+                }
+            }
+        });
         return RelationPopupMenus.setupHandler(handler);
     }

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

@@ -41 +41 @@
 import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
+import javax.swing.event.PopupMenuEvent;
 import javax.swing.event.RowSorterEvent;
 import javax.swing.event.RowSorterListener;
@@ -97 +98 @@
 import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetHandler;
 import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetType;
+import org.openstreetmap.josm.gui.util.AbstractTag2LinkPopupListener;
 import org.openstreetmap.josm.gui.util.HighlightHelper;
 import org.openstreetmap.josm.gui.util.TableHelper;
@@ -391 +393 @@
         membershipMenu.add(taginfoAction);
 
+        membershipMenu.addPopupMenuListener(new AbstractTag2LinkPopupListener() {
+            @Override
+            public void popupMenuWillBecomeVisible(PopupMenuEvent e) {
+                final IRelation<?> relation = getSelectedMembershipRelation();
+                if (relation != null) {
+                    relation.visitKeys((primitive, key, value) -> addLinks(membershipMenu, key, value));
+                }
+            }
+        });
+
         membershipTable.addMouseListener(new PopupMenuLauncher(membershipMenu) {
             @Override
@@ -442 +454 @@
         tagMenu.add(helpTagAction);
         tagMenu.add(taginfoAction);
+        tagMenu.addPopupMenuListener(new AbstractTag2LinkPopupListener() {
+            @Override
+            public void popupMenuWillBecomeVisible(PopupMenuEvent e) {
+                final Tags tags = getSelectedProperties();
+                if (tags != null) {
+                    tags.getValues().forEach(value -> addLinks(tagMenu, tags.getKey(), value));
+                }
+            }
+        });
+
         tagTable.addMouseListener(new PopupMenuLauncher(tagMenu));
     }

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

@@ -6 +6 @@
 import java.awt.Container;
 import java.awt.Rectangle;
-import java.awt.event.ActionEvent;
 import java.text.MessageFormat;
 import java.util.Arrays;
@@ -12 +11 @@
 import java.util.Objects;
 
-import javax.swing.AbstractAction;
 import javax.swing.Action;
 import javax.swing.JComponent;
@@ -20 +18 @@
 import org.openstreetmap.josm.data.StructUtils.StructEntry;
 import org.openstreetmap.josm.data.osm.PrimitiveId;
+import org.openstreetmap.josm.gui.util.OpenBrowserAction;
 import org.openstreetmap.josm.spi.preferences.Config;
-import org.openstreetmap.josm.tools.ImageProvider;
-import org.openstreetmap.josm.tools.OpenBrowser;
 
 /**
@@ -107 +104 @@
     }
 
-    static class OpenBrowserAction extends AbstractAction {
-        final String url;
-
-        OpenBrowserAction(String name, String url) {
-            super(name);
-            putValue(SHORT_DESCRIPTION, tr("Open {0}", url));
-            new ImageProvider("help/internet").getResource().attachImageIcon(this, true);
-            this.url = url;
-        }
-
-        @Override
-        public void actionPerformed(ActionEvent e) {
-            OpenBrowser.displayUrl(url);
-        }
-    }
 }