Changeset 1418 in josm for trunk

Timestamp:

2009-02-16T15:24:57+01:00 (16 years ago)

Author:

stoecker

Message:

fixed #2054

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/DeleteAction.java (modified) (1 diff)
• actions/mapmode/DeleteAction.java (modified) (1 diff)
• actions/mapmode/ExtrudeAction.java (modified) (3 diffs)
• actions/mapmode/SelectAction.java (modified) (3 diffs)
• gui/MapView.java (modified) (1 diff)

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

@@ -25 +25 @@
 
     public void actionPerformed(ActionEvent e) {
+        if(!Main.map.mapView.isVisibleDrawableLayer())
+            return;
         new org.openstreetmap.josm.actions.mapmode.DeleteAction(Main.map)
                 .doActionPerformed(e);

trunk/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java

@@ -95 +95 @@
         if (e.getButton() != MouseEvent.BUTTON1)
             return;
-        if(!Main.map.mapView.isDrawableLayer())
+        if(!Main.map.mapView.isVisibleDrawableLayer())
             return;
         boolean ctrl = (e.getModifiers() & ActionEvent.CTRL_MASK) != 0;

trunk/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java

@@ -126 +126 @@
      */
     @Override public void mouseDragged(MouseEvent e) {
+        if(!Main.map.mapView.isVisibleDrawableLayer())
+            return;
         if (mode == Mode.select) return;
 
@@ -193 +195 @@
      */
     @Override public void mousePressed(MouseEvent e) {
+        if(!Main.map.mapView.isVisibleDrawableLayer())
+            return;
         if (!(Boolean)this.getValue("active")) return;
         if (e.getButton() != MouseEvent.BUTTON1)
@@ -220 +224 @@
      */
     @Override public void mouseReleased(MouseEvent e) {
+        if(!Main.map.mapView.isVisibleDrawableLayer())
+            return;
         restoreCursor();
         if (selectedSegment == null) return;

trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java

@@ -145 +145 @@
      */
     @Override public void mouseDragged(MouseEvent e) {
+        if(!Main.map.mapView.isVisibleDrawableLayer())
+            return;
+        
         cancelDrawMode = true;
         if (mode == Mode.select) return;
@@ -283 +286 @@
      */
     @Override public void mousePressed(MouseEvent e) {
+        if(!Main.map.mapView.isVisibleDrawableLayer())
+            return;
+        
         cancelDrawMode = false;
         if (! (Boolean)this.getValue("active")) return;
@@ -332 +338 @@
      */
     @Override public void mouseReleased(MouseEvent e) {
+        if(!Main.map.mapView.isVisibleDrawableLayer())
+            return;
+        
         if (mode == Mode.select) {
             selectionManager.unregister(Main.map.mapView);

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

@@ -190 +190 @@
         return activeLayer != null && activeLayer instanceof OsmDataLayer;
     }
+    
+    public Boolean isVisibleDrawableLayer() {
+        return isDrawableLayer() && activeLayer.visible;
+    }
+    
 
     /**