Changeset 15702 in josm

Timestamp:

2020-01-13T22:30:30+01:00 (4 years ago)

Author:

simon04

Message:

see #13901 - move Tag2Link to tools/

Location:

trunk

Files:

• src/org/openstreetmap/josm/gui/MainInitialization.java (modified) (2 diffs)
• src/org/openstreetmap/josm/gui/util/AbstractTag2LinkPopupListener.java (modified) (1 diff)
• src/org/openstreetmap/josm/tools/Tag2Link.java (moved) (moved from trunk/src/org/openstreetmap/josm/gui/util/Tag2Link.java ) (4 diffs)
• test/unit/org/openstreetmap/josm/tools/Tag2LinkTest.java (moved) (moved from trunk/test/unit/org/openstreetmap/josm/gui/util/Tag2LinkTest.java ) (1 diff)
• test/unit/org/openstreetmap/josm/tools/Tag2LinkTestIT.java (moved) (moved from trunk/test/unit/org/openstreetmap/josm/gui/util/Tag2LinkTestIT.java ) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/MainInitialization.java

@@ -26 +26 @@
 import org.openstreetmap.josm.gui.tagging.presets.TaggingPresets;
 import org.openstreetmap.josm.gui.util.GuiHelper;
-import org.openstreetmap.josm.gui.util.Tag2Link;
 import org.openstreetmap.josm.io.FileWatcher;
 import org.openstreetmap.josm.io.OsmApi;
@@ -42 +41 @@
 import org.openstreetmap.josm.tools.RightAndLefthandTraffic;
 import org.openstreetmap.josm.tools.Shortcut;
+import org.openstreetmap.josm.tools.Tag2Link;
 import org.openstreetmap.josm.tools.Territories;
 import org.openstreetmap.josm.tools.Utils;

trunk/src/org/openstreetmap/josm/gui/util/AbstractTag2LinkPopupListener.java

@@ -9 +9 @@
 import javax.swing.event.PopupMenuEvent;
 import javax.swing.event.PopupMenuListener;
+
+import org.openstreetmap.josm.tools.Tag2Link;
 
 /**

trunk/src/org/openstreetmap/josm/tools/Tag2Link.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.gui.util;
+package org.openstreetmap.josm.tools;
 
 import static org.openstreetmap.josm.tools.I18n.tr;
@@ -21 +21 @@
 import org.openstreetmap.josm.data.osm.OsmUtils;
 import org.openstreetmap.josm.io.CachedFile;
-import org.openstreetmap.josm.tools.Logging;
-import org.openstreetmap.josm.tools.MultiMap;
-import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -55 +52 @@
      */
     @FunctionalInterface
-    interface LinkConsumer {
+    public interface LinkConsumer {
         /**
          * Performs the operation on the given arguments.
@@ -117 +114 @@
     }
 
-    static void getLinksForTag(String key, String value, LinkConsumer linkConsumer) {
+    /**
+     * Generates the links for the tag given by {@code key} and {@code value}, and sends 0, 1 or more links to the {@code linkConsumer}.
+     * @param key the tag key
+     * @param value the tag value
+     * @param linkConsumer the receiver of the generated links
+     */
+    public static void getLinksForTag(String key, String value, LinkConsumer linkConsumer) {
 
         // Search

trunk/test/unit/org/openstreetmap/josm/tools/Tag2LinkTest.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.gui.util;
+package org.openstreetmap.josm.tools;
 
 import java.util.ArrayList;

trunk/test/unit/org/openstreetmap/josm/tools/Tag2LinkTestIT.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.gui.util;
+package org.openstreetmap.josm.tools;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
@@ -21 +21 @@
 
     /**
-     * Integration test of function {@link Tag2Link#initialize()}.
+     * Integration test of function {@link org.openstreetmap.josm.tools.Tag2Link#initialize()}.
      */
     @Test
     public void testInitialize() {
-        Tag2Link.initialize();
+        org.openstreetmap.josm.tools.Tag2Link.initialize();
         Assert.assertTrue("obtails at least 40 rules", Tag2Link.wikidataRules.size() > 40);
     }