Index: /trunk/scripts/TagInfoExtract.java
===================================================================
--- /trunk/scripts/TagInfoExtract.java	(revision 19180)
+++ /trunk/scripts/TagInfoExtract.java	(revision 19181)
@@ -20,5 +20,4 @@
 import java.util.Collections;
 import java.util.EnumSet;
-import java.util.HashSet;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -616,5 +615,5 @@
 
             static Set<TagInfoTag.Type> forPresetTypes(Set<TaggingPresetType> types) {
-                return types == null ? new HashSet<>() : types.stream()
+                return types == null ? new EnumSet<>() : types.stream()
                         .map(Type::forPresetType)
                         .collect(Collectors.toCollection(() -> EnumSet.noneOf(Type.class)));
Index: /trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/TileZXY.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/TileZXY.java	(revision 19180)
+++ /trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/TileZXY.java	(revision 19181)
@@ -41,4 +41,5 @@
      * @return The x coordinate for this tile
      */
+    @SuppressWarnings("PMD.ShortMethodName")
     public int x() {
         return this.x;
@@ -49,4 +50,5 @@
      * @return The y coordinate for this tile
      */
+    @SuppressWarnings("PMD.ShortMethodName")
     public int y() {
         return this.y;