Changeset 16215 in josm for trunk

Timestamp:

2020-03-28T23:49:55+01:00 (4 years ago)

Author:

Don-vip

Message:

fix compilation error

Location:

trunk

Files:

• src/org/openstreetmap/josm/tools/Territories.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/tools/TerritoriesTestIT.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/tools/Territories.java

@@ -57 +57 @@
     private static DataSet dataSet;
 
-    private static volatile Map<String, GeoPropertyIndex<Boolean>> iso3166Cache;
-    private static volatile Map<String, TaginfoRegionalInstance> taginfoCache;
-    private static volatile Map<String, TaginfoRegionalInstance> taginfoGeofabrikCache;
-    private static volatile Map<String, TagMap> customTagsCache;
+    static volatile Map<String, GeoPropertyIndex<Boolean>> iso3166Cache;
+    static volatile Map<String, TaginfoRegionalInstance> taginfoCache;
+    static volatile Map<String, TaginfoRegionalInstance> taginfoGeofabrikCache;
+    static volatile Map<String, TagMap> customTagsCache;
 
     private static final List<String> KNOWN_KEYS = Arrays.asList(ISO3166_1, ISO3166_2, TAGINFO, "type", "name:en", "driving_side", "note");

trunk/test/unit/org/openstreetmap/josm/tools/TerritoriesTestIT.java

@@ -14 +14 @@
 
 /**
- * Unit tests of {@link Territories} class.
+ * Integration tests of {@link Territories} class.
  */
 public class TerritoriesTestIT {
@@ -34 +34 @@
         Territories.initialize();
         assertEquals("no errors or warnings", Collections.emptyList(), Logging.getLastErrorAndWarnings());
+        assertFalse("customTagsCache is non empty", Territories.customTagsCache.isEmpty());
+        assertFalse("iso3166Cache is non empty", Territories.iso3166Cache.isEmpty());
         assertFalse("taginfoCache is non empty", Territories.taginfoCache.isEmpty());
         assertFalse("taginfoGeofabrikCache is non empty", Territories.taginfoGeofabrikCache.isEmpty());