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

Timestamp:

2017-04-01T00:10:42+02:00 (8 years ago)

Author:

Don-vip

Message:

fix #14527 - Add Tag - last entry disabled for partial dataset

File:

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

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

@@ -197 +197 @@
     }
 
+    /**
+     * Determines if the given tag key is already used (by all selected primitives, not just some of them)
+     * @param key the key to check
+     * @return {@code true} if the key is used by all selected primitives (key not unset for at least one primitive)
+     */
+    @SuppressWarnings("unchecked")
     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);
+                .filter(i -> key.equals(tagData.getValueAt(i, 0)) /* sic! do not use getDataKey*/
+                    && !((Map<String, Integer>) tagData.getValueAt(i, 1)).containsKey("") /* sic! do not use getDataValues*/)
+                .findAny().isPresent();
     }
 
@@ -866 +873 @@
             for (int i = 0; i < tags.size() && count < tagsToShow; i++) {
                 final Tag t = tags.get(i);
-                boolean keyExists = keyExists(t);
+                boolean keyExists = containsDataKey(t.getKey());
                 if (keyExists && PROPERTY_RECENT_EXISTING.get() == RecentExisting.HIDE)
                     continue;
@@ -1074 +1081 @@
         }
 
-        private boolean keyExists(final Tag t) {
-            return valueCount.containsKey(t.getKey());
-        }
-
         private void refreshRecentTags() {
             switch (PROPERTY_REFRESH_RECENT.get()) {