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

Timestamp:

2018-02-18T14:13:19+01:00 (22 months ago)

Author:

Don-vip

Message:

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

Location:

trunk/src/org/openstreetmap/josm/actions

Files:

• CombineWayAction.java (modified) (1 diff)
• downloadtasks/DownloadOsmTask.java (modified) (3 diffs)
• mapmode/AddNoteAction.java (modified) (2 diffs)
• mapmode/SelectAction.java (modified) (1 diff)
• relation/EditRelationAction.java (modified) (1 diff)

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

@@ -251 +251 @@
     protected void updateEnabledState(Collection<? extends OsmPrimitive> selection) {
         int numWays = 0;
-        if (selection.stream().map(o -> o.getDataSet()).noneMatch(DataSet::isReadOnly)) {
+        if (selection.stream().map(OsmPrimitive::getDataSet).noneMatch(DataSet::isReadOnly)) {
             for (OsmPrimitive osm : selection) {
                 if (osm instanceof Way && !osm.isIncomplete() && ++numWays >= 2) {

trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java

@@ -191 +191 @@
         /**
          * Constructs a new {@code AbstractInternalTask}.
-         *
          * @param newLayer if {@code true}, force download to a new layer
          * @param title message for the user
@@ -207 +206 @@
         /**
          * Constructs a new {@code AbstractInternalTask}.
-         *
          * @param newLayer if {@code true}, force download to a new layer
          * @param title message for the user
@@ -287 +285 @@
                 // the user explicitly wants a new layer, we don't have any layer at all
                 // or it is not clear which layer to merge to
-                //
                 final OsmDataLayer layer = createNewLayer(newLayerName);
                 MainApplication.getLayerManager().addLayer(layer, zoomAfterDownload);

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;
+        }
     }
 

trunk/src/org/openstreetmap/josm/actions/relation/EditRelationAction.java

@@ -89 +89 @@
     protected void updateEnabledState() {
         boolean enabled = false;
-        if (relations.stream().map(r -> r.getDataSet()).noneMatch(DataSet::isReadOnly)) {
+        if (relations.stream().map(Relation::getDataSet).noneMatch(DataSet::isReadOnly)) {
             for (Relation r : relations) {
                 if (!r.isDeleted()) {