Changeset 16628 in josm for trunk/src

Timestamp:

2020-06-14T14:55:29+02:00 (4 years ago)

Author:

simon04

Message:

see #19334 - ​https://errorprone.info/bugpattern/MixedMutabilityReturnType

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/CombineWayAction.java (modified) (1 diff)
• actions/OpenLocationAction.java (modified) (1 diff)
• actions/corrector/TagCorrector.java (modified) (1 diff)
• actions/downloadtasks/DownloadOsmTask.java (modified) (1 diff)
• data/osm/Changeset.java (modified) (1 diff)
• data/osm/NodeGraph.java (modified) (1 diff)
• data/validation/tests/Addresses.java (modified) (1 diff)
• data/validation/tests/ConnectivityRelations.java (modified) (1 diff)
• data/validation/util/ValUtil.java (modified) (1 diff)
• gui/layer/AbstractTileSourceLayer.java (modified) (1 diff)
• gui/mappaint/mapcss/Functions.java (modified) (4 diffs)
• gui/widgets/MultiSplitLayout.java (modified) (1 diff)
• io/OsmServerChangesetReader.java (modified) (1 diff)
• tools/WinRegistry.java (modified) (2 diffs)

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

@@ -260 +260 @@
         if (list.size() == 1) {
             // ways form a single line string
-            return new ArrayList<>(list.iterator().next().getNodes());
+            return Collections.unmodifiableList(new ArrayList<>(list.iterator().next().getNodes()));
         }
         return Collections.emptyList();

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

@@ -283 +283 @@
             }
         }
-        return result;
+        return Collections.unmodifiableList(result);
     }
 

trunk/src/org/openstreetmap/josm/actions/corrector/TagCorrector.java

@@ -211 +211 @@
             } else if (answer != JOptionPane.NO_OPTION)
                 throw new UserCancelException();
-            return commands;
+            return Collections.unmodifiableCollection(commands);
         }
 

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

@@ -409 +409 @@
                 rels.stream().filter(r -> !dataSet.containsRelation(r)).forEachOrdered(col::add);
             }
-            return col;
+            return Collections.unmodifiableCollection(col);
         }
     }

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

@@ -475 +475 @@
             return Collections.emptyList();
         }
-        return new ArrayList<>(discussion);
+        return Collections.unmodifiableList(discussion);
     }
 

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

@@ -375 +375 @@
             }
         }
-        return result;
+        return Collections.unmodifiableSet(result);
     }
 

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

@@ -242 +242 @@
             }
             errors.addAll(result);
-            return result;
+            return Collections.unmodifiableList(result);
         }
         return Collections.emptyList();

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

@@ -120 +120 @@
             result.put(laneNumber, connections);
         }
-        return result;
+        return Collections.unmodifiableMap(result);
     }
 

trunk/src/org/openstreetmap/josm/data/validation/util/ValUtil.java

@@ -86 +86 @@
             cells.add(cellWays.computeIfAbsent(cell, k -> new ArrayList<>()));
         }
-        return cells;
+        return Collections.unmodifiableList(cells);
     }
 

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

@@ -1108 +1108 @@
             drawImageInside(g, img, anchorImage, anchorScreen, clip);
         }
-        return missedTiles;
+        return Collections.unmodifiableList(missedTiles);
     }
 

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Functions.java

@@ -4 +4 @@
 import java.awt.Color;
 import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
@@ -12 +10 @@
 import java.util.Map.Entry;
 import java.util.Objects;
-import java.util.TreeSet;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -41 +38 @@
 import org.openstreetmap.josm.tools.RightAndLefthandTraffic;
 import org.openstreetmap.josm.tools.RotationAngle;
+import org.openstreetmap.josm.tools.StreamUtils;
 import org.openstreetmap.josm.tools.Territories;
 import org.openstreetmap.josm.tools.Utils;
@@ -476 +474 @@
         if (env.parent == null) {
             if (env.osm != null) {
-                final Collection<String> tags = new TreeSet<>(AlphanumComparator.getInstance());
                 // we don't have a matched parent, so just search all referrers
-                for (IPrimitive parent : env.osm.getReferrers()) {
-                    String value = parent.get(key);
-                    if (value != null) {
-                        tags.add(value);
-                    }
-                }
-                return new ArrayList<>(tags);
+                return env.osm.getReferrers().stream().map(parent -> parent.get(key))
+                        .filter(Objects::nonNull)
+                        .distinct()
+                        .sorted(AlphanumComparator.getInstance())
+                        .collect(StreamUtils.toUnmodifiableList());
             }
             return Collections.emptyList();

trunk/src/org/openstreetmap/josm/gui/widgets/MultiSplitLayout.java

@@ -819 +819 @@
                 }
             }
-            return dividers;
+            return Collections.unmodifiableList(dividers);
         } else
             return Collections.emptyList();

trunk/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java

@@ -182 +182 @@
                 monitor.worked(1);
             }
-            return ret;
+            return Collections.unmodifiableList(ret);
         } catch (OsmTransferException e) {
             throw e;

trunk/src/org/openstreetmap/josm/tools/WinRegistry.java

@@ -202 +202 @@
         }
         regCloseKey.invoke(root, getNumber(handles, 0));
-        return results;
+        return Collections.unmodifiableMap(results);
     }
 
@@ -226 +226 @@
         }
         regCloseKey.invoke(root, getNumber(handles, 0));
-        return results;
+        return Collections.unmodifiableList(results);
     }