Changeset 17093 in josm

Timestamp:

2020-10-07T19:44:51+02:00 (4 years ago)

Author:

simon04

Message:

Use Collection.addAll

Location:

trunk/src/org/openstreetmap/josm

Files:

• command/MoveCommand.java (modified) (1 diff)
• data/imagery/ImageryLayerInfo.java (modified) (1 diff)
• data/osm/QuadBuckets.java (modified) (1 diff)
• gui/conflict/tags/TagConflictResolutionUtil.java (modified) (1 diff)
• gui/dialogs/ConflictDialog.java (modified) (1 diff)
• gui/dialogs/changeset/ChangesetCacheManagerModel.java (modified) (1 diff)
• gui/layer/AutosaveTask.java (modified) (2 diffs)

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

@@ -280 +280 @@
     @Override
     public void fillModifiedData(Collection<OsmPrimitive> modified, Collection<OsmPrimitive> deleted, Collection<OsmPrimitive> added) {
-        for (OsmPrimitive osm : nodes) {
-            modified.add(osm);
-        }
+        modified.addAll(nodes);
     }
 

trunk/src/org/openstreetmap/josm/data/imagery/ImageryLayerInfo.java

@@ -184 +184 @@
             for (ImageryInfo layer : newLayers) {
                 allDefaultLayers.add(layer);
-                for (ImageryInfo sublayer : layer.getMirrors()) {
-                    allDefaultLayers.add(sublayer);
-                }
+                allDefaultLayers.addAll(layer.getMirrors());
             }
             defaultLayerIds.clear();

trunk/src/org/openstreetmap/josm/data/osm/QuadBuckets.java

@@ -449 +449 @@
      */
     public List<T> toList() {
-        List<T> a = new ArrayList<>();
-        for (T n : this) {
-            a.add(n);
-        }
-        return a;
+        return new ArrayList<>(this);
     }
 

trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolutionUtil.java

@@ -299 +299 @@
             Set<String> results = instantiateSortedSet();
             for (String value: values) {
-                for (String part: value.split(Pattern.quote(separator), -1)) {
-                    results.add(part);
-                }
+                String[] parts = value.split(Pattern.quote(separator), -1);
+                results.addAll(Arrays.asList(parts));
             }
             return String.join(separator, results);

trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java

@@ -483 +483 @@
             Collection<OsmPrimitive> sel = new LinkedList<>();
             synchronized (this) {
-                for (OsmPrimitive o : lstConflicts.getSelectedValuesList()) {
-                    sel.add(o);
-                }
+                sel.addAll(lstConflicts.getSelectedValuesList());
             }
             DataSet ds = MainApplication.getLayerManager().getEditDataSet();

trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManagerModel.java

@@ -172 +172 @@
     public void changesetCacheUpdated(ChangesetCacheEvent event) {
         List<Changeset> selected = getSelectedChangesets();
-        for (Changeset cs: event.getAddedChangesets()) {
-            data.add(cs);
-        }
-        for (Changeset cs: event.getRemovedChangesets()) {
-            data.remove(cs);
-        }
+        data.addAll(event.getAddedChangesets());
+        data.removeAll(event.getRemovedChangesets());
         for (Changeset cs: event.getUpdatedChangesets()) {
             int idx = data.indexOf(cs);

trunk/src/org/openstreetmap/josm/gui/layer/AutosaveTask.java

@@ -15 +15 @@
 import java.nio.file.Path;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.Date;
@@ -149 +150 @@
             File[] files = deletedLayersDir.listFiles();
             if (files != null) {
-                for (File f: files) {
-                    deletedLayers.add(f); // FIXME: sort by mtime
-                }
+                // FIXME: sort by mtime
+                deletedLayers.addAll(Arrays.asList(files));
             }