Changeset 24572 in osm

Timestamp:

2010-12-04T12:14:12+01:00 (14 years ago)

Author:

upliner

Message:

unify remote control feature for WMS and TMS

Location:

applications/editors/josm/plugins/imagery/src/org/openstreetmap/josm/plugins/imagery

Files:

• ImageryPlugin.java (modified) (2 diffs)
• ImageryPreferenceEditor.java (modified) (7 diffs)
• ImageryPreferences.java (modified) (1 diff)
• ImageryRemoteHandler.java (moved) (moved from applications/editors/josm/plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/wms/WMSRemoteHandler.java ) (4 diffs)

applications/editors/josm/plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/ImageryPlugin.java

@@ -29 +29 @@
 import org.openstreetmap.josm.plugins.imagery.wms.WMSAdapter;
 import org.openstreetmap.josm.plugins.imagery.wms.WMSLayer;
-import org.openstreetmap.josm.plugins.imagery.wms.WMSRemoteHandler;
 import org.openstreetmap.josm.plugins.imagery.wms.io.WMSLayerExporter;
 import org.openstreetmap.josm.plugins.imagery.wms.io.WMSLayerImporter;
@@ -124 +123 @@
                     // replace command and class when you copy this to some other plug-in
                     // for compatibility with old remotecontrol add leading "/"
-                    method.invoke(plugin, "/" + WMSRemoteHandler.command, WMSRemoteHandler.class);
+                    method.invoke(plugin, "/" + ImageryRemoteHandler.command, ImageryRemoteHandler.class);
                     remoteControlInitialized = true;
                 }

applications/editors/josm/plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/ImageryPreferenceEditor.java

@@ -57 +57 @@
     private JButton btnFadeColor;
     private JSlider fadeAmount = new JSlider(0, 100);
+    private JCheckBox remoteCheckBox;
+    boolean allowRemoteControl = true;
 
     // WMS Settings
@@ -63 +65 @@
     JSpinner spinNorth;
     JSpinner spinSimConn;
-    JCheckBox remoteCheckBox;
-    boolean allowRemoteControl = true;
     WMSAdapter wmsAdapter = ImageryPlugin.wmsAdapter;
     ImageryPlugin plugin = ImageryPlugin.instance;
@@ -226 +226 @@
         p.add(GBC.glue(5, 0), GBC.std().fill(GBC.HORIZONTAL));
         p.add(this.fadeAmount, GBC.eol().fill(GBC.HORIZONTAL));
-
         this.fadeAmount.setValue(ImageryPreferences.PROP_FADE_AMOUNT.get());
+
+        allowRemoteControl = ImageryPreferences.PROP_REMOTE_CONTROL.get();
+        remoteCheckBox = new JCheckBox(tr("Allow remote control (reqires remotecontrol plugin)"), allowRemoteControl);
+        p.add(remoteCheckBox,GBC.eol().fill(GBC.HORIZONTAL));
+
         return p;
     }
@@ -270 +274 @@
         p.add(overlapPanelSimConn, GBC.eol().fill(GBC.HORIZONTAL));
 
-        allowRemoteControl = Main.pref.getBoolean("wmsplugin.remotecontrol", true);
-        remoteCheckBox = new JCheckBox(tr("Allow remote control (reqires remotecontrol plugin)"), allowRemoteControl);
-        JPanel remotePanel = new JPanel(new FlowLayout(FlowLayout.LEFT));
-        remotePanel.add(remoteCheckBox);
-
-        p.add(remotePanel,GBC.eol().fill(GBC.HORIZONTAL));
         return p;
     }
@@ -314 +312 @@
         p.add(lbl,GBC.std());
         p.add(new JSeparator(), GBC.eol().fill(GBC.HORIZONTAL).insets(5, 0, 0, 0));
-        p.add(section,GBC.eol().insets(20,5,0,5));
+        p.add(section,GBC.eol().insets(20,5,0,10));
     }
 
@@ -353 +351 @@
         Main.pref.put("wmsplugin.browser", browser.getEditor().getItem().toString());
 
-        Main.pref.put("wmsplugin.remotecontrol", String.valueOf(allowRemoteControl));
 
         TMSPreferences.PROP_DEFAULT_AUTOZOOM.put(this.autozoomActive.isSelected());
@@ -360 +357 @@
         TMSPreferences.setMinZoomLvl((Integer)this.minZoomLvl.getValue());
 
+        ImageryPreferences.PROP_REMOTE_CONTROL.put(allowRemoteControl);
         ImageryPreferences.PROP_FADE_AMOUNT.put(this.fadeAmount.getValue());
         ImageryPreferences.setFadeColor(this.colFadeColor);

applications/editors/josm/plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/ImageryPreferences.java

@@ -4 +4 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.preferences.BooleanProperty;
 import org.openstreetmap.josm.data.preferences.IntegerProperty;
 
 public class ImageryPreferences {
 
+    public static final BooleanProperty PROP_REMOTE_CONTROL = new BooleanProperty("imagery.remotecontrol", true);
     public static final IntegerProperty PROP_FADE_AMOUNT = new IntegerProperty("imagery.fade_amount", 0);
 

applications/editors/josm/plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/ImageryRemoteHandler.java

@@ -1 @@
-package org.openstreetmap.josm.plugins.imagery.wms;
+package org.openstreetmap.josm.plugins.imagery;
 
 import static org.openstreetmap.josm.tools.I18n.tr;
@@ -9 +9 @@
 
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.plugins.imagery.ImageryInfo;
 import org.openstreetmap.josm.plugins.remotecontrol.PermissionPrefWithDefault;
 import org.openstreetmap.josm.plugins.remotecontrol.RequestHandler;
 import org.openstreetmap.josm.plugins.remotecontrol.RequestHandlerErrorException;
 
-public class WMSRemoteHandler extends RequestHandler {
+public class ImageryRemoteHandler extends RequestHandler {
 
-    public static final String command = "wms";
+    public static final String command = "imagery";
 
     @Override
     public String getPermissionMessage() {
-        return tr("Remote Control has been asked to load a WMS layer from the following URL:") +
+        return tr("Remote Control has been asked to load an imagery layer from the following URL:") +
         "<br>" + args.get("url");
     }
@@ -28 +27 @@
     {
         return new PermissionPrefWithDefault(
-                "wmsplugin.remotecontrol",
+                "imagery.remotecontrol",
                 true,
-        "RemoteControl: WMS forbidden by preferences");
+        "RemoteControl: Imagery forbidden by preferences");
     }
 
@@ -41 +40 @@
     @Override
     protected void handleRequest() throws RequestHandlerErrorException {
+        if (Main.map == null) //Avoid exception when creating ImageryLayer with null MapFrame
+            throw new RequestHandlerErrorException();
         String url = args.get("url");
         String title = args.get("title");
         if((title == null) || (title.length() == 0))
         {
-            title = tr("Remote WMS");
+            title = tr("Remote imagery");
         }
         String cookies = args.get("cookies");
-        WMSLayer wmsLayer = new WMSLayer(new ImageryInfo(title, url, cookies));
-        Main.main.addLayer(wmsLayer);
+        ImageryLayer imgLayer = ImageryLayer.create(new ImageryInfo(title, url, cookies));
+        Main.main.addLayer(imgLayer);
 
     }