Changeset 15934 in josm for trunk

Timestamp:

2020-02-26T01:52:17+01:00 (5 years ago)

Author:

simon04

Message:

see #18749 - Intern strings to reduce memory footprint

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/imagery/ImageryInfo.java (modified) (13 diffs)
• data/osm/RelationMember.java (modified) (1 diff)
• gui/mappaint/mapcss/ConditionFactory.java (modified) (2 diffs)
• gui/mappaint/mapcss/LiteralExpression.java (modified) (1 diff)

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

@@ -397 +397 @@
             min_zoom = i.defaultMinZoom;
             cookies = i.cookies;
-            icon = i.icon == null ? null : i.icon.intern();
+            icon = intern(i.icon);
             description = i.description;
             category = i.category != null ? i.category.getCategoryString() : null;
@@ -555 +555 @@
         if (e.projections != null && !e.projections.isEmpty()) {
             // split generates null element on empty string which gives one element Array[null]
-            serverProjections = Arrays.asList(e.projections.split(","));
-        }
-        attributionText = e.attribution_text;
+            setServerProjections(Arrays.asList(e.projections.split(",")));
+        }
+        attributionText = intern(e.attribution_text);
         attributionLinkURL = e.attribution_url;
         permissionReferenceURL = e.permission_reference_url;
@@ -567 +567 @@
         termsOfUseText = e.terms_of_use_text;
         termsOfUseURL = e.terms_of_use_url;
-        countryCode = e.country_code;
-        icon = e.icon == null ? null : e.icon.intern();
+        countryCode = intern(e.country_code);
+        icon = intern(e.icon);
         if (e.noTileHeaders != null) {
             noTileHeaders = e.noTileHeaders.toMap();
@@ -633 +633 @@
         this.overlay = i.overlay;
         // do not copy field {@code mirrors}
-        this.icon = i.icon == null ? null : i.icon.intern();
+        this.icon = intern(i.icon);
         this.isGeoreferenceValid = i.isGeoreferenceValid;
         this.defaultLayers = i.defaultLayers;
@@ -639 +639 @@
         this.transparent = i.transparent;
         this.minimumTileExpire = i.minimumTileExpire;
-        this.categoryOriginalString = i.categoryOriginalString;
+        this.categoryOriginalString = intern(i.categoryOriginalString);
         this.category = i.category;
     }
@@ -868 +868 @@
      */
     public void setAttributionText(String text) {
-        attributionText = text;
+        attributionText = intern(text);
     }
 
@@ -955 +955 @@
 
         if (serverProjections.isEmpty()) {
-            serverProjections = new ArrayList<>();
             Matcher m = Pattern.compile(".*\\{PROJ\\(([^)}]+)\\)\\}.*").matcher(url.toUpperCase(Locale.ENGLISH));
             if (m.matches()) {
-                for (String p : m.group(1).split(",")) {
-                    serverProjections.add(p);
-                }
+                setServerProjections(Arrays.asList(m.group(1).split(",")));
             }
         }
@@ -1064 +1061 @@
         if (LanguageInfo.isBetterLanguage(langDescription, language)) {
             this.description = isdefault ? tr(description) : description;
-            this.langDescription = language;
+            this.langDescription = intern(language);
         }
     }
@@ -1155 +1152 @@
      */
     public void setCountryCode(String countryCode) {
-        this.countryCode = countryCode;
+        this.countryCode = intern(countryCode);
     }
 
@@ -1190 +1187 @@
      */
     public void setIcon(String icon) {
-        this.icon = icon == null ? null : icon.intern();
+        this.icon = intern(icon);
     }
 
@@ -1209 +1206 @@
     public void setServerProjections(Collection<String> serverProjections) {
         CheckParameterUtil.ensureParameterNotNull(serverProjections, "serverProjections");
-        this.serverProjections = new ArrayList<>(serverProjections);
+        this.serverProjections = serverProjections.stream()
+                .map(String::intern)
+                .collect(Collectors.collectingAndThen(Collectors.toList(), Utils::toUnmodifiableList));
     }
 
@@ -1355 +1354 @@
      */
     public void setImageryCategoryOriginalString(String categoryOriginalString) {
-        this.categoryOriginalString = categoryOriginalString;
+        this.categoryOriginalString = intern(categoryOriginalString);
     }
 
@@ -1645 +1644 @@
         }
     }
+
+    private static String intern(String string) {
+        return string == null ? null : string.intern();
+    }
 }

trunk/src/org/openstreetmap/josm/data/osm/RelationMember.java

@@ -84 +84 @@
     public RelationMember(String role, OsmPrimitive member) {
         CheckParameterUtil.ensureParameterNotNull(member, "member");
-        this.role = Optional.ofNullable(role).orElse("");
+        this.role = Optional.ofNullable(role).orElse("").intern();
         this.member = member;
     }

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/ConditionFactory.java

@@ -259 +259 @@
          */
         public SimpleKeyValueCondition(String k, String v) {
-            this.k = k;
-            this.v = v;
+            this.k = k.intern();
+            this.v = v.intern();
         }
 
@@ -311 +311 @@
          */
         public KeyValueCondition(String k, String v, Op op, boolean considerValAsKey) {
-            this.k = k;
-            this.v = v;
+            this.k = k.intern();
+            this.v = v.intern();
             this.op = op;
             this.considerValAsKey = considerValAsKey;

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/LiteralExpression.java

@@ -20 +20 @@
     public LiteralExpression(Object literal) {
         CheckParameterUtil.ensureParameterNotNull(literal);
-        this.literal = literal;
+        this.literal = literal instanceof String ? ((String) literal).intern() : literal;
     }