Changeset 14855 in josm for trunk

Timestamp:

2019-03-09T14:02:04+01:00 (5 years ago)

Author:

GerdP

Message:

see #17401: Improve performance: Use cached icon in MultipleNameVisitor
Drastically reduces the time to open a tree with thousands of errors

File:

• trunk/src/org/openstreetmap/josm/data/validation/util/MultipleNameVisitor.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/data/validation/util/MultipleNameVisitor.java

@@ -25 +25 @@
      */
     public static final IntegerProperty MULTIPLE_NAME_MAX_LENGTH = new IntegerProperty("multiple.name.max.length", 140);
+    private static final String MULTI_CLASS_NAME = "object";
+    private static final Icon MULTI_CLASS_ICON = ImageProvider.get("data", MULTI_CLASS_NAME);
 
     /** The class name of the combined primitives */
@@ -57 +59 @@
                 multiplePluralClassname = classNamePlural;
             } else if (!multipleClassname.equals(className)) {
-                multipleClassname = "object";
+                multipleClassname = MULTI_CLASS_NAME;
                 multiplePluralClassname = trn("object", "objects", 2);
             }
@@ -65 +67 @@
             displayName = name;
         } else {
+            if (MULTI_CLASS_NAME.equals(multipleClassname)) {
+                icon = MULTI_CLASS_ICON;
+            }
             StringBuilder sb = new StringBuilder().append(size).append(' ').append(trn(multipleClassname, multiplePluralClassname, size));
             if (multipleName.length() > 0) {
@@ -96 +101 @@
      */
     public Icon getIcon() {
-        if (size <= 1)
-            return icon;
-        else
-            return ImageProvider.get("data", multipleClassname);
+        return icon;
     }