Changeset 9999 in josm for trunk

Timestamp:

2016-03-15T09:15:57+01:00 (9 years ago)

Author:

Don-vip

Message:

sonar - do not copy collection contents from one to another with a loop

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/OrthogonalizeAction.java (modified) (1 diff)
• actions/SelectNonBranchingWaySequences.java (modified) (1 diff)
• actions/SplitWayAction.java (modified) (1 diff)
• data/validation/tests/OverlappingWays.java (modified) (1 diff)
• gui/dialogs/relation/ParentRelationLoadingTask.java (modified) (2 diffs)
• gui/layer/geoimage/GeoImageLayer.java (modified) (2 diffs)

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

@@ -305 +305 @@
         final Set<Node> allNodes = new HashSet<>();
         for (WayData w : wayDataList) {
-            for (Node n : w.wayNodes) {
-                allNodes.add(n);
-            }
+            allNodes.addAll(w.wayNodes);
         }
 

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

@@ -147 +147 @@
 
         boolean selectionChanged = false;
-        Collection<OsmPrimitive> selection = new LinkedList<>();
-        for (OsmPrimitive primitive : currentSelection) {
-            selection.add(primitive);
-        }
+        Collection<OsmPrimitive> selection = new LinkedList<>(currentSelection);
 
         do {

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

@@ -586 +586 @@
         newWays.remove(wayToKeep);
 
+        newSelection.addAll(newWays);
         for (Way wayToAdd : newWays) {
             commandList.add(new AddCommand(layer, wayToAdd));
-            newSelection.add(wayToAdd);
         }
 

trunk/src/org/openstreetmap/josm/data/validation/tests/OverlappingWays.java

@@ -148 +148 @@
                     seenWays.put(currentWays, duplicated);
                 } else { /* way seen, mark highlight layer only */
-                    for (WaySegment ws : duplicated) {
-                        highlight.add(ws);
-                    }
+                    highlight.addAll(duplicated);
                 }
             }

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java

@@ -12 +12 @@
 
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.data.DataSource;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.DataSetMerger;
@@ -165 +164 @@
 
                 // copy the merged layer's data source info
-                for (DataSource src : referrers.dataSources) {
-                    getLayer().data.dataSources.add(src);
-                }
+                getLayer().data.dataSources.addAll(referrers.dataSources);
                 // FIXME: this is necessary because there are  dialogs listening
-                // for DataChangeEvents which manipulate Swing components on this
-                // thread.
+                // for DataChangeEvents which manipulate Swing components on this thread.
                 //
                 SwingUtilities.invokeLater(

trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java

@@ -56 +56 @@
 import org.openstreetmap.josm.gui.dialogs.LayerListDialog;
 import org.openstreetmap.josm.gui.dialogs.LayerListPopup;
+import org.openstreetmap.josm.gui.layer.AbstractModifiableLayer;
 import org.openstreetmap.josm.gui.layer.GpxLayer;
 import org.openstreetmap.josm.gui.layer.JumpToMarkerActions.JumpToMarkerLayer;
 import org.openstreetmap.josm.gui.layer.JumpToMarkerActions.JumpToNextMarker;
 import org.openstreetmap.josm.gui.layer.JumpToMarkerActions.JumpToPreviousMarker;
-import org.openstreetmap.josm.gui.layer.AbstractModifiableLayer;
 import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.gui.util.GuiHelper;
@@ -978 +978 @@
      */
     public List<ImageEntry> getImages() {
-        if (data == null) {
-            return Collections.emptyList();
-        }
-        List<ImageEntry> copy = new ArrayList<>(data.size());
-        for (ImageEntry ie : data) {
-            copy.add(ie);
-        }
-        return copy;
+        return data == null ? Collections.<ImageEntry>emptyList() : new ArrayList<>(data);
     }