Changeset 18070 in josm

Timestamp:

2021-07-18T23:40:47+02:00 (3 years ago)

Author:

Don-vip

Message:

fix #16868 - use DevCharly's version of svgSalamander from Maven Central

Location:

trunk

Files:

• README (modified) (1 diff)
• ivy.xml (modified) (2 diffs)
• src/com (deleted)
• src/org/openstreetmap/josm/tools/Utils.java (modified) (4 diffs)

trunk/README

@@ -170 +170 @@
     -> http://commons.apache.org/proper/commons-validator
 * SVG Salamander: Support for SVG image format
-    src/com/kitfox/svg
     -> https://github.com/blackears/svgSalamander
 * Metadata Extractor: Read EXIF Metadata of photos

trunk/ivy.xml

@@ -30 +30 @@
         <dependency conf="api->default" org="com.adobe.xmp" name="xmpcore" rev="6.1.11"/>
         <dependency conf="api->default" org="com.drewnoakes" name="metadata-extractor" rev="2.16.0" transitive="false"/>
+        <dependency conf="api->default" org="com.formdev" name="svgSalamander" rev="1.1.2.4"/>
         <dependency conf="api->default" org="ch.poole" name="OpeningHoursParser" rev="0.23.4"/>
         <dependency conf="api->default" org="oauth.signpost" name="signpost-core" rev="2.1.1"/>
@@ -43 +44 @@
         <dependency conf="sources->sources" org="com.adobe.xmp" name="xmpcore" rev="6.1.11"/>
         <dependency conf="sources->sources" org="com.drewnoakes" name="metadata-extractor" rev="2.16.0" transitive="false"/>
+        <dependency conf="sources->default" org="com.formdev" name="svgSalamander" rev="1.1.2.4"/>
         <dependency conf="sources->sources" org="ch.poole" name="OpeningHoursParser" rev="0.23.4"/>
         <dependency conf="sources->sources" org="oauth.signpost" name="signpost-core" rev="2.1.1"/>

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

@@ -16 +16 @@
 import java.io.InputStream;
 import java.io.UnsupportedEncodingException;
+import java.lang.reflect.Method;
 import java.net.MalformedURLException;
 import java.net.URI;
@@ -69 +70 @@
 import org.openstreetmap.josm.spi.preferences.Config;
 
-import com.kitfox.svg.xml.XMLParseUtil;
-
 /**
  * Basic utils, that can be useful in different parts of the program.
@@ -98 +97 @@
     private static final double TO_DEGREES = 180.0 / Math.PI;
     private static final double TO_RADIANS = Math.PI / 180.0;
+
+    /**
+     * A reference to {@code Map.ofEntries()} available since Java 9
+     */
+    static final Method mapOfEntries = mapOfEntriesMethod();
+
+    private static Method mapOfEntriesMethod() {
+        try {
+            return Map.class.getMethod("ofEntries", Map.Entry[].class);
+        } catch (NoSuchMethodException e) {
+            return null;
+        }
+    }
 
     private Utils() {
@@ -659 +671 @@
      */
     public static <K, V> Map<K, V> toUnmodifiableMap(Map<K, V> map) {
-        return XMLParseUtil.toUnmodifiableMap(map);
+        if (map == null || map.isEmpty()) {
+            return Collections.emptyMap();
+        } else if (map.size() == 1) {
+            final Map.Entry<K, V> entry = map.entrySet().iterator().next();
+            return Collections.singletonMap(entry.getKey(), entry.getValue());
+        } else if (mapOfEntries != null) {
+            try {
+                // Java 9: use Map.ofEntries(...)
+                return (Map<K, V>) mapOfEntries.invoke(null, new Object[]{map.entrySet().toArray(new Map.Entry[0])});
+            } catch (Exception ignore) {
+                Logging.trace(ignore);
+            }
+        }
+        return Collections.unmodifiableMap(map);
     }