Changeset 16529 in josm

Timestamp:

2020-05-31T17:09:04+02:00 (5 years ago)

Author:

simon04

Message:

PreferenceToggleAction: accept BooleanProperty in constructor

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/DrawBoundariesOfDownloadedDataAction.java (modified) (1 diff)
• actions/PreferenceToggleAction.java (modified) (1 diff)
• gui/MainMenu.java (modified) (1 diff)

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

@@ -22 +22 @@
         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
         );
     }

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

@@ -26 +26 @@
      * @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);
     }
 

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

@@ -823 +823 @@
         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);