Changeset 18950 in josm for trunk/src

Timestamp:

2024-01-22T22:31:23+01:00 (10 months ago)

Author:

taylor.smock

Message:

ValidatorCLI: Fix an NPE when run prior to any call to Territories.initialize

There is currently no good way to see if the Territories data is initialized.
This does mean that tests will take a little bit longer.

File:

• trunk/src/org/openstreetmap/josm/data/validation/ValidatorCLI.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/data/validation/ValidatorCLI.java

@@ -27 +27 @@
 import java.util.stream.Collectors;
 
-import jakarta.json.JsonObject;
 import org.apache.commons.compress.utils.FileNameUtils;
 import org.openstreetmap.josm.actions.ExtensionFileFilter;
@@ -65 +64 @@
 import org.openstreetmap.josm.tools.Utils;
 
+import jakarta.json.JsonObject;
+
 /**
  * Add a validate command to the JOSM command line interface.
@@ -356 +357 @@
         ProjectionRegistry.setProjection(Projections.getProjectionByCode("epsg:3857".toUpperCase(Locale.ROOT)));
 
-        if (Territories.getKnownIso3166Codes().isEmpty()) {
-            Territories.initializeInternalData();
-        }
+        Territories.initializeInternalData(); // There is no current way to check to see if territories is already initialized
         OsmValidator.initialize();
         MapPaintStyles.readFromPreferences();