Changeset 1750 in josm for trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java

Timestamp:

2009-07-08T21:50:32+02:00 (17 years ago)

Author:

Gubaer

Message:

new: replaced global conflict list by conflict list per layer, similar to datasets

File:

• trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java (modified) (5 diffs)

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

@@ -240 +240 @@
      */
     public void eventDispatched(AWTEvent event) {
-        if(Main.map == null || Main.map.mapView == null || !Main.map.mapView.isDrawableLayer())
+        if(Main.map == null || Main.map.mapView == null || !Main.map.mapView.isActiveLayerDrawable())
             return;
         updateKeyModifiers((InputEvent) event);
@@ -251 +251 @@
      */
     public void selectionChanged(Collection<? extends OsmPrimitive> newSelection) {
-        if(!Main.map.mapView.isDrawableLayer())
+        if(!Main.map.mapView.isActiveLayerDrawable())
             return;
         computeHelperLine();
@@ -288 +288 @@
         if (e.getButton() != MouseEvent.BUTTON1)
             return;
-        if(!Main.map.mapView.isDrawableLayer())
+        if(!Main.map.mapView.isActiveLayerDrawable())
             return;
 
@@ -576 +576 @@
 
     @Override public void mouseMoved(MouseEvent e) {
-        if(!Main.map.mapView.isDrawableLayer())
+        if(!Main.map.mapView.isActiveLayerDrawable())
             return;
 
@@ -705 +705 @@
      */
     @Override public void mouseExited(MouseEvent e) {
-        if(!Main.map.mapView.isDrawableLayer())
+        if(!Main.map.mapView.isActiveLayerDrawable())
             return;
         mousePos = e.getPoint();