Changeset 13173 in josm for trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletingComboBox.java

Timestamp:

2017-11-28T00:56:29+01:00 (6 years ago)

Author:

Don-vip

Message:

see #15310 - remove most of deprecated APIs

File:

• trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletingComboBox.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletingComboBox.java

@@ -10 +10 @@
 import java.util.Collection;
 import java.util.Locale;
-import java.util.stream.Collectors;
 
 import javax.swing.ComboBoxEditor;
@@ -254 +253 @@
         } else if (item instanceof AutoCompletionItem) {
             cbEditor.setItem(((AutoCompletionItem) item).getValue());
-        } else if (item instanceof AutoCompletionListItem) {
-            cbEditor.setItem(((AutoCompletionListItem) item).getItem().getValue());
         } else
             throw new IllegalArgumentException("Unsupported item: "+item);
@@ -271 +268 @@
         } else if (item instanceof AutoCompletionItem) {
             super.setSelectedItem(item);
-        } else if (item instanceof AutoCompletionListItem) {
-            super.setSelectedItem(((AutoCompletionListItem) item).getItem());
         } else if (item instanceof String) {
             String s = (String) item;
@@ -304 +299 @@
         this.getEditor().setItem(oldValue); // Do not use setSelectedItem(oldValue); (fix #8013)
         autocompleteEnabled = true;
-    }
-
-    /**
-     * Sets the items of the combobox to the given {@code AutoCompletionListItem}s.
-     * @param elems AutoCompletionListItem items
-     * @deprecated to be removed end of 2017. Use {@link #setPossibleAcItems(Collection)} instead
-     */
-    @Deprecated
-    public void setPossibleACItems(Collection<AutoCompletionListItem> elems) {
-        setPossibleAcItems(elems.stream().map(AutoCompletionListItem::getItem).collect(Collectors.toList()));
     }