Changeset 36102 in osm for applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/ReconstructPolygonAction.java

Timestamp:

2023-07-24T15:55:23+02:00 (2 years ago)

Author:

taylor.smock

Message:

reltoolbox: Clean up a bunch of lint warnings

File:

• applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/ReconstructPolygonAction.java (modified) (6 diffs)

applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/ReconstructPolygonAction.java

@@ -10 +10 @@
 import java.util.Collections;
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -44 +43 @@
  */
 public class ReconstructPolygonAction extends JosmAction implements ChosenRelationListener {
-    private ChosenRelation rel;
-
-    private static final List<String> IRRELEVANT_KEYS = Arrays.asList(new String[] {
-            "source", "created_by", "note"});
+    private final ChosenRelation rel;
+
+    private static final List<String> IRRELEVANT_KEYS = Arrays.asList("source", "created_by", "note");
 
     public ReconstructPolygonAction(ChosenRelation rel) {
@@ -109 +107 @@
                 // this ring has inner rings, so we leave a multipolygon in
                 // place and don't reconstruct the rings.
-                Relation n = null;
+                Relation n;
                 if (relationReused) {
                     n = new Relation();
@@ -153 +151 @@
                 }
                 List<OsmPrimitive> referrers = w.getReferrers();
-                for (Iterator<OsmPrimitive> ref1 = relations.iterator(); ref1.hasNext();) {
-                    if (!referrers.contains(ref1.next())) {
-                        ref1.remove();
-                    }
-                }
+                relations.removeIf(osmPrimitive -> !referrers.contains(osmPrimitive));
             }
             tags.putAll(r.getKeys());
@@ -169 +163 @@
                     Set<String> keys = new HashSet<>(w.keySet());
                     keys.removeAll(tags.keySet());
-                    keys.removeAll(IRRELEVANT_KEYS);
+                    IRRELEVANT_KEYS.forEach(keys::remove);
                     if (keys.isEmpty()) {
                         if (candidateWay == null) {
@@ -211 +205 @@
 
     private boolean isSuitableRelation(Relation newRelation) {
-        if (newRelation == null || !"multipolygon".equals(newRelation.get("type")) || newRelation.getMembersCount() == 0)
-            return false;
-        else
-            return true;
+        return newRelation != null && "multipolygon".equals(newRelation.get("type")) && newRelation.getMembersCount() != 0;
     }
 }