Changeset 15912 in josm for trunk/src/com/kitfox

Timestamp:

2020-02-23T13:40:09+01:00 (5 years ago)

Author:

simon04

Message:

see #18749 - Use efficient/unmodifiable maps for svgSalamander

Location:

trunk/src/com/kitfox/svg

Files:

• SVGElement.java (modified) (4 diffs)
• xml/XMLParseUtil.java (modified) (4 diffs)

trunk/src/com/kitfox/svg/SVGElement.java

@@ -47 +47 @@
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 import java.util.regex.Matcher;
@@ -89 +90 @@
      * Styles defined for this elemnt via the <b>style</b> attribute.
      */
-    protected final HashMap<String, String> inlineStyles = new HashMap<>();
+    private Map<String, String> inlineStyles = Collections.emptyMap();
     /**
      * Presentation attributes set for this element. Ie, any attribute other
      * than the <b>style</b> attribute.
      */
-    protected final HashMap<String, String> presAttributes = new HashMap<>();
+    private Map<String, String> presAttributes = Collections.emptyMap();
     /**
      * A list of presentation attributes to not include in the presentation
@@ -273 +274 @@
         if (style != null)
         {
-            XMLParseUtil.parseStyle(style, inlineStyles);
+            inlineStyles = XMLParseUtil.parseStyle(style);
         }
 
@@ -299 +300 @@
             String value = attrs.getValue(i);
 
+            if (i == 0)
+            {
+                presAttributes = new HashMap<>();
+            }
             presAttributes.put(name, value == null ? null : value.intern());
         }
+        presAttributes = XMLParseUtil.toUnmodifiableMap(presAttributes);
     }
 

trunk/src/com/kitfox/svg/xml/XMLParseUtil.java

@@ -38 +38 @@
 
 import java.awt.Toolkit;
+import java.lang.reflect.Method;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.LinkedList;
+import java.util.Map;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -58 +61 @@
     static final Matcher quoteMatch = Pattern.compile("^'|'$").matcher("");
 
+    /**
+     * A reference to {@link Map#ofEntries(Map.Entry[])} 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;
+        }
+    }
+
     /** Creates a new instance of XMLParseUtil */
     private XMLParseUtil()
@@ -300 +316 @@
      * @param styleString - A CSS formatted string of styles.  Eg,
      *     "font-size:12;fill:#d32c27;fill-rule:evenodd;stroke-width:1pt;"
-     * @param map - A map to which these styles will be added
-     */
-    public static void parseStyle(String styleString, HashMap<String, String> map) {
+     * @return the map with the added styles
+     */
+    public static Map<String, String> parseStyle(String styleString) {
+        final Map<String, String> map = new HashMap<>();
         final Pattern patSemi = Pattern.compile(";");
 
@@ -315 +332 @@
                     map.put(key, value);
                 });
-    }
+        return toUnmodifiableMap(map);
+    }
+
+    /**
+     * Returns an unmodifiable map for the given map.
+     * Makes use of {@link Collections#emptyMap()} and {@link Collections#singletonMap} and {@link Map#ofEntries(Map.Entry[])} to save memory.
+     *
+     * @param map the map for which an unmodifiable map is to be returned
+     * @param <K> the type of keys maintained by this map
+     * @param <V> the type of mapped values
+     * @return an unmodifiable map
+     * @see <a href="https://dzone.com/articles/preventing-your-java-collections-from-wasting-memo">
+     * How to Prevent Your Java Collections From Wasting Memory</a>
+     */
+    @SuppressWarnings("unchecked")
+    public static <K, V> Map<K, V> toUnmodifiableMap(Map<K, V> 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) {
+            }
+        }
+        return Collections.unmodifiableMap(map);
+    }
+
 }