Index: trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletingComboBox.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletingComboBox.java	(revision 15836)
+++ trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletingComboBox.java	(revision 15837)
@@ -92,14 +92,5 @@
      */
     class AutoCompletingComboBoxDocument extends PlainDocument {
-        private final JosmComboBox<AutoCompletionItem> comboBox;
         private boolean selecting;
-
-        /**
-         * Constructs a new {@code AutoCompletingComboBoxDocument}.
-         * @param comboBox the combobox
-         */
-        AutoCompletingComboBoxDocument(final JosmComboBox<AutoCompletionItem> comboBox) {
-            this.comboBox = comboBox;
-        }
 
         @Override
@@ -181,5 +172,5 @@
                 }
             }
-            final JTextComponent editorComponent = comboBox.getEditorComponent();
+            final JTextComponent editorComponent = getEditorComponent();
             // save unix system selection (middle mouse paste)
             Clipboard sysSel = ClipboardUtils.getSystemSelection();
@@ -197,10 +188,10 @@
         private void setSelectedItem(Object item) {
             selecting = true;
-            comboBox.setSelectedItem(item);
+            AutoCompletingComboBox.this.setSelectedItem(item);
             selecting = false;
         }
 
         private Object lookupItem(String pattern, boolean match) {
-            ComboBoxModel<AutoCompletionItem> model = comboBox.getModel();
+            ComboBoxModel<AutoCompletionItem> model = getModel();
             AutoCompletionItem bestItem = null;
             for (int i = 0, n = model.getSize(); i < n; i++) {
@@ -234,5 +225,5 @@
         setRenderer(new AutoCompleteListCellRenderer());
         final JTextComponent editorComponent = this.getEditorComponent();
-        editorComponent.setDocument(new AutoCompletingComboBoxDocument(this));
+        editorComponent.setDocument(new AutoCompletingComboBoxDocument());
         editorComponent.addFocusListener(new InnerFocusListener(editorComponent));
     }