Changeset 36102 in osm for applications/editors/josm/plugins/reltoolbox/src/relcontext/relationfix

Timestamp:

2023-07-24T15:55:23+02:00 (21 months ago)

Author:

taylor.smock

Message:

reltoolbox: Clean up a bunch of lint warnings

Location:

applications/editors/josm/plugins/reltoolbox/src/relcontext/relationfix

Files:

• AssociatedStreetFixer.java (modified) (1 diff)
• BoundaryFixer.java (modified) (2 diffs)
• MultipolygonFixer.java (modified) (2 diffs)
• PublicTransportFixer.java (modified) (1 diff)
• RelationFixer.java (modified) (1 diff)

applications/editors/josm/plugins/reltoolbox/src/relcontext/relationfix/AssociatedStreetFixer.java

@@ -155 +155 @@
          */
         // return results
-        if (commandList.size() == 0)
+        if (commandList.isEmpty()) {
             return null;
-        if (commandList.size() == 1)
-            return commandList.get(0);
-        return new SequenceCommand(tr("fix associatedStreet relation"), commandList);
+        }
+        return SequenceCommand.wrapIfNeeded(tr("fix associatedStreet relation"), commandList);
     }
 }

applications/editors/josm/plugins/reltoolbox/src/relcontext/relationfix/BoundaryFixer.java

@@ -12 +12 @@
 import org.openstreetmap.josm.gui.MainApplication;
 
-
 /**
- * @see https://wiki.openstreetmap.org/wiki/Relation:boundary
+ * Fix multipolygon boundaries
+ * @see <a href="https://wiki.openstreetmap.org/wiki/Relation:boundary">osmwiki:Relation:boundary</a>
  */
 public class BoundaryFixer extends MultipolygonFixer {
@@ -25 +25 @@
      * For boundary relations both "boundary" and "multipolygon" types are applicable, but
      * it should also have key boundary=administrative to be fully boundary.
-     * @see https://wiki.openstreetmap.org/wiki/Relation:boundary
+     * @see <a href="https://wiki.openstreetmap.org/wiki/Relation:boundary">osmwiki:Relation:boundary</a>
      */
     @Override

applications/editors/josm/plugins/reltoolbox/src/relcontext/relationfix/MultipolygonFixer.java

@@ -20 +20 @@
 
 /**
- * @see https://wiki.openstreetmap.org/wiki/Relation:multipolygon
+ * @see <a href="https://wiki.openstreetmap.org/wiki/Relation:multipolygon">osmwiki:Relation:multipolygon</a>
  */
 public class MultipolygonFixer extends RelationFixer {
@@ -69 +69 @@
         Set<Way> outerWays = new HashSet<>();
         for (MultipolygonBuilder.JoinedPolygon poly : mpc.outerWays) {
-            for (Way w : poly.ways) {
-                outerWays.add(w);
-            }
+            outerWays.addAll(poly.ways);
         }
         Set<Way> innerWays = new HashSet<>();
         for (MultipolygonBuilder.JoinedPolygon poly : mpc.innerWays) {
-            for (Way w : poly.ways) {
-                innerWays.add(w);
-            }
+            innerWays.addAll(poly.ways);
         }
         for (int i = 0; i < r.getMembersCount(); i++) {
             RelationMember m = r.getMember(i);
             if (m.isWay()) {
+                final Way way = m.getWay();
                 String role = null;
-                if (outerWays.contains(m.getMember())) {
+                if (outerWays.contains(way)) {
                     role = "outer";
-                } else if (innerWays.contains(m.getMember())) {
+                } else if (innerWays.contains(way)) {
                     role = "inner";
                 }
                 if (role != null && !role.equals(m.getRole())) {
-                    r.setMember(i, new RelationMember(role, m.getMember()));
+                    r.setMember(i, new RelationMember(role, way));
                     fixed = true;
                 }

applications/editors/josm/plugins/reltoolbox/src/relcontext/relationfix/PublicTransportFixer.java

@@ -14 +14 @@
 
 /**
- * @see https://wiki.openstreetmap.org/wiki/Key:public_transport
- */
-
-/**
  * Helper function for determinate role in public_transport relation
  * @author freeExec
+ * @see <a href="https://wiki.openstreetmap.org/wiki/Key:public_transport">osmwiki:Key:public_transport</a>
  */
 public class PublicTransportFixer extends RelationFixer {

applications/editors/josm/plugins/reltoolbox/src/relcontext/relationfix/RelationFixer.java

@@ -17 +17 @@
 public abstract class RelationFixer {
 
-    private List<String> applicableTypes;
+    private final List<String> applicableTypes;
     private SortAndFixAction sortAndFixAction;