Changeset 16834 in josm

Timestamp:

2020-08-03T20:23:44+02:00 (5 years ago)

Author:

simon04

Message:

fix #19620 - Tag2Link: allow to customize sources

Location:

trunk

Files:

• src/org/openstreetmap/josm/tools/Tag2Link.java (modified) (4 diffs)
• test/unit/org/openstreetmap/josm/tools/Tag2LinkTest.java (modified) (2 diffs)

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

@@ -23 +23 @@
 
 import org.openstreetmap.josm.data.osm.OsmUtils;
+import org.openstreetmap.josm.data.preferences.ListProperty;
+import org.openstreetmap.josm.io.CachedFile;
 
 /**
@@ -54 +56 @@
             .collect(Collectors.joining("|"));
 
+    static final ListProperty PREF_SOURCE = new ListProperty("tag2link.source",
+            Collections.singletonList("resource://META-INF/resources/webjars/tag2link/2020.7.15/index.json"));
+
     private Tag2Link() {
         // private constructor for utility class
@@ -77 +82 @@
         try {
             wikidataRules.clear();
-            initializeFromResources();
+            for (String source : PREF_SOURCE.get()) {
+                initializeFromResources(new CachedFile(source));
+            }
         } catch (Exception e) {
             Logging.error("Failed to initialize tag2link rules");
@@ -87 +94 @@
      * Initializes the tag2link rules from the resources.
      *
+     * @param resource the source
      * @throws IOException in case of I/O error
      */
-    private static void initializeFromResources() throws IOException {
-        final String resource = "META-INF/resources/webjars/tag2link/2020.7.15/index.json";
+    private static void initializeFromResources(CachedFile resource) throws IOException {
         final JsonArray rules;
-        try (InputStream inputStream = Tag2Link.class.getClassLoader().getResourceAsStream(resource);
+        try (InputStream inputStream = resource.getInputStream();
              JsonReader jsonReader = Json.createReader(inputStream)) {
             rules = jsonReader.readArray();

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

@@ -7 +7 @@
 
 import org.junit.Assert;
+import org.junit.Rule;
 import org.junit.Test;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
 /**
@@ -23 +27 @@
         Assert.assertEquals(Arrays.asList(expected), links);
     }
+
+    /**
+     * Setup test.
+     */
+    @Rule
+    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+    public JOSMTestRules test = new JOSMTestRules().preferences();
 
     /**