Index: trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java	(revision 12618)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java	(revision 12619)
@@ -108,5 +108,5 @@
     private String objKey;
 
-    private final Comparator<AutoCompletionListItem> defaultACItemComparator =
+    static final Comparator<AutoCompletionListItem> DEFAULT_AC_ITEM_COMPARATOR =
             (o1, o2) -> String.CASE_INSENSITIVE_ORDER.compare(o1.getValue(), o2.getValue());
 
@@ -204,5 +204,5 @@
      */
     @SuppressWarnings("unchecked")
-    private boolean containsDataKey(String key) {
+    boolean containsDataKey(String key) {
         return IntStream.range(0, tagData.getRowCount())
                 .anyMatch(i -> key.equals(tagData.getValueAt(i, 0)) /* sic! do not use getDataKey*/
@@ -444,5 +444,5 @@
             AutoCompletionManager autocomplete = Main.getLayerManager().getEditLayer().data.getAutoCompletionManager();
             List<AutoCompletionListItem> keyList = autocomplete.getKeys();
-            keyList.sort(defaultACItemComparator);
+            keyList.sort(DEFAULT_AC_ITEM_COMPARATOR);
 
             keys = new AutoCompletingComboBox(key);
@@ -696,5 +696,5 @@
             keyList.removeIf(item -> containsDataKey(item.getValue()));
 
-            keyList.sort(defaultACItemComparator);
+            keyList.sort(DEFAULT_AC_ITEM_COMPARATOR);
             keys.setPossibleACItems(keyList);
             keys.setEditable(true);
@@ -715,5 +715,5 @@
                     });
 
-            focus = addFocusAdapter(autocomplete, defaultACItemComparator);
+            focus = addFocusAdapter(autocomplete, DEFAULT_AC_ITEM_COMPARATOR);
             // fire focus event in advance or otherwise the popup list will be too small at first
             focus.focusGained(null);