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

Timestamp:

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

Author:

Don-vip

Message:

see #15310 - remove most of deprecated APIs

File:

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

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

@@ -5 +5 @@
 import java.util.Collection;
 import java.util.Collections;
-import java.util.List;
 import java.util.Set;
-import java.util.stream.Collectors;
 
 import javax.swing.JTable;
@@ -51 +49 @@
 
     /**
-     * applies a filter expression to the list of {@link AutoCompletionListItem}s.
+     * applies a filter expression to the list of {@link AutoCompletionItem}s.
      *
      * The matching criterion is a case insensitive substring match.
@@ -81 +79 @@
 
     /**
-     * adds an {@link AutoCompletionListItem} to the list. Only adds the item if it
-     * is not null and if not in the list yet.
-     *
-     * @param item the item
-     * @deprecated To be removed end of 2017. Use {@link #add(AutoCompletionItem)} instead
-     */
-    @Deprecated
-    public void add(AutoCompletionListItem item) {
-        if (item == null)
-            return;
-        add(item.getItem());
-    }
-
-    /**
      * adds an {@link AutoCompletionItem} to the list. Only adds the item if it
      * is not null and if not in the list yet.
@@ -135 +119 @@
 
     /**
-     * adds a list of {@link AutoCompletionListItem} to this list. Only items which
-     * are not null and which do not exist yet in the list are added.
-     *
-     * @param other a list of AutoCompletionListItem; must not be null
-     * @throws IllegalArgumentException if other is null
-     * @deprecated to be removed end of 2017. Use {@link #add(Collection)} instead
-     */
-    @Deprecated
-    public void add(List<AutoCompletionListItem> other) {
-        CheckParameterUtil.ensureParameterNotNull(other, "other");
-        add(other.stream().map(AutoCompletionListItem::getItem).collect(Collectors.toList()));
-    }
-
-    /**
      * adds a list of strings to this list. Only strings which
      * are not null and which do not exist yet in the list are added.
@@ -154 +124 @@
      * @param values a list of strings to add
      * @param priority the priority to use
-     * @deprecated to be removed end of 2017. Use {@link #add(Collection, AutoCompletionPriority)} instead
-     */
-    @Deprecated
-    public void add(Collection<String> values, AutoCompletionItemPriority priority) {
-        add(values, priority.getPriority());
-    }
-
-    /**
-     * adds a list of strings to this list. Only strings which
-     * are not null and which do not exist yet in the list are added.
-     *
-     * @param values a list of strings to add
-     * @param priority the priority to use
      * @since 12859
      */
@@ -183 +140 @@
             filter();
         }
-    }
-
-    /**
-     * checks whether a specific item is already in the list. Matches for the
-     * the value <strong>and</strong> the priority of the item
-     *
-     * @param item the item to check
-     * @return true, if item is in the list; false, otherwise
-     * @deprecated to be removed end of 2017. Use {@link #contains(AutoCompletionItem)} instead
-     */
-    @Deprecated
-    public boolean contains(AutoCompletionListItem item) {
-        if (item == null)
-            return false;
-        return contains(item.getItem());
     }
 
@@ -264 +206 @@
      *
      * @throws IndexOutOfBoundsException if idx is out of bounds
-     * @deprecated to be removed end of 2017. Use {@link #getFilteredItemAt(int)} instead
-     */
-    @Deprecated
-    public AutoCompletionListItem getFilteredItem(int idx) {
-        return new AutoCompletionListItem(getFilteredItemAt(idx));
-    }
-
-    /**
-     * replies the idx-th item from the list of filtered items
-     * @param idx the index; must be in the range 0 &lt;= idx &lt; {@link #getFilteredSize()}
-     * @return the item
-     *
-     * @throws IndexOutOfBoundsException if idx is out of bounds
      * @since 12859
      */