Changeset 4883 in josm for trunk/src/org/openstreetmap/josm

Timestamp:

01.02.2012 19:39:19 (4 months ago)

Author:

simon04

Message:

fix #5920 - remotecontrol: add option for "new layer" to preference dialog

Location:

trunk/src/org/openstreetmap/josm

Files:

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

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

@@ -52 +52 @@
     private JCheckBox permissionChangeViewport = new JCheckBox(tr("Change the viewport"));
     private JCheckBox permissionReadProtocolversion = new JCheckBox(tr("Read protocol version"));
+    private JCheckBox loadInNewLayer = new JCheckBox(tr("Download objects to new layer"));
     private JCheckBox alwaysAskUserConfirm = new JCheckBox(tr("Confirm all Remote Control actions manually"));
 
@@ -84 +85 @@
         wrapper.add(new JSeparator(), GBC.eop().fill(GBC.HORIZONTAL).insets(15, 5, 15, 5));
 
+        wrapper.add(loadInNewLayer, GBC.eol().fill(GBC.HORIZONTAL));
+
         wrapper.add(alwaysAskUserConfirm, GBC.eol().fill(GBC.HORIZONTAL));
 
@@ -101 +104 @@
         permissionCreateObjects.setSelected(Main.pref.getBoolean(AddNodeHandler.permissionKey, AddNodeHandler.permissionDefault));
         permissionReadProtocolversion.setSelected(Main.pref.getBoolean(VersionHandler.permissionKey, VersionHandler.permissionDefault));
+        loadInNewLayer.setSelected(Main.pref.getBoolean(RequestHandler.loadInNewLayerKey, RequestHandler.loadInNewLayerDefault));
         alwaysAskUserConfirm.setSelected(Main.pref.getBoolean(RequestHandler.globalConfirmationKey, RequestHandler.globalConfirmationDefault));
 
@@ -128 +132 @@
             Main.pref.put(AddNodeHandler.permissionKey, permissionCreateObjects.isSelected());
             Main.pref.put(VersionHandler.permissionKey, permissionReadProtocolversion.isSelected());
+            Main.pref.put(RequestHandler.loadInNewLayerKey, loadInNewLayer.isSelected());
             Main.pref.put(RequestHandler.globalConfirmationKey, alwaysAskUserConfirm.isSelected());
         }

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

@@ -68 +68 @@
             minlon = Double.parseDouble(args.get("left"));
             maxlon = Double.parseDouble(args.get("right"));
-            boolean newLayer = Boolean.parseBoolean(args.get("new_layer"));
+            boolean newLayer = isLoadInNewLayer();
 
             if(command.equals(myCommand))

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

@@ -33 +33 @@
             ps.add(SimplePrimitiveId.fromString(i));
         }
-        boolean newLayer = Boolean.parseBoolean(args.get("new_layer"));
+        boolean newLayer = isLoadInNewLayer();
         boolean relationMembers = Boolean.parseBoolean(args.get("relation_members"));
         DownloadPrimitiveAction.processItems(newLayer, ps, true, relationMembers);

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

@@ -24 +24 @@
     public static final String globalConfirmationKey = "remotecontrol.always-confirm";
     public static final boolean globalConfirmationDefault = false;
+    public static final String loadInNewLayerKey = "remotecontrol.new-layer";
+    public static final boolean loadInNewLayerDefault = false;
 
     /** The GET request arguments */
@@ -210 +212 @@
     }
 
+    protected boolean isLoadInNewLayer() {
+        return args.get("new_layer") != null && !args.get("new_layer").isEmpty()
+                ? Boolean.parseBoolean(args.get("new_layer"))
+                : Main.pref.getBoolean(loadInNewLayerKey, loadInNewLayerDefault);
+    }
+
     public static class RequestHandlerException extends Exception {