Changeset 9939 in josm

Timestamp:

2016-03-06T12:00:32+01:00 (9 years ago)

Author:

simon04

Message:

see #12554 - Factor out RecentTagCollection, add unit tests

Location:

trunk

Files:

• src/org/openstreetmap/josm/gui/dialogs/properties/RecentTagCollection.java (added)
• src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java (modified) (9 diffs)
• test/unit/org/openstreetmap/josm/gui/dialogs/properties/RecentTagCollectionTest.java (added)

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

@@ -35 +35 @@
 import java.util.HashMap;
 import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
@@ -70 +68 @@
 import org.openstreetmap.josm.data.osm.Tag;
 import org.openstreetmap.josm.data.preferences.BooleanProperty;
+import org.openstreetmap.josm.data.preferences.CollectionProperty;
 import org.openstreetmap.josm.data.preferences.EnumProperty;
 import org.openstreetmap.josm.data.preferences.IntegerProperty;
@@ -125 +124 @@
     public static final IntegerProperty PROPERTY_RECENT_TAGS_NUMBER = new IntegerProperty("properties.recently-added-tags",
             DEFAULT_LRU_TAGS_NUMBER);
+    /** The preference storage of recent tags */
+    public static final CollectionProperty COLLECTION_PROPERTY = new CollectionProperty("properties.recent-tags",
+            Collections.<String>emptyList());
 
     /**
@@ -156 +158 @@
         "properties.refresh-recently-added-tags", RefreshRecent.class, RefreshRecent.STATUS);
 
-    // LRU cache for recently added tags (http://java-planet.blogspot.com/2005/08/how-to-set-up-simple-lru-cache-using.html)
-    private final Map<Tag, Void> recentTags = new LinkedHashMap<Tag, Void>(MAX_LRU_TAGS_NUMBER+1, 1.1f, true) {
-        @Override
-        protected boolean removeEldestEntry(Map.Entry<Tag, Void> eldest) {
-            return size() > MAX_LRU_TAGS_NUMBER;
-        }
-    };
+    final RecentTagCollection recentTags = new RecentTagCollection(MAX_LRU_TAGS_NUMBER);
 
     // Copy of recently added tags, used to cache initial status
@@ -291 +287 @@
     public void loadTagsIfNeeded() {
         if (PROPERTY_REMEMBER_TAGS.get() && recentTags.isEmpty()) {
-            recentTags.clear();
-            Collection<String> c = Main.pref.getCollection("properties.recent-tags");
-            Iterator<String> it = c.iterator();
-            while (it.hasNext()) {
-                String key = it.next();
-                String value = it.next();
-                recentTags.put(new Tag(key, value), null);
-            }
+            recentTags.loadFromPreference(COLLECTION_PROPERTY);
         }
     }
@@ -307 +296 @@
     public void saveTagsIfNeeded() {
         if (PROPERTY_REMEMBER_TAGS.get() && !recentTags.isEmpty()) {
-            List<String> c = new ArrayList<>(recentTags.size()*2);
-            for (Tag t: recentTags.keySet()) {
-                c.add(t.getKey());
-                c.add(t.getValue());
-            }
-            Main.pref.putCollection("properties.recent-tags", c);
+            recentTags.saveToPreference(COLLECTION_PROPERTY);
         }
     }
@@ -320 +304 @@
      */
     private void cacheRecentTags() {
-        tags = new LinkedList<>(recentTags.keySet());
+        tags = recentTags.toList();
     }
 
@@ -857 +841 @@
             // This implies to iterate in descending order, as the oldest elements will only be removed after we reach the maximum
             // number and not the number of tags to show.
-            // However, as Set does not allow to iterate in descending order, we need to copy its elements into a List we can access
-            // in reverse order.
             for (int i = tags.size()-1; i >= 0 && count < tagsToShow; i--) {
                 final Tag t = tags.get(i);
@@ -995 +977 @@
             lastAddKey = key;
             lastAddValue = value;
-            recentTags.put(new Tag(key, value), null);
+            recentTags.add(new Tag(key, value));
             valueCount.put(key, new TreeMap<String, Integer>());
             AutoCompletionManager.rememberUserInput(key, value, false);