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

Timestamp:

2020-02-22T19:40:29+01:00 (5 years ago)

Author:

simon04

Message:

see #18749 - SVGElement: store String instead of StyleAttribute in map

Location:

trunk/src/com/kitfox/svg

Files:

• SVGElement.java (modified) (9 diffs)
• xml/XMLParseUtil.java (modified) (1 diff)

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

@@ -89 +89 @@
      * Styles defined for this elemnt via the <b>style</b> attribute.
      */
-    protected final HashMap<String, StyleAttribute> inlineStyles = new HashMap<>();
+    protected final HashMap<String, String> inlineStyles = new HashMap<>();
     /**
      * Presentation attributes set for this element. Ie, any attribute other
      * than the <b>style</b> attribute.
      */
-    protected final HashMap<String, StyleAttribute> presAttribs = new HashMap<>();
+    protected final HashMap<String, String> presAttributes = new HashMap<>();
     /**
      * A list of presentation attributes to not include in the presentation
@@ -273 +273 @@
         if (style != null)
         {
-            HashMap<?, ?> map = XMLParseUtil.parseStyle(style, inlineStyles);
+            XMLParseUtil.parseStyle(style, inlineStyles);
         }
 
@@ -299 +299 @@
             String value = attrs.getValue(i);
 
-            presAttribs.put(name, new StyleAttribute(name, value == null ? null : value.intern()));
+            presAttributes.put(name, value == null ? null : value.intern());
         }
     }
@@ -316 +316 @@
     public Set<String> getPresentationAttributes()
     {
-        return presAttribs.keySet();
+        return presAttributes.keySet();
     }
 
@@ -486 +486 @@
 
         //Check for local inline styles
-        StyleAttribute styAttr = inlineStyles.get(styName);
-
-        attrib.setStringValue(styAttr == null ? "" : styAttr.getStringValue());
+        String styAttr = inlineStyles.get(styName);
+
+        attrib.setStringValue(styAttr == null ? "" : styAttr);
 
         //Return if we've found a non animated style
@@ -498 +498 @@
 
         //Check for presentation attribute
-        StyleAttribute presAttr = presAttribs.get(styName);
-
-        attrib.setStringValue(presAttr == null ? "" : presAttr.getStringValue());
+        String presAttr = presAttributes.get(styName);
+
+        attrib.setStringValue(presAttr == null ? "" : presAttr);
 
         //Return if we've found a presentation attribute instead
@@ -546 +546 @@
     {
         //Check for local inline styles
-        return inlineStyles.get(styName);
+        final String value = inlineStyles.get(styName);
+        return value != null ? new StyleAttribute(styName, value) : null;
     }
 
@@ -561 +562 @@
 
         //Make sure we have a coresponding presentation attribute
-        StyleAttribute presAttr = presAttribs.get(presName);
+        String presAttr = presAttributes.get(presName);
 
         //Copy presentation value directly
-        attrib.setStringValue(presAttr == null ? "" : presAttr.getStringValue());
+        attrib.setStringValue(presAttr == null ? "" : presAttr);
 
         //Return if we found presentation attribute
-        if (presAttr != null)
-        {
-            return true;
-        }
-
-        return false;
+        return presAttr != null;
     }
 
@@ -584 +580 @@
     {
         //Check for local inline styles
-        return presAttribs.get(styName);
+        final String value = presAttributes.get(styName);
+        return value != null ? new StyleAttribute(styName, value) : null;
     }
 

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

@@ -302 +302 @@
      * @param map - A map to which these styles will be added
      */
-    public static HashMap<String, StyleAttribute> parseStyle(String styleString, HashMap<String, StyleAttribute> map) {
+    public static void parseStyle(String styleString, HashMap<String, String> map) {
         final Pattern patSemi = Pattern.compile(";");
 
-        String[] styles = patSemi.split(styleString);
-
-        for (int i = 0; i < styles.length; i++)
-        {
-            if (styles[i].length() == 0)
-            {
-                continue;
-            }
-
-            int colon = styles[i].indexOf(':');
-            if (colon == -1)
-            {
-                continue;
-            }
-
-            String key = styles[i].substring(0, colon).trim().intern();
-            String value = quoteMatch.reset(styles[i].substring(colon + 1).trim()).replaceAll("").intern();
-
-            map.put(key, new StyleAttribute(key, value));
-        }
-
-        return map;
+        // com.kitfox.svg.xml.StyleAttribute    58,595 (3.6%)   1,992,230 B (1.4%)      n/a
+        patSemi.splitAsStream(styleString)
+                .filter(style -> !style.isEmpty())
+                .forEach(style  -> {
+                    int colon = style.indexOf(':');
+                    if (colon == -1) return;
+                    String key = style.substring(0, colon).trim().intern();
+                    String value = quoteMatch.reset(style.substring(colon + 1).trim()).replaceAll("").intern();
+                    map.put(key, value);
+                });
     }
 }