Changeset 18342 in josm for trunk

Timestamp:

2021-12-20T17:13:38+01:00 (3 years ago)

Author:

Don-vip

Message:

fix #21645 - code cleanup (patch by gaben)

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/coor/EastNorth.java (modified) (2 diffs)
• gui/datatransfer/data/PrimitiveTagTransferData.java (modified) (1 diff)
• gui/preferences/ToolbarPreferences.java (modified) (1 diff)
• gui/preferences/map/TaggingPresetPreference.java (modified) (1 diff)
• gui/tagging/presets/TaggingPresetReader.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/coor/EastNorth.java

@@ -54 +54 @@
 
     /**
-     * Adds the coordinates of an other EastNorth instance to this one.
+     * Adds the coordinates of another EastNorth instance to this one.
      * @param other The other instance.
      * @return The new EastNorth position.
@@ -158 +158 @@
 
     /**
-     * Returns an EastNorth representing the this EastNorth rotated around
+     * Returns an EastNorth representing this EastNorth rotated around
      * a given EastNorth by a given angle
      * @param pivot the center of the rotation

trunk/src/org/openstreetmap/josm/gui/datatransfer/data/PrimitiveTagTransferData.java

@@ -42 +42 @@
         for (PrimitiveData primitive : source) {
             tags.get(primitive.getType()).add(TagCollection.from(primitive));
-            counts.merge(primitive.getType(), 1, (a, b) -> a + b);
+            counts.merge(primitive.getType(), 1, Integer::sum);
         }
     }

trunk/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java

@@ -349 +349 @@
                 if (ch == '\\' || ch == '(' || ch == '{' || ch == ',' || ch == ')' || ch == '}' || ch == '=') {
                     result.append('\\');
-                    result.append(ch);
-                } else {
-                    result.append(ch);
-                }
+                }
+                result.append(ch);
             }
         }

trunk/src/org/openstreetmap/josm/gui/preferences/map/TaggingPresetPreference.java

@@ -131 +131 @@
                     }
                 sources.removeSources(sourcesToRemove);
-                return true;
-            } else {
-                return true;
             }
+            return true;
         }
     }

trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetReader.java

@@ -218 +218 @@
                     lastIds.pop();
                     ((Chunk) o).id = null;
-                    continue;
                 } else {
                     // if preset item contains an id, store a mapping for later usage
@@ -224 +223 @@
                     lastIds.push(lastId);
                     byId.put(lastId, new ArrayList<>());
-                    continue;
-                }
+                }
+                continue;
             } else if (!lastIds.isEmpty()) {
                 // add object to mapping for later usage