Changeset 6501 in josm for trunk/src

Timestamp:

2013-12-19T21:01:44+01:00 (10 years ago)

Author:

simon04

Message:

Revert accidentally committed r6499 (to be committed after the stabilization phase)

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/HatchAreaOutsideDownloadAction.java (deleted)
• actions/PreferenceToggleAction.java (modified) (3 diffs)
• gui/MainMenu.java (modified) (3 diffs)
• gui/layer/OsmDataLayer.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/actions/PreferenceToggleAction.java

@@ -7 +7 @@
 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 +26 @@
     @Override
     public void actionPerformed(ActionEvent e) {
-        property.put(checkbox.isSelected());
+        Main.pref.put(prefKey, checkbox.isSelected());
     }
 
@@ -40 +35 @@
     @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));
         }
     }

trunk/src/org/openstreetmap/josm/gui/MainMenu.java

@@ -47 +47 @@
 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 +199 @@
     /** 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 +643 @@
         wireframe.setAccelerator(wireFrameToggleAction.getShortcut().getKeyStroke());
         wireFrameToggleAction.addButtonModel(wireframe.getModel());
-        final JCheckBoxMenuItem hatchAreaOutsideDownloadMenuItem = hatchAreaOutsideDownloadAction.getCheckbox();
-        viewMenu.add(hatchAreaOutsideDownloadMenuItem);
-        ExpertToggleAction.addVisibilitySwitcher(hatchAreaOutsideDownloadMenuItem);
 
         viewMenu.add(new MapPaintMenu());

trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java

@@ -41 +41 @@
 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 +317 @@
 
             // paint remainder
-            if (HatchAreaOutsideDownloadAction.isHatchEnabled()) {
-                g.setPaint(hatched);
-                g.fill(a);
-            }
+            g.setPaint(hatched);
+            g.fill(a);
         }