Changeset 19050 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/LabelCompositionStrategy.java

Timestamp:

2024-04-22T20:59:26+02:00 (6 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/mappaint/styleelement/LabelCompositionStrategy.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/LabelCompositionStrategy.java

@@ -167 +167 @@
         /* Is joining an array really that complicated in Java? */
         private static String[] getDefaultNameTags() {
-            final var tags = new ArrayList<String>(Arrays.asList(LanguageInfo.getOSMLocaleCodes("name:")));
+            final var tags = new ArrayList<>(Arrays.asList(LanguageInfo.getOSMLocaleCodes("name:")));
             tags.addAll(Arrays.asList("name",
                     "int_name",
@@ -249 +249 @@
 
         private String getPrimitiveName(IPrimitive n) {
-            final var name = new StringBuilder();
+            StringBuilder name = new StringBuilder();
             if (!n.hasKeys()) return null;
             nameTags.stream().map(n::get).filter(Objects::nonNull).findFirst()