Changeset 13435 in josm for trunk/src/org/openstreetmap/josm/actions/mapmode

Timestamp:

2018-02-18T14:13:19+01:00 (6 years ago)

Author:

Don-vip

Message:

see #8039, see #10456 - fix regressions and code style issues

Location:

trunk/src/org/openstreetmap/josm/actions/mapmode

Files:

• AddNoteAction.java (modified) (2 diffs)
• SelectAction.java (modified) (1 diff)

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

@@ -17 +17 @@
 import org.openstreetmap.josm.gui.NoteInputDialog;
 import org.openstreetmap.josm.gui.Notification;
-import org.openstreetmap.josm.gui.layer.Layer;
-import org.openstreetmap.josm.gui.layer.NoteLayer;
 import org.openstreetmap.josm.gui.util.KeyPressReleaseListener;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
@@ -102 +100 @@
         // Do nothing
     }
-
-    @Override
-    public boolean layerIsSupported(Layer l) {
-        return l instanceof NoteLayer;
-    }
 }

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

@@ -670 +670 @@
             } else if (hasSelectionNearby || dragInProgress()) {
                 mode = Mode.MOVE;
-            }
-        }
-        mode = Mode.SELECT;
+            } else {
+                mode = Mode.SELECT;
+            }
+        } else {
+            mode = Mode.SELECT;
+        }
     }