Changeset 17830 in josm for trunk/src/org/openstreetmap

Timestamp:

2021-04-26T22:11:51+02:00 (4 years ago)

Author:

simon04

Message:

Use ICache.NAME_COMPONENT_DELIMITER for clarity

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/imagery/TMSCachedTileLoader.java (modified) (2 diffs)
• data/imagery/TMSCachedTileLoaderJob.java (modified) (2 diffs)
• gui/layer/geoimage/ThumbsLoader.java (modified) (2 diffs)
• gui/preferences/imagery/CacheSettingsPanel.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/imagery/TMSCachedTileLoader.java

@@ -6 +6 @@
 
 import org.apache.commons.jcs3.access.behavior.ICacheAccess;
+import org.apache.commons.jcs3.engine.behavior.ICache;
 import org.openstreetmap.gui.jmapviewer.Tile;
 import org.openstreetmap.gui.jmapviewer.interfaces.CachedTileLoader;
@@ -111 +112 @@
     @Override
     public void clearCache(TileSource source) {
-        this.cache.remove(source.getName() + ':');
+        this.cache.remove(source.getName() + ICache.NAME_COMPONENT_DELIMITER);
     }
 

trunk/src/org/openstreetmap/josm/data/imagery/TMSCachedTileLoaderJob.java

@@ -23 +23 @@
 
 import org.apache.commons.jcs3.access.behavior.ICacheAccess;
+import org.apache.commons.jcs3.engine.behavior.ICache;
 import org.openstreetmap.gui.jmapviewer.Tile;
 import org.openstreetmap.gui.jmapviewer.interfaces.TileJob;
@@ -84 +85 @@
         if (tile != null) {
             TileSource tileSource = tile.getTileSource();
-            return Optional.ofNullable(tileSource.getName()).orElse("").replace(':', '_') + ':'
+            return Optional.ofNullable(tileSource.getName()).orElse("").replace(ICache.NAME_COMPONENT_DELIMITER, "_")
+                    + ICache.NAME_COMPONENT_DELIMITER
                     + tileSource.getTileId(tile.getZoom(), tile.getXtile(), tile.getYtile());
         }

trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ThumbsLoader.java

@@ -16 +16 @@
 
 import org.apache.commons.jcs3.access.behavior.ICacheAccess;
+import org.apache.commons.jcs3.engine.behavior.ICache;
 import org.openstreetmap.josm.data.cache.BufferedImageCacheEntry;
 import org.openstreetmap.josm.data.cache.JCSCacheManager;
@@ -94 +95 @@
 
     private BufferedImage loadThumb(ImageEntry entry) {
-        final String cacheIdent = entry.getFile().toString()+':'+maxSize;
+        final String cacheIdent = entry.getFile().toString() + ICache.NAME_COMPONENT_DELIMITER + maxSize;
 
         if (!cacheOff && cache != null) {

trunk/src/org/openstreetmap/josm/gui/preferences/imagery/CacheSettingsPanel.java

@@ -28 +28 @@
 
 import org.apache.commons.jcs3.access.CacheAccess;
+import org.apache.commons.jcs3.engine.behavior.ICache;
 import org.apache.commons.jcs3.engine.stats.behavior.ICacheStats;
 import org.apache.commons.jcs3.engine.stats.behavior.IStatElement;
@@ -156 +157 @@
                         int row = ret.convertRowIndexToModel(ret.getEditingRow());
                         tableModel.setValueAt("0", row, 1);
-                        cache.remove(ret.getValueAt(row, 0).toString() + ':');
+                        cache.remove(ret.getValueAt(row, 0).toString() + ICache.NAME_COMPONENT_DELIMITER);
                     }
                 });