Changeset 10174 in josm for trunk/src/org/openstreetmap

Timestamp:

2016-05-10T16:09:21+02:00 (8 years ago)

Author:

Don-vip

Message:

fix coverity 1354674, 1354675

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/JoinAreasAction.java (modified) (1 diff)
• actions/SplitWayAction.java (modified) (1 diff)
• command/DeleteCommand.java (modified) (3 diffs)

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

@@ -959 +959 @@
                     Collections.<OsmPrimitive>emptyList(), SplitWayAction.Strategy.keepFirstChunk());
 
-            //execute the command, we need the results
-            cmds.add(split.getCommand());
-            commitCommands(marktr("Split ways into fragments"));
-
-            result.add(split.getOriginalWay());
-            result.addAll(split.getNewWays());
-        } else {
+            if (split != null) {
+                //execute the command, we need the results
+                cmds.add(split.getCommand());
+                commitCommands(marktr("Split ways into fragments"));
+
+                result.add(split.getOriginalWay());
+                result.addAll(split.getNewWays());
+            }
+        }
+        if (result.isEmpty()) {
             //nothing to split
             result.add(way);

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

@@ -746 +746 @@
     public static SplitWayResult split(OsmDataLayer layer, Way way, List<Node> atNodes, Collection<? extends OsmPrimitive> selection) {
         List<List<Node>> chunks = buildSplitChunks(way, atNodes);
-        if (chunks == null) return null;
-        return splitWay(layer, way, chunks, selection);
+        return chunks != null ? splitWay(layer, way, chunks, selection) : null;
     }
 

trunk/src/org/openstreetmap/josm/command/DeleteCommand.java

@@ -8 +8 @@
 import java.awt.GridBagLayout;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
@@ -27 +28 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.SplitWayAction;
+import org.openstreetmap.josm.actions.SplitWayAction.SplitWayResult;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -470 +472 @@
             return new ChangeCommand(ws.way, wnew);
         } else {
-            List<List<Node>> chunks = new ArrayList<>(2);
-            chunks.add(n1);
-            chunks.add(n2);
-            return SplitWayAction.splitWay(layer, ws.way, chunks, Collections.<OsmPrimitive>emptyList()).getCommand();
+            SplitWayResult split = SplitWayAction.splitWay(layer, ws.way, Arrays.asList(n1, n2), Collections.<OsmPrimitive>emptyList());
+            return split != null ? split.getCommand() : null;
         }
     }