Ticket #21645: extract_common.patch

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

@@ -53 +53 @@
     }
 
     /**
-     * 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.
      */
@@ -157 +157 @@
     }
 
     /**
-     * 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
      * @param angle the angle of the rotation

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

@@ -41 +41 @@
 
         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);
         }
     }
 

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

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

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

@@ -346 +346 @@
                 char ch = s.charAt(i);
                 if (ch == '\\' || ch == '(' || ch == '{' || ch == ',' || ch == ')' || ch == '}' || ch == '=') {
                     result.append('\\');
-                    result.append(ch);
-                } else {
-                    result.append(ch);
-                }
+                }
+                result.append(ch);
             }
         }
 

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

@@ -217 +217 @@
                     // pop last id on end of object, don't process further
                     lastIds.pop();
                     ((Chunk) o).id = null;
-                    continue;
                 } else {
                     // if preset item contains an id, store a mapping for later usage
                     String lastId = ((Chunk) o).id;
                     lastIds.push(lastId);
                     byId.put(lastId, new ArrayList<>());
-                    continue;
-                }
+                }
+                continue;
             } else if (!lastIds.isEmpty()) {
                 // add object to mapping for later usage
                 byId.get(lastIds.peek()).add(o);