Changeset 11296 in josm for trunk/src/org/openstreetmap/josm

Timestamp:

2016-11-23T15:08:41+01:00 (7 years ago)

Author:

simon04

Message:

fix #14030 - Add tags: preselect second property if first is already used

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java (modified) (11 diffs)

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

@@ -38 +38 @@
 import java.util.Objects;
 import java.util.TreeMap;
+import java.util.stream.IntStream;
 
 import javax.swing.AbstractAction;
@@ -79 +80 @@
 import org.openstreetmap.josm.gui.mappaint.MapPaintStyles;
 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletingComboBox;
+import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionItemPriority;
 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionListItem;
 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionManager;
@@ -109 +111 @@
     private final Comparator<AutoCompletionListItem> defaultACItemComparator =
             (o1, o2) -> String.CASE_INSENSITIVE_ORDER.compare(o1.getValue(), o2.getValue());
-
-    private String lastAddKey;
-    private String lastAddValue;
 
     /** Default number of recent tags */
@@ -164 +163 @@
     SearchAction.SearchSetting tagsToIgnore;
 
-    // Copy of recently added tags, used to cache initial status
+    /**
+     * Copy of recently added tags in sorted from newest to oldest order.
+     *
+     * We store the maximum number of recent tags to allow dynamic change of number of tags shown in the preferences.
+     * Used to cache initial status.
+     */
     private List<Tag> tags;
+
+    static {
+        // init user input based on recent tags
+        final RecentTagCollection recentTags = new RecentTagCollection(MAX_LRU_TAGS_NUMBER);
+        recentTags.loadFromPreference(PROPERTY_RECENT_TAGS);
+        recentTags.toList().forEach(tag -> AutoCompletionManager.rememberUserInput(tag.getKey(), tag.getValue(), false));
+    }
 
     /**
@@ -186 +197 @@
     public final String getDataKey(int viewRow) {
         return tagData.getValueAt(tagTable.convertRowIndexToModel(viewRow), 0).toString();
+    }
+
+    private boolean containsDataKey(String key) {
+        return IntStream.range(0, tagData.getRowCount())
+                .mapToObj(i -> tagData.getValueAt(i, 0) /* sic! do not use getDataKey*/)
+                .anyMatch(key::equals);
     }
 
@@ -335 +352 @@
     private void cacheRecentTags() {
         tags = recentTags.toList();
+        Collections.reverse(tags);
     }
 
@@ -665 +683 @@
                 +"<br><br>"+tr("Please select a key")), GBC.eol().fill(GBC.HORIZONTAL));
 
+            cacheRecentTags();
             AutoCompletionManager autocomplete = Main.getLayerManager().getEditLayer().data.getAutoCompletionManager();
             List<AutoCompletionListItem> keyList = autocomplete.getKeys();
 
-            AutoCompletionListItem itemToSelect = null;
             // remove the object's tag keys from the list
             Iterator<AutoCompletionListItem> iter = keyList.iterator();
             while (iter.hasNext()) {
                 AutoCompletionListItem item = iter.next();
-                if (item.getValue().equals(lastAddKey)) {
-                    itemToSelect = item;
-                }
-                for (int i = 0; i < tagData.getRowCount(); ++i) {
-                    if (item.getValue().equals(tagData.getValueAt(i, 0) /* sic! do not use getDataKey*/)) {
-                        if (itemToSelect == item) {
-                            itemToSelect = null;
-                        }
-                        iter.remove();
-                        break;
-                    }
+                if (containsDataKey(item.getValue())) {
+                    iter.remove();
                 }
             }
@@ -696 +705 @@
             values.setEditable(true);
             mainPanel.add(values, GBC.eop().fill(GBC.HORIZONTAL));
-            if (itemToSelect != null) {
-                keys.setSelectedItem(itemToSelect);
-                if (lastAddValue != null) {
-                    values.setSelectedItem(lastAddValue);
-                }
-            }
+
+            // pre-fill first recent tag for which the key is not already present
+            tags.stream()
+                    .filter(tag -> !containsDataKey(tag.getKey()))
+                    .findFirst()
+                    .ifPresent(tag -> {
+                        keys.setSelectedItem(tag.getKey());
+                        values.setSelectedItem(tag.getValue());
+                    });
 
             focus = addFocusAdapter(autocomplete, defaultACItemComparator);
@@ -719 +731 @@
                 });
 
-            cacheRecentTags();
             suggestRecentlyAddedTags();
 
@@ -861 +872 @@
             int count = 0;
             destroyActions();
-            // We store the maximum number of recent tags to allow dynamic change of number of tags shown in the preferences.
-            // 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.
-            for (int i = tags.size()-1; i >= 0 && count < tagsToShow; i--) {
+            for (int i = 0; i < tags.size() && count < tagsToShow; i++) {
                 final Tag t = tags.get(i);
                 boolean keyExists = keyExists(t);
@@ -1056 +1064 @@
                 }
             }
-            lastAddKey = key;
-            lastAddValue = value;
             recentTags.add(new Tag(key, value));
             valueCount.put(key, new TreeMap<String, Integer>());