Changeset 16575 in josm

Timestamp:

2020-06-08T21:17:38+02:00 (4 years ago)

Author:

simon04

Message:

RequestHandler: use BooleanProperty

Location:

trunk/src/org/openstreetmap/josm

Files:

• gui/preferences/remotecontrol/RemoteControlPreference.java (modified) (2 diffs)
• io/remotecontrol/handler/RequestHandler.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/gui/preferences/remotecontrol/RemoteControlPreference.java

@@ -104 +104 @@
         remote.add(Box.createVerticalGlue(), GBC.eol().fill(GBC.VERTICAL));
 
-        loadInNewLayer.setSelected(Config.getPref().getBoolean(
-                RequestHandler.loadInNewLayerKey, RequestHandler.loadInNewLayerDefault));
-        alwaysAskUserConfirm.setSelected(Config.getPref().getBoolean(
-                RequestHandler.globalConfirmationKey, RequestHandler.globalConfirmationDefault));
+        loadInNewLayer.setSelected(RequestHandler.LOAD_IN_NEW_LAYER.get());
+        alwaysAskUserConfirm.setSelected(RequestHandler.GLOBAL_CONFIRMATION.get());
 
         ActionListener remoteControlEnabled = e -> GuiHelper.setEnabledRec(wrapper, enableRemoteControl.isSelected());
@@ -123 +121 @@
                 Config.getPref().putBoolean(p.getKey().pref, p.getValue().isSelected());
             }
-            Config.getPref().putBoolean(RequestHandler.loadInNewLayerKey, loadInNewLayer.isSelected());
-            Config.getPref().putBoolean(RequestHandler.globalConfirmationKey, alwaysAskUserConfirm.isSelected());
+            RequestHandler.LOAD_IN_NEW_LAYER.put(loadInNewLayer.isSelected());
+            RequestHandler.GLOBAL_CONFIRMATION.put(alwaysAskUserConfirm.isSelected());
         }
         if (changed) {

trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/RequestHandler.java

@@ -24 +24 @@
 import org.openstreetmap.josm.data.osm.DownloadPolicy;
 import org.openstreetmap.josm.data.osm.UploadPolicy;
+import org.openstreetmap.josm.data.preferences.BooleanProperty;
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.io.remotecontrol.PermissionPrefWithDefault;
@@ -38 +39 @@
 public abstract class RequestHandler {
 
-    /** preference key to determine if all Remote Control actions must be confirmed manually */
-    public static final String globalConfirmationKey = "remotecontrol.always-confirm";
-    /** whether remote control actions must be confirmed manually by default */
-    public static final boolean globalConfirmationDefault = false;
-    /** preference key to determine if remote control loads data in a new layer */
-    public static final String loadInNewLayerKey = "remotecontrol.new-layer";
-    /** whether remote control loads data in a new layer by default */
-    public static final boolean loadInNewLayerDefault = false;
+    /** preference to determine if all Remote Control actions must be confirmed manually */
+    public static final BooleanProperty GLOBAL_CONFIRMATION = new BooleanProperty("remotecontrol.always-confirm", false);
+    /** preference to determine if remote control loads data in a new layer */
+    public static final BooleanProperty LOAD_IN_NEW_LAYER = new BooleanProperty("remotecontrol.new-layer", false);
 
     protected static final Pattern SPLITTER_COMMA = Pattern.compile(",\\s*");
@@ -199 +196 @@
          * If yes, display specific confirmation message.
          */
-        if (Config.getPref().getBoolean(globalConfirmationKey, globalConfirmationDefault)) {
+        if (GLOBAL_CONFIRMATION.get()) {
             // Ensure dialog box does not exceed main window size
             Integer maxWidth = (int) Math.max(200, MainApplication.getMainFrame().getWidth()*0.6);
@@ -341 +338 @@
 
     private boolean isLoadInNewLayer() {
-        return get("new_layer", Boolean::parseBoolean, () -> Config.getPref().getBoolean(loadInNewLayerKey, loadInNewLayerDefault));
+        return get("new_layer", Boolean::parseBoolean, LOAD_IN_NEW_LAYER::get);
     }