Changeset 15901 in josm for trunk

Timestamp:

2020-02-22T19:40:23+01:00 (4 years ago)

Author:

simon04

Message:

see #18749 - Intern strings to reduce memory footprint of svgSalamander

Location:

trunk/src/com/kitfox/svg

Files:

• SVGElement.java (modified) (2 diffs)
• xml/StyleAttribute.java (modified) (3 diffs)

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

@@ -260 +260 @@
         if (this.id != null && !this.id.equals(""))
         {
+            this.id = this.id.intern();
             diagram.setElement(this.id, this);
         }
 
         String className = attrs.getValue("class");
-        this.cssClass = (className == null || className.equals("")) ? null : className;
+        this.cssClass = (className == null || className.equals("")) ? null : className.intern();
         //docRoot = helper.docRoot;
         //universe = helper.universe;
@@ -298 +299 @@
             String value = attrs.getValue(i);
 
-            presAttribs.put(name, new StyleAttribute(name, value));
+            presAttribs.put(name, new StyleAttribute(name, value == null ? null : value.intern()));
         }
     }

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

@@ -70 +70 @@
     public StyleAttribute(String name) 
     {
-        this.name = name;
-        stringValue = null;
+        this(name, null);
     }
 
     public StyleAttribute(String name, String stringValue) 
     {
-        this.name = name;
-        this.stringValue = stringValue;
+        setName(name);
+        setStringValue(stringValue);
     }
 
@@ -86 +85 @@
     public StyleAttribute setName(String name)
     {
-        this.name = name;
+        this.name = name == null ? null : name.intern();
         return this;
     }
@@ -102 +101 @@
     public void setStringValue(String value)
     {
-        stringValue = value;
+        stringValue = value == null ? null : value.intern();
     }