Index: unk/src/org/openstreetmap/josm/actions/HatchAreaOutsideDownloadAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/HatchAreaOutsideDownloadAction.java	(revision 6500)
+++ 	(revision )
@@ -1,44 +1,0 @@
-// License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.actions;
-
-import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.data.preferences.BooleanProperty;
-
-import java.awt.event.ActionEvent;
-
-import static org.openstreetmap.josm.tools.I18n.tr;
-
-/**
- * This class toggles hatched background rendering of areas outside of the downloaded areas.
- */
-public class HatchAreaOutsideDownloadAction extends PreferenceToggleAction {
-
-    private static final BooleanProperty PROP = new BooleanProperty("mappaint.hatch-outside-download-area", true);
-
-    /**
-     * Constructs a new {@link HatchAreaOutsideDownloadAction}.
-     */
-    public HatchAreaOutsideDownloadAction() {
-        super(tr("Hatch area outside download"),
-                tr("Enable/disable hatched background rendering of areas outside of the downloaded areas."),
-                PROP
-        );
-    }
-
-    @Override
-    protected void updateEnabledState() {
-        setEnabled(Main.main.hasEditLayer());
-    }
-
-    @Override
-    public void actionPerformed(ActionEvent e) {
-        super.actionPerformed(e);
-        if (Main.isDisplayingMapView()) {
-            Main.map.mapView.repaint();
-        }
-    }
-
-    public static boolean isHatchEnabled() {
-        return PROP.get();
-    }
-}
Index: /trunk/src/org/openstreetmap/josm/actions/PreferenceToggleAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/PreferenceToggleAction.java	(revision 6500)
+++ /trunk/src/org/openstreetmap/josm/actions/PreferenceToggleAction.java	(revision 6501)
@@ -7,23 +7,18 @@
 import org.openstreetmap.josm.data.Preferences;
 import org.openstreetmap.josm.data.Preferences.PreferenceChangedListener;
-import org.openstreetmap.josm.data.preferences.BooleanProperty;
-import org.openstreetmap.josm.tools.CheckParameterUtil;
 
 public class PreferenceToggleAction extends JosmAction implements PreferenceChangedListener {
 
-    protected final JCheckBoxMenuItem checkbox;
-    protected final BooleanProperty property;
+    private final JCheckBoxMenuItem checkbox;
+    private final String prefKey;
+    private final boolean prefDefault;
 
     public PreferenceToggleAction(String name, String tooltip, String prefKey, boolean prefDefault) {
-        this(name, tooltip, new BooleanProperty(prefKey, prefDefault));
-    }
-
-    public PreferenceToggleAction(String name, String tooltip, BooleanProperty property) {
         super(name, null, tooltip, null, false);
-        CheckParameterUtil.ensureParameterNotNull(property, "property");
-        putValue("toolbar", "toggle-" + property.getKey());
-        this.property = property;
+        putValue("toolbar", "toggle-" + prefKey);
+        this.prefKey = prefKey;
+        this.prefDefault = prefDefault;
         this.checkbox = new JCheckBoxMenuItem(this);
-        this.checkbox.setSelected(property.get());
+        this.checkbox.setSelected(Main.pref.getBoolean(prefKey, prefDefault));
         Main.pref.addPreferenceChangeListener(this);
     }
@@ -31,5 +26,5 @@
     @Override
     public void actionPerformed(ActionEvent e) {
-        property.put(checkbox.isSelected());
+        Main.pref.put(prefKey, checkbox.isSelected());
     }
 
@@ -40,6 +35,6 @@
     @Override
     public void preferenceChanged(Preferences.PreferenceChangeEvent e) {
-        if (property.getKey().equals(e.getKey())) {
-            checkbox.setSelected(property.get());
+        if (prefKey.equals(e.getKey())) {
+            checkbox.setSelected(Main.pref.getBoolean(prefKey, prefDefault));
         }
     }
Index: /trunk/src/org/openstreetmap/josm/gui/MainMenu.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/MainMenu.java	(revision 6500)
+++ /trunk/src/org/openstreetmap/josm/gui/MainMenu.java	(revision 6501)
@@ -47,5 +47,4 @@
 import org.openstreetmap.josm.actions.FullscreenToggleAction;
 import org.openstreetmap.josm.actions.GpxExportAction;
-import org.openstreetmap.josm.actions.HatchAreaOutsideDownloadAction;
 import org.openstreetmap.josm.actions.HelpAction;
 import org.openstreetmap.josm.actions.HistoryInfoAction;
@@ -200,5 +199,4 @@
     /** View -> Wireframe View */
     public final WireframeToggleAction wireFrameToggleAction = new WireframeToggleAction();
-    public final HatchAreaOutsideDownloadAction hatchAreaOutsideDownloadAction = new HatchAreaOutsideDownloadAction();
     public final JosmAction toggleGPXLines = new ToggleGPXLinesAction();
     /** View -> Advanced info */
@@ -645,7 +643,4 @@
         wireframe.setAccelerator(wireFrameToggleAction.getShortcut().getKeyStroke());
         wireFrameToggleAction.addButtonModel(wireframe.getModel());
-        final JCheckBoxMenuItem hatchAreaOutsideDownloadMenuItem = hatchAreaOutsideDownloadAction.getCheckbox();
-        viewMenu.add(hatchAreaOutsideDownloadMenuItem);
-        ExpertToggleAction.addVisibilitySwitcher(hatchAreaOutsideDownloadMenuItem);
 
         viewMenu.add(new MapPaintMenu());
Index: /trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java	(revision 6500)
+++ /trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java	(revision 6501)
@@ -41,5 +41,4 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.ExpertToggleAction;
-import org.openstreetmap.josm.actions.HatchAreaOutsideDownloadAction;
 import org.openstreetmap.josm.actions.RenameLayerAction;
 import org.openstreetmap.josm.actions.SaveActionBase;
@@ -318,8 +317,6 @@
 
             // paint remainder
-            if (HatchAreaOutsideDownloadAction.isHatchEnabled()) {
-                g.setPaint(hatched);
-                g.fill(a);
-            }
+            g.setPaint(hatched);
+            g.fill(a);
         }