Index: trunk/src/org/openstreetmap/josm/actions/DrawBoundariesOfDownloadedDataAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/DrawBoundariesOfDownloadedDataAction.java	(revision 16528)
+++ trunk/src/org/openstreetmap/josm/actions/DrawBoundariesOfDownloadedDataAction.java	(revision 16529)
@@ -22,6 +22,5 @@
         super(tr("Draw boundaries of downloaded data"),
                 tr("Enable/disable hatched background rendering of areas outside of the downloaded areas."),
-                DrawingPreference.SOURCE_BOUNDS_PROP.getKey(),
-                DrawingPreference.SOURCE_BOUNDS_PROP.getDefaultValue()
+                DrawingPreference.SOURCE_BOUNDS_PROP
         );
     }
Index: trunk/src/org/openstreetmap/josm/actions/PreferenceToggleAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/PreferenceToggleAction.java	(revision 16528)
+++ trunk/src/org/openstreetmap/josm/actions/PreferenceToggleAction.java	(revision 16529)
@@ -26,14 +26,13 @@
      * @param name the (translated) title
      * @param tooltip tooltip text
-     * @param prefKey the preference key to toggle
-     * @param prefDefault default value for the preference entry
+     * @param pref the preference to toggle
      */
-    public PreferenceToggleAction(String name, String tooltip, String prefKey, boolean prefDefault) {
+    public PreferenceToggleAction(String name, String tooltip, BooleanProperty pref) {
         super(name, null, tooltip, null, false);
-        setToolbarId("toggle-" + prefKey);
-        this.pref = new BooleanProperty(prefKey, prefDefault);
+        setToolbarId("toggle-" + pref.getKey());
+        this.pref = pref;
         checkbox = new JCheckBoxMenuItem(this);
         checkbox.setSelected(pref.get());
-        Preferences.main().addWeakKeyPreferenceChangeListener(prefKey, this);
+        Preferences.main().addWeakKeyPreferenceChangeListener(pref.getKey(), this);
     }
 
Index: trunk/src/org/openstreetmap/josm/gui/MainMenu.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/MainMenu.java	(revision 16528)
+++ trunk/src/org/openstreetmap/josm/gui/MainMenu.java	(revision 16529)
@@ -823,8 +823,8 @@
         viewMenu.add(new PreferenceToggleAction(tr("Main toolbar"),
                 tr("Toggles the visibility of the main toolbar (i.e., the horizontal toolbar)"),
-                MapFrame.TOOLBAR_VISIBLE.getKey(), MapFrame.TOOLBAR_VISIBLE.getDefaultValue()).getCheckbox());
+                MapFrame.TOOLBAR_VISIBLE).getCheckbox());
         viewMenu.add(new PreferenceToggleAction(tr("Edit toolbar"),
                 tr("Toggles the visibility of the edit toolbar (i.e., the vertical tool)"),
-                MapFrame.SIDE_TOOLBAR_VISIBLE.getKey(), MapFrame.SIDE_TOOLBAR_VISIBLE.getDefaultValue()).getCheckbox());
+                MapFrame.SIDE_TOOLBAR_VISIBLE).getCheckbox());
         // -- dialogs panel toggle action
         final JCheckBoxMenuItem dialogsToggle = new JCheckBoxMenuItem(dialogsToggleAction);