Changeset 19050 in josm for trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverModel.java

Timestamp:

2024-04-22T20:59:26+02:00 (4 weeks ago)

Author:

taylor.smock

Message:

Revert most var changes from r19048, fix most new compile warnings and checkstyle issues

Also, document why various ErrorProne checks were originally disabled and fix
generic SonarLint issues.

File:

• trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverModel.java (modified) (8 diffs)

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

@@ -106 +106 @@
 
         RelationMemberConflictDecision d = decisions.get(row);
-        switch(column) {
+        switch (column) {
         case 0: /* relation */ return d.getRelation();
         case 1: /* pos */ return Integer.toString(d.getPos() + 1); // position in "user space" starting at 1
         case 2: /* role */ return d.getRole();
         case 3: /* original */ return d.getOriginalPrimitive();
-        case 4: /* decision keep */ return RelationMemberConflictDecisionType.KEEP.equals(d.getDecision());
-        case 5: /* decision remove */ return RelationMemberConflictDecisionType.REMOVE.equals(d.getDecision());
+        case 4: /* decision keep */ return RelationMemberConflictDecisionType.KEEP == d.getDecision();
+        case 5: /* decision remove */ return RelationMemberConflictDecisionType.REMOVE == d.getDecision();
         }
         return null;
@@ -120 +120 @@
     public void setValueAt(Object value, int row, int column) {
         RelationMemberConflictDecision d = decisions.get(row);
-        switch(column) {
+        switch (column) {
         case 2: /* role */
             d.setRole((String) value);
@@ -200 +200 @@
         decisions.clear();
         this.relations = new HashSet<>(references.size());
-        final Collection<OsmPrimitive> primitives = new HashSet<>();
+        final Collection<OsmPrimitive> newPrimitives = new HashSet<>();
         for (RelationToChildReference reference: references) {
             decisions.add(new RelationMemberConflictDecision(reference.getParent(), reference.getPosition()));
             relations.add(reference.getParent());
-            primitives.add(reference.getChild());
-        }
-        this.primitives = primitives;
+            newPrimitives.add(reference.getChild());
+        }
+        this.primitives = newPrimitives;
         refresh();
     }
@@ -249 +249 @@
                     final OsmPrimitive primitive = decision.getOriginalPrimitive();
                     if (!decisionsByPrimitive.containsKey(primitive)) {
-                        decisionsByPrimitive.put(primitive, new ArrayList<RelationMemberConflictDecision>());
+                        decisionsByPrimitive.put(primitive, new ArrayList<>());
                     }
                     decisionsByPrimitive.get(primitive).add(decision);
@@ -263 +263 @@
                         .collect(Collectors.toList());
                 while (iterators.stream().allMatch(Iterator::hasNext)) {
-                    final List<RelationMemberConflictDecision> decisions = new ArrayList<>();
+                    final List<RelationMemberConflictDecision> conflictDecisions = new ArrayList<>();
                     final Collection<String> roles = new HashSet<>();
                     final Collection<Integer> indices = new TreeSet<>();
                     for (Iterator<RelationMemberConflictDecision> it : iterators) {
                         final RelationMemberConflictDecision decision = it.next();
-                        decisions.add(decision);
+                        conflictDecisions.add(decision);
                         roles.add(decision.getRole());
                         indices.add(decision.getPos());
@@ -276 +276 @@
                         continue;
                     }
-                    decisions.get(0).decide(RelationMemberConflictDecisionType.KEEP);
-                    for (RelationMemberConflictDecision decision : decisions.subList(1, decisions.size())) {
+                    conflictDecisions.get(0).decide(RelationMemberConflictDecisionType.KEEP);
+                    for (RelationMemberConflictDecision decision : conflictDecisions.subList(1, conflictDecisions.size())) {
                         decision.decide(RelationMemberConflictDecisionType.REMOVE);
                     }
@@ -372 +372 @@
                 modifiedMemberList.add(member);
             } else {
-                switch(decision.getDecision()) {
+                switch (decision.getDecision()) {
                 case KEEP:
                     final RelationMember newMember = new RelationMember(decision.getRole(), newPrimitive);
@@ -410 +410 @@
                 continue;
             }
-            switch(decision.getDecision()) {
+            switch (decision.getDecision()) {
             case REMOVE: return true;
             case KEEP: