Changeset 16080 in josm for trunk

Timestamp:

2020-03-08T14:57:23+01:00 (5 years ago)

Author:

simon04

Message:

see #18886 - AbstractReader.parseTimestamp: use LRU cache

Location:

trunk/src/org/openstreetmap/josm

Files:

• gui/dialogs/properties/RecentTagCollection.java (modified) (3 diffs)
• gui/layer/OsmDataLayer.java (modified) (4 diffs)
• gui/tagging/presets/TaggingPresetItem.java (modified) (3 diffs)
• gui/util/LruCache.java (added)
• io/AbstractReader.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/properties/RecentTagCollection.java

@@ -4 +4 @@
 import java.util.ArrayList;
 import java.util.Iterator;
-import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -13 +12 @@
 import org.openstreetmap.josm.data.osm.search.SearchSetting;
 import org.openstreetmap.josm.data.preferences.ListProperty;
+import org.openstreetmap.josm.gui.util.LruCache;
 import org.openstreetmap.josm.tools.Logging;
 
@@ -19 +19 @@
  */
 class RecentTagCollection {
-
-    /**
-     * LRU cache for recently added tags (http://java-planet.blogspot.com/2005/08/how-to-set-up-simple-lru-cache-using.html)
-     */
-    static final class LruCache extends LinkedHashMap<Tag, Void> {
-        private static final long serialVersionUID = 1L;
-        private final int capacity;
-
-        LruCache(int capacity) {
-            super(capacity + 1, 1.1f, true);
-            this.capacity = capacity;
-        }
-
-        @Override
-        protected boolean removeEldestEntry(Map.Entry<Tag, Void> eldest) {
-            return size() > capacity;
-        }
-    }
 
     private final Map<Tag, Void> recentTags;

trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java

@@ -29 +29 @@
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -119 +118 @@
 import org.openstreetmap.josm.gui.progress.swing.PleaseWaitProgressMonitor;
 import org.openstreetmap.josm.gui.util.GuiHelper;
+import org.openstreetmap.josm.gui.util.LruCache;
 import org.openstreetmap.josm.gui.widgets.FileChooserManager;
 import org.openstreetmap.josm.gui.widgets.JosmTextArea;
@@ -182 +182 @@
 
     /** List of recent relations */
-    private final Map<Relation, Void> recentRelations = new LruCache(PROPERTY_RECENT_RELATIONS_NUMBER.get()+1);
+    private final Map<Relation, Void> recentRelations = new LruCache<>(PROPERTY_RECENT_RELATIONS_NUMBER.get());
 
     /**
@@ -257 +257 @@
     static String createLayerName(Object arg) {
         return tr("Data Layer {0}", arg);
-    }
-
-    static final class LruCache extends LinkedHashMap<Relation, Void> {
-        private static final long serialVersionUID = 1L;
-        LruCache(int initialCapacity) {
-            super(initialCapacity, 1.1f, true);
-        }
-
-        @Override
-        protected boolean removeEldestEntry(Map.Entry<Relation, Void> eldest) {
-            return size() > PROPERTY_RECENT_RELATIONS_NUMBER.get();
-        }
     }
 

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

@@ -9 +9 @@
 import java.util.Collection;
 import java.util.EnumSet;
-import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -24 +23 @@
 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionList;
 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionManager;
+import org.openstreetmap.josm.gui.util.LruCache;
 import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.tools.ImageProvider;
@@ -35 +35 @@
 public abstract class TaggingPresetItem {
 
-    // cache the parsing of types using a LRU cache (http://java-planet.blogspot.com/2005/08/how-to-set-up-simple-lru-cache-using.html)
-    private static final Map<String, Set<TaggingPresetType>> TYPE_CACHE = new LinkedHashMap<>(16, 1.1f, true);
+    // cache the parsing of types using a LRU cache
+    private static final Map<String, Set<TaggingPresetType>> TYPE_CACHE = new LruCache<>(16);;
 
     protected void initAutoCompletionField(AutoCompletingTextField field, String... key) {

trunk/src/org/openstreetmap/josm/io/AbstractReader.java

@@ -42 +42 @@
 import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
+import org.openstreetmap.josm.gui.util.LruCache;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
 import org.openstreetmap.josm.tools.Logging;
@@ -421 +422 @@
     }
 
+    private final Map<String, Integer> timestampCache = new LruCache<>(30);
+
     protected final void parseTimestamp(PrimitiveData current, String time) {
         if (time != null && !time.isEmpty()) {
-            current.setRawTimestamp((int) (DateUtils.tsFromString(time)/1000));
+            int timestamp = timestampCache.computeIfAbsent(time, t -> (int) (DateUtils.tsFromString(t) / 1000));
+            current.setRawTimestamp(timestamp);
         }
     }