Changeset 15909 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2020-02-23T00:29:53+01:00 (5 years ago)

Author:

simon04

Message:

see #18749 - Use efficient/unmodifiable collections

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• mappaint/mapcss/MapCSSRule.java (modified) (2 diffs)
• mappaint/mapcss/Selector.java (modified) (3 diffs)
• tagging/presets/TaggingPresetSelector.java (modified) (2 diffs)

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

@@ -8 +8 @@
 import org.openstreetmap.josm.gui.mappaint.Environment;
 import org.openstreetmap.josm.gui.mappaint.StyleSource;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -48 +49 @@
          */
         public Declaration(List<Instruction> instructions, int idx) {
-            this.instructions = instructions;
+            this.instructions = Utils.toUnmodifiableList(instructions);
             this.idx = idx;
         }

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

@@ -537 +537 @@
 
         protected AbstractSelector(List<Condition> conditions) {
-            if (conditions == null || conditions.isEmpty()) {
-                this.conds = null;
-            } else {
-                this.conds = conditions;
-            }
+            this.conds = Utils.toUnmodifiableList(conditions);
         }
 
@@ -552 +548 @@
         public boolean matches(Environment env) {
             CheckParameterUtil.ensureParameterNotNull(env, "env");
-            if (conds == null) return true;
             for (Condition c : conds) {
                 try {
@@ -569 +564 @@
          */
         public List<Condition> getConditions() {
-            if (conds == null) {
-                return Collections.emptyList();
-            }
-            return Collections.unmodifiableList(conds);
+            return conds;
         }
     }

trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetSelector.java

@@ -89 +89 @@
         public int classification;
         public int favoriteIndex;
-        private final Collection<String> groups = new HashSet<>();
-        private final Collection<String> names = new HashSet<>();
-        private final Collection<String> tags = new HashSet<>();
+        private final Collection<String> groups;
+        private final Collection<String> names;
+        private final Collection<String> tags;
 
         PresetClassification(TaggingPreset preset) {
             this.preset = preset;
+            Set<String> groups = new HashSet<>();
+            Set<String> names = new HashSet<>();
+            Set<String> tags = new HashSet<>();
             TaggingPreset group = preset.group;
             while (group != null) {
@@ -119 +122 @@
                 }
             }
+            this.groups = Utils.toUnmodifiableList(groups);
+            this.names = Utils.toUnmodifiableList(names);
+            this.tags = Utils.toUnmodifiableList(tags);
         }