Changeset 13584 in osm

Timestamp:

2009-02-08T11:38:00+01:00 (16 years ago)

Author:

stoecker

Message:

apply #2127

Location:

applications/editors/josm/plugins/wmsplugin

Files:

• build.xml (modified) (1 diff)
• src/wmsplugin/WMSAdjustAction.java (modified) (5 diffs)

applications/editors/josm/plugins/wmsplugin/build.xml

@@ -37 +37 @@
                 <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
                 <attribute name="Plugin-Description" value="Allows external WMS resources to be displayed." />
-                <attribute name="Plugin-Mainversion" value="1180" />
+                <attribute name="Plugin-Mainversion" value="1379" />
             </manifest>
         </jar>

applications/editors/josm/plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java

@@ -17 +17 @@
 
 public class WMSAdjustAction extends MapMode implements
-        MouseListener, MouseMotionListener{
+    MouseListener, MouseMotionListener{
 
     GeorefImage selectedImage;
@@ -26 +26 @@
     public WMSAdjustAction(MapFrame mapFrame) {
         super(tr("Adjust WMS"), "adjustwms", 
-                        tr("Adjust the position of the WMS layer"), mapFrame, 
+                        tr("Adjust the position of the selected WMS layer"), mapFrame, 
                         ImageProvider.getCursor("normal", "move"));
     }
@@ -45 +45 @@
         if (e.getButton() != MouseEvent.BUTTON1)
             return;
-
-         for(Layer layer:Main.map.mapView.getAllLayers()) {
-            if (layer.visible && layer instanceof WMSLayer) {
-                prevEastNorth=Main.map.mapView.getEastNorth(e.getX(),e.getY());
-                selectedLayer = ((WMSLayer)layer);
-                selectedImage = selectedLayer.findImage(prevEastNorth);
-                if(selectedImage!=null){
-                    Main.map.mapView.setCursor
-                        (Cursor.getPredefinedCursor(Cursor.MOVE_CURSOR));
-                }
+        
+        Layer layer=Main.map.mapView.getActiveLayer();
+        if (layer.visible && layer instanceof WMSLayer) {
+            prevEastNorth=Main.map.mapView.getEastNorth(e.getX(),e.getY());
+            selectedLayer = ((WMSLayer)layer);
+            selectedImage = selectedLayer.findImage(prevEastNorth);
+            if(selectedImage!=null) {
+                Main.map.mapView.setCursor
+                    (Cursor.getPredefinedCursor(Cursor.MOVE_CURSOR));
             }
         }
@@ -60 +59 @@
 
     @Override public void mouseDragged(MouseEvent e) {
-            /*
-        if (e.getButton() != MouseEvent.BUTTON1)
-            return;
-            */
-
         if(selectedImage!=null) {
             EastNorth eastNorth=
                     Main.map.mapView.getEastNorth(e.getX(),e.getY());
-                selectedLayer.displace(eastNorth.east()-prevEastNorth.east(), 
-                eastNorth.north()-prevEastNorth.north());
+            selectedLayer.displace(
+                eastNorth.east()-prevEastNorth.east(), 
+                eastNorth.north()-prevEastNorth.north()
+            );
             prevEastNorth = eastNorth;
             Main.map.mapView.repaint();
@@ -92 +88 @@
     @Override public void mouseClicked(MouseEvent e) {
     }
+    
+    // This only makes the buttons look disabled, but since no keyboard shortcut is
+    // provided there aren't any other means to activate this tool
+    @Override public boolean layerIsSupported(Layer l) {
+        return (l instanceof WMSLayer) && l.visible;
+    }
 }