Index: /trunk/src/org/openstreetmap/josm/actions/PreferenceToggleAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/PreferenceToggleAction.java	(revision 12884)
+++ /trunk/src/org/openstreetmap/josm/actions/PreferenceToggleAction.java	(revision 12885)
@@ -8,5 +8,4 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.spi.preferences.PreferenceChangeEvent;
-import org.openstreetmap.josm.data.Preferences;
 import org.openstreetmap.josm.spi.preferences.PreferenceChangedListener;
 import org.openstreetmap.josm.data.preferences.BooleanProperty;
Index: /trunk/src/org/openstreetmap/josm/data/Preferences.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/Preferences.java	(revision 12884)
+++ /trunk/src/org/openstreetmap/josm/data/Preferences.java	(revision 12885)
@@ -195,4 +195,7 @@
     }
 
+    /**
+     * @deprecated private class is deprecated
+     */
     @Deprecated
     private static class DefaultPreferenceChangeEvent implements PreferenceChangeEvent {
@@ -227,7 +230,13 @@
     private final HashMap<String, ListenerList<org.openstreetmap.josm.spi.preferences.PreferenceChangedListener>> keyListeners = new HashMap<>();
 
+    /**
+     * @deprecated deprecated private field
+     */
     @Deprecated
     private final ListenerList<Preferences.PreferenceChangedListener> listenersDeprecated = ListenerList.create();
 
+    /**
+     * @deprecated deprecated private field
+     */
     @Deprecated
     private final HashMap<String, ListenerList<Preferences.PreferenceChangedListener>> keyListenersDeprecated = new HashMap<>();
@@ -311,5 +320,6 @@
      * @param listener The listener to add.
      * @since 10824
-     * @deprecated use {@link #addKeyPreferenceChangeListener(java.lang.String, org.openstreetmap.josm.spi.preferences.PreferenceChangedListener)}
+     * @deprecated use
+     * {@link #addKeyPreferenceChangeListener(java.lang.String, org.openstreetmap.josm.spi.preferences.PreferenceChangedListener)}
      */
     @Deprecated
@@ -332,4 +342,7 @@
     }
 
+    /**
+     * @deprecated deprecated private method
+     */
     @Deprecated
     private ListenerList<Preferences.PreferenceChangedListener> listenersForKeyDeprecated(String key) {
@@ -354,5 +367,6 @@
      * @param key The preference key to listen to
      * @param listener The listener to add.
-     * @deprecated use {@link #removeKeyPreferenceChangeListener(java.lang.String, org.openstreetmap.josm.spi.preferences.PreferenceChangedListener)}
+     * @deprecated use
+     * {@link #removeKeyPreferenceChangeListener(java.lang.String, org.openstreetmap.josm.spi.preferences.PreferenceChangedListener)}
      */
     @Deprecated
@@ -364,5 +378,6 @@
 
     protected void firePreferenceChanged(String key, Setting<?> oldValue, Setting<?> newValue) {
-        final org.openstreetmap.josm.spi.preferences.PreferenceChangeEvent evt = new org.openstreetmap.josm.spi.preferences.DefaultPreferenceChangeEvent(key, oldValue, newValue);
+        final org.openstreetmap.josm.spi.preferences.PreferenceChangeEvent evt =
+                new org.openstreetmap.josm.spi.preferences.DefaultPreferenceChangeEvent(key, oldValue, newValue);
         listeners.fireEvent(listener -> listener.preferenceChanged(evt));
 
@@ -374,4 +389,7 @@
     }
 
+    /**
+     * @deprecated deprecated private method
+     */
     @Deprecated
     private void firePreferenceChangedDeprecated(String key, Setting<?> oldValue, Setting<?> newValue) {