Changeset 31866 in osm for applications/editors/josm/plugins/wikipedia/src/org

Timestamp:

2015-12-26T22:15:37+01:00 (9 years ago)

Author:

simon04

Message:

JOSM/wikipedia: Demystify also *:wikidata tags - see #josm9775

File:

• applications/editors/josm/plugins/wikipedia/src/org/wikipedia/WikidataTagCellRenderer.java (modified) (1 diff)

applications/editors/josm/plugins/wikipedia/src/org/wikipedia/WikidataTagCellRenderer.java

@@ -41 +41 @@
     public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) {
         if (column != 1
-                || !(value instanceof Map<?, ?> && ((Map<?, ?>) value).size() == 1)
-                || !"wikidata".equals(table.getValueAt(row, 0).toString())) {
+                || !(value instanceof Map<?, ?> && ((Map<?, ?>) value).size() == 1)) {
             return null;
         }
+        final String key = table.getValueAt(row, 0).toString();
+        if (!("wikidata".equals(key) || key != null && key.endsWith(":wikidata"))) {
+            return null;
+        }
+
         final String id = ((Map<?, ?>) value).keySet().iterator().next().toString();
         if (!WikipediaApp.WIKIDATA_PATTERN.matcher(id).matches()) {