Index: trunk/src/org/openstreetmap/josm/data/tagging/package-info.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/tagging/package-info.java	(revision 18305)
+++ trunk/src/org/openstreetmap/josm/data/tagging/package-info.java	(revision 18305)
@@ -0,0 +1,6 @@
+// License: GPL. For details, see LICENSE file.
+
+/**
+ * Provides classes for handling OSM tags.
+ */
+package org.openstreetmap.josm.data.tagging;
Index: trunk/src/org/openstreetmap/josm/data/vector/DataStore.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/vector/DataStore.java	(revision 18304)
+++ trunk/src/org/openstreetmap/josm/data/vector/DataStore.java	(revision 18305)
@@ -67,5 +67,5 @@
     /**
      * Get the primitives map.
-     * @implNote The returned map is a {@link Collections#synchronizedMap}. Please synchronize on it.
+     * The returned map is a {@link Collections#synchronizedMap}. Please synchronize on it.
      * @return The Primitives map.
      */
@@ -90,5 +90,4 @@
      * @param primitive The primitive to remove
      */
-    @SuppressWarnings("squid:S2445")
     protected void removePrimitive(O primitive) {
         if (primitive == null) {
Index: trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompComboBox.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompComboBox.java	(revision 18304)
+++ trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompComboBox.java	(revision 18305)
@@ -3,7 +3,4 @@
 
 import java.awt.im.InputContext;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.LinkedList;
 import java.util.Locale;
 
@@ -99,52 +96,4 @@
 
     /**
-     * Sets the items of the combobox to the given {@code String}s in reversed order (last element
-     * first).
-     *
-     * @param elems The string items to set
-     * @deprecated Has been moved to the model, where it belongs. Use
-     *     {@link org.openstreetmap.josm.gui.widgets.HistoryComboBoxModel#addAllStrings} instead. Probably you want to use
-     *     {@link org.openstreetmap.josm.gui.tagging.ac.AutoCompComboBoxModel.Preferences#load} and
-     *     {@link org.openstreetmap.josm.gui.tagging.ac.AutoCompComboBoxModel.Preferences#save}.
-     */
-    @Deprecated
-    public void setPossibleItems(Collection<E> elems) {
-        // We have to reverse the history, because ComboBoxHistory will reverse it again in addElement()
-        LinkedList<E> reversed = new LinkedList<>(elems);
-        Collections.reverse(reversed);
-        setPossibleAcItems(reversed);
-    }
-
-    /**
-     * Sets the items of the combobox to the given {@code String}s in top down order.
-     *
-     * @param elems The strings to set.
-     * @since 15011
-     * @deprecated Has been moved to the model, where it belongs. Use
-     *     {@link org.openstreetmap.josm.gui.widgets.HistoryComboBoxModel#addAllStrings} instead. Probably you want to use
-     *     {@link org.openstreetmap.josm.gui.tagging.ac.AutoCompComboBoxModel.Preferences#load} and
-     *     {@link org.openstreetmap.josm.gui.tagging.ac.AutoCompComboBoxModel.Preferences#save}.
-     */
-    @Deprecated
-    public void setPossibleItemsTopDown(Collection<E> elems) {
-        setPossibleAcItems(elems);
-    }
-
-    /**
-     * Sets the items of the combobox to the given {@code AutoCompletionItem}s.
-     *
-     * @param elems AutoCompletionItem items
-     * @since 12859
-     * @deprecated Use {@link AutoCompComboBoxModel#addAllElements} instead.
-     */
-    @Deprecated
-    public void setPossibleAcItems(Collection<E> elems) {
-        Object oldValue = getEditor().getItem();
-        getModel().removeAllElements();
-        getModel().addAllElements(elems);
-        getEditor().setItem(oldValue);
-    }
-
-    /**
      * Enables or disables the autocompletion.
      *
Index: trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionManager.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionManager.java	(revision 18304)
+++ trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionManager.java	(revision 18305)
@@ -290,5 +290,5 @@
     public void populateWithMemberRoles(AutoCompletionList list, Relation r) {
         CheckParameterUtil.ensureParameterNotNull(list, "list");
-        Collection<TaggingPreset> presets = r != null ? TaggingPresets.getMatchingPresets(null, r.getKeys(), false) : null;
+        Collection<TaggingPreset> presets = r != null ? TaggingPresets.getMatchingPresets(null, r.getKeys(), false) : Collections.emptyList();
         if (r != null && !Utils.isEmpty(presets)) {
             for (TaggingPreset tp : presets) {
Index: trunk/src/org/openstreetmap/josm/gui/widgets/HistoryComboBox.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/widgets/HistoryComboBox.java	(revision 18304)
+++ trunk/src/org/openstreetmap/josm/gui/widgets/HistoryComboBox.java	(revision 18305)
@@ -1,6 +1,4 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.gui.widgets;
-
-import java.util.List;
 
 import org.openstreetmap.josm.gui.tagging.ac.AutoCompComboBox;
@@ -34,16 +32,3 @@
         getModel().setSelectedItem(newItem);
     }
-
-    /**
-     * Returns the items as strings
-     * @return the items as strings
-     * @deprecated Has been moved to the model, where it belongs. Use
-     *     {@link HistoryComboBoxModel#asStringList} instead. Probably you want to use
-     *     {@link org.openstreetmap.josm.gui.tagging.ac.AutoCompComboBoxModel.Preferences#load} and
-     *     {@link org.openstreetmap.josm.gui.tagging.ac.AutoCompComboBoxModel.Preferences#save}.
-     */
-    @Deprecated
-    public List<String> getHistory() {
-        return getModel().asStringList();
-    }
 }
Index: trunk/src/org/openstreetmap/josm/io/protocols/package-info.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/protocols/package-info.java	(revision 18305)
+++ trunk/src/org/openstreetmap/josm/io/protocols/package-info.java	(revision 18305)
@@ -0,0 +1,9 @@
+// License: GPL. For details, see LICENSE file.
+
+/**
+ * Provides the packages for registering protocol handlers.
+ * <p>
+ * See <a href="http://stackoverflow.com/a/9388757/2257172">StackOverflow</a>.
+ * @since 10931
+ */
+package org.openstreetmap.josm.io.protocols;