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

Timestamp:

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

Author:

taylor.smock

Message:

reltoolbox: Clean up a bunch of lint warnings

File:

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

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

@@ -37 +37 @@
     private static final String PREF_MULTIPOLY = "reltoolbox.multipolygon.";
 
-    private Way source;
-    private List<RingSegment> segments;
+    private final Way source;
+    private final List<RingSegment> segments;
     private Relation relation = null;
 
@@ -277 +277 @@
 
         // rearrange references
-        for (int i = 0; i < rings.size(); i++) {
-            TheRing ring = rings.get(i);
+        for (TheRing ring : rings) {
             if (ring.countNonReferenceSegments() == 0) {
                 // need to find one non-reference segment
@@ -331 +330 @@
         Way sourceCopy = new Way(source);
         if (createMultipolygon) {
-            Collection<String> linearTags = Config.getPref().getList(PREF_MULTIPOLY + "lineartags", CreateMultipolygonAction.DEFAULT_LINEAR_TAGS);
+            Collection<String> linearTags = Config.getPref().getList(PREF_MULTIPOLY + "lineartags",
+                    CreateMultipolygonAction.DEFAULT_LINEAR_TAGS);
             relation = new Relation();
             relation.put("type", "multipolygon");
@@ -351 +351 @@
         for (OsmPrimitive p : source.getReferrers()) {
             if (p instanceof Relation) {
-                Relation rel = null;
+                Relation rel;
                 if (relationChangeMap != null) {
                     if (relationChangeMap.containsKey(p)) {
@@ -365 +365 @@
                 for (int i = 0; i < rel.getMembersCount(); i++) {
                     if (rel.getMember(i).getMember().equals(source)) {
-                        referencingRelations.put(rel, Integer.valueOf(i));
+                        referencingRelations.put(rel, i);
                     }
                 }