Ticket #18749: 18749.patch

src/com/kitfox/svg/SVGElement.java

@@ -259 +259 @@
         this.id = attrs.getValue("id");
         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;
 

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

@@ -69 +69 @@
     
     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);
     }
 
     public String getName() {
@@ -85 +84 @@
     
     public StyleAttribute setName(String name)
     {
-        this.name = name;
+        this.name = name == null ? null : name.intern();
         return this;
     }
     
@@ -101 +100 @@
 
     public void setStringValue(String value)
     {
-        stringValue = value;
+        stringValue = value == null ? null : value.intern();
     }
 
     public boolean getBooleanValue() {

src/org/openstreetmap/josm/data/imagery/ImageryInfo.java

@@ -396 +396 @@
             max_zoom = i.defaultMaxZoom;
             min_zoom = i.defaultMinZoom;
             cookies = i.cookies;
-            icon = i.icon;
+            icon = i.icon == null ? null : i.icon.intern();
             description = i.description;
             category = i.category != null ? i.category.getCategoryString() : null;
             if (i.bounds != null) {
@@ -567 +567 @@
         termsOfUseText = e.terms_of_use_text;
         termsOfUseURL = e.terms_of_use_url;
         countryCode = e.country_code;
-        icon = e.icon;
+        icon = e.icon == null ? null : e.icon.intern();
         if (e.noTileHeaders != null) {
             noTileHeaders = e.noTileHeaders.toMap();
         }
@@ -632 +632 @@
         this.bestMarked = i.bestMarked;
         this.overlay = i.overlay;
         // do not copy field {@code mirrors}
-        this.icon = i.icon;
+        this.icon = i.icon == null ? null : i.icon.intern();
         this.isGeoreferenceValid = i.isGeoreferenceValid;
         this.defaultLayers = i.defaultLayers;
         this.customHttpHeaders = i.customHttpHeaders;
@@ -1189 +1189 @@
      * @param icon The entry icon
      */
     public void setIcon(String icon) {
-        this.icon = icon;
+        this.icon = icon == null ? null : icon.intern();
     }
 
     /**

src/org/openstreetmap/josm/data/projection/Projections.java

@@ -76 +76 @@
          * @param definition projection definition (EPSG format)
          */
         public ProjectionDefinition(String code, String name, String definition) {
-            this.code = code;
-            this.name = name;
-            this.definition = definition;
+            this.code = code.intern();
+            this.name = name.intern();
+            this.definition = definition.intern();
         }
     }
 

src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java

@@ -330 +330 @@
                     }
                     try {
                         final String val = ai.val instanceof Expression
-                                ? Optional.ofNullable(((Expression) ai.val).evaluate(new Environment())).map(Object::toString).orElse(null)
+                                ? Optional.ofNullable(((Expression) ai.val).evaluate(new Environment()))
+                                        .map(Object::toString).map(String::intern).orElse(null)
                                 : ai.val instanceof String
                                 ? (String) ai.val
                                 : ai.val instanceof Keyword

src/org/openstreetmap/josm/gui/mappaint/Keyword.java

@@ -23 +23 @@
      * @param val The string value that is written in the MapCSS file
      */
     public Keyword(String val) {
-        this.val = val.toLowerCase(Locale.ENGLISH);
+        this.val = val.toLowerCase(Locale.ENGLISH).intern();
     }
 
     @Override

src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java

@@ -95 +95 @@
          * @param key The tag name
          */
         public TagKeyReference(String key) {
-            this.key = key;
+            this.key = key.intern();
         }
 
         @Override

src/org/openstreetmap/josm/gui/mappaint/mapcss/Instruction.java

@@ -51 +51 @@
         public final boolean isSetInstruction;
 
         public AssignmentInstruction(String key, Object val, boolean isSetInstruction) {
-            this.key = key;
+            this.key = key.intern();
             this.isSetInstruction = isSetInstruction;
             if (val instanceof LiteralExpression) {
                 Object litValue = ((LiteralExpression) val).evaluate(null);

src/org/openstreetmap/josm/gui/tagging/presets/items/ComboMultiSelect.java

@@ -484 +484 @@
         final List<PresetListEntry> entries = new ArrayList<>(valueArray.length);
         for (int i = 0; i < valueArray.length; i++) {
             final PresetListEntry e = new PresetListEntry(valueArray[i]);
-            e.locale_display_value = locale_display_values != null || values_no_i18n
+            final String value = locale_display_values != null || values_no_i18n
                     ? displayArray[i]
                     : trc(values_context, fixPresetString(displayArray[i]));
+            e.locale_display_value = value == null ? null : value.intern();
             if (shortDescriptionsArray != null) {
-                e.locale_short_description = locale_short_descriptions != null
+                final String description = locale_short_descriptions != null
                         ? shortDescriptionsArray[i]
                         : tr(fixPresetString(shortDescriptionsArray[i]));
+                e.locale_short_description = description == null ? null : description.intern();
             }
 
             entries.add(e);

src/org/openstreetmap/josm/tools/XmlObjectParser.java

@@ -137 +137 @@
         }
 
         private void setValue(Entry entry, String fieldName, String value) throws SAXException {
+            if (value != null) {
+                value = value.intern();
+            }
             CheckParameterUtil.ensureParameterNotNull(entry, "entry");
             if ("class".equals(fieldName) || "default".equals(fieldName) || "throw".equals(fieldName) ||
                     "new".equals(fieldName) || "null".equals(fieldName)) {