Changeset 19050 in josm for trunk/src/org/openstreetmap/josm/gui/preferences/advanced/MapListEditor.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/preferences/advanced/MapListEditor.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/preferences/advanced/MapListEditor.java

@@ -78 +78 @@
     }
 
-    private class EntryListModel extends AbstractEntryListModel {
+    private final class EntryListModel extends AbstractEntryListModel {
 
         @Override
@@ -92 +92 @@
         @Override
         public void add() {
-            dataKeys.add(new ArrayList<String>());
-            dataValues.add(new ArrayList<String>());
+            dataKeys.add(new ArrayList<>());
+            dataValues.add(new ArrayList<>());
             dataLabels.add("");
             fireIntervalAdded(this, getSize() - 1, getSize() - 1);
@@ -107 +107 @@
     }
 
-    private class MapTableModel extends AbstractTableModel {
+    private final class MapTableModel extends AbstractTableModel {
 
         private List<List<String>> data() {
-            return entryIdx == null ? Collections.<List<String>>emptyList() : Arrays.asList(dataKeys.get(entryIdx), dataValues.get(entryIdx));
+            return entryIdx == null ? Collections.emptyList() : Arrays.asList(dataKeys.get(entryIdx), dataValues.get(entryIdx));
         }