Changeset 14823 in josm for trunk/src

Timestamp:

2019-03-03T00:09:44+01:00 (6 years ago)

Author:

Don-vip

Message:

see #17311 - revert changes from r14747 / r14759, cause ConcurrentModificationException / IllegalStateException

File:

• trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java

@@ -12 +12 @@
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
 
 import javax.swing.ImageIcon;
@@ -79 +79 @@
         // will make gui for it so I'm keeping it here
 
-        private static final Map<String, TemplateEntryProperty> CACHE = new ConcurrentHashMap<>();
+        private static final Map<String, TemplateEntryProperty> CACHE = new HashMap<>();
 
         public static TemplateEntryProperty forMarker(String layerName) {
             String key = "draw.rawgps.layer.wpt.pattern";
             if (layerName != null) {
-                return CACHE.computeIfAbsent(key + '.' + layerName, k -> new TemplateEntryProperty(k, "", forMarker(null)));
-            } else {
-                return CACHE.computeIfAbsent(key, k -> new TemplateEntryProperty(k, LABEL_PATTERN_AUTO, null));
-            }
+                key += '.' + layerName;
+            }
+            TemplateEntryProperty result = CACHE.get(key);
+            if (result == null) {
+                String defaultValue = layerName == null ? LABEL_PATTERN_AUTO : "";
+                TemplateEntryProperty parent = layerName == null ? null : forMarker(null);
+                result = new TemplateEntryProperty(key, defaultValue, parent);
+                CACHE.put(key, result);
+            }
+            return result;
         }
 
@@ -93 +99 @@
             String key = "draw.rawgps.layer.audiowpt.pattern";
             if (layerName != null) {
-                return CACHE.computeIfAbsent(key + '.' + layerName, k ->
-                        new TemplateEntryProperty(k, "", forAudioMarker(null)));
-            } else {
-                return CACHE.computeIfAbsent(key, k ->
-                        new TemplateEntryProperty(k, "?{ '{name}' | '{desc}' | '{" + MARKER_FORMATTED_OFFSET + "}' }", null));
-            }
+                key += '.' + layerName;
+            }
+            TemplateEntryProperty result = CACHE.get(key);
+            if (result == null) {
+                String defaultValue = layerName == null ? "?{ '{name}' | '{desc}' | '{" + Marker.MARKER_FORMATTED_OFFSET + "}' }" : "";
+                TemplateEntryProperty parent = layerName == null ? null : forAudioMarker(null);
+                result = new TemplateEntryProperty(key, defaultValue, parent);
+                CACHE.put(key, result);
+            }
+            return result;
         }