Changeset 35321 in osm for applications/viewer

Timestamp:

2020-02-15T15:37:16+01:00 (5 years ago)

Author:

donvip

Message:

see #josm18440 - allow IOException to be raised

Location:

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer

Files:

• FeatureAdapter.java (modified) (2 diffs)
• tilesources/TemplatedTMSTileSource.java (modified) (2 diffs)

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/FeatureAdapter.java

@@ -42 +42 @@
          * @param imageryId imagery id
          * @return the API key for the given imagery id
-         */
-        String retrieveApiKey(String imageryId);
+         * @throws IOException in case of I/O error
+         */
+        String retrieveApiKey(String imageryId) throws IOException;
     }
 
@@ -191 +192 @@
      * @param imageryId imagery id
      * @return the API key for the given imagery id
-     */
-    public static String retrieveApiKey(String imageryId) {
+     * @throws IOException in case of I/O error
+     */
+    public static String retrieveApiKey(String imageryId) throws IOException {
         return apiKeyAdapter.retrieveApiKey(imageryId);
     }

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/tilesources/TemplatedTMSTileSource.java

@@ -2 +2 @@
 package org.openstreetmap.gui.jmapviewer.tilesources;
 
+import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
@@ -93 +94 @@
         });
         // Capturing group pattern on API key values
-        replacePattern(PATTERN_API_KEY, (matcher, output) ->
-            matcher.appendReplacement(output, FeatureAdapter.retrieveApiKey(imageryId))
-        );
+        replacePattern(PATTERN_API_KEY, (matcher, output) -> {
+            try {
+                matcher.appendReplacement(output, FeatureAdapter.retrieveApiKey(imageryId));
+            } catch (IOException e) {
+                throw new IllegalArgumentException(e);
+            }
+        });
         // Capturing group pattern on zoom values
         m = PATTERN_ZOOM.matcher(baseUrl);