Changeset 16398 in josm for trunk/src/org
- Timestamp:
- 2020-05-10T11:51:42+02:00 (4 years ago)
- Location:
- trunk/src/org/openstreetmap/josm
- Files:
-
- 17 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/data/cache/CacheEntryAttributes.java
r14271 r16398 11 11 import java.util.concurrent.ConcurrentHashMap; 12 12 13 import org.apache.commons.jcs .engine.ElementAttributes;13 import org.apache.commons.jcs3.engine.ElementAttributes; 14 14 import org.openstreetmap.josm.tools.Logging; 15 15 -
trunk/src/org/openstreetmap/josm/data/cache/JCSCacheManager.java
r16392 r16398 15 15 import java.util.logging.SimpleFormatter; 16 16 17 import org.apache.commons.jcs .JCS;18 import org.apache.commons.jcs .access.CacheAccess;19 import org.apache.commons.jcs .auxiliary.AuxiliaryCache;20 import org.apache.commons.jcs .auxiliary.AuxiliaryCacheFactory;21 import org.apache.commons.jcs .auxiliary.disk.behavior.IDiskCacheAttributes;22 import org.apache.commons.jcs .auxiliary.disk.block.BlockDiskCacheAttributes;23 import org.apache.commons.jcs .auxiliary.disk.block.BlockDiskCacheFactory;24 import org.apache.commons.jcs .auxiliary.disk.indexed.IndexedDiskCacheAttributes;25 import org.apache.commons.jcs .auxiliary.disk.indexed.IndexedDiskCacheFactory;26 import org.apache.commons.jcs .engine.CompositeCacheAttributes;27 import org.apache.commons.jcs .engine.behavior.ICompositeCacheAttributes.DiskUsagePattern;28 import org.apache.commons.jcs .engine.control.CompositeCache;29 import org.apache.commons.jcs .utils.serialization.StandardSerializer;17 import org.apache.commons.jcs3.JCS; 18 import org.apache.commons.jcs3.access.CacheAccess; 19 import org.apache.commons.jcs3.auxiliary.AuxiliaryCache; 20 import org.apache.commons.jcs3.auxiliary.AuxiliaryCacheFactory; 21 import org.apache.commons.jcs3.auxiliary.disk.behavior.IDiskCacheAttributes; 22 import org.apache.commons.jcs3.auxiliary.disk.block.BlockDiskCacheAttributes; 23 import org.apache.commons.jcs3.auxiliary.disk.block.BlockDiskCacheFactory; 24 import org.apache.commons.jcs3.auxiliary.disk.indexed.IndexedDiskCacheAttributes; 25 import org.apache.commons.jcs3.auxiliary.disk.indexed.IndexedDiskCacheFactory; 26 import org.apache.commons.jcs3.engine.CompositeCacheAttributes; 27 import org.apache.commons.jcs3.engine.behavior.ICompositeCacheAttributes.DiskUsagePattern; 28 import org.apache.commons.jcs3.engine.control.CompositeCache; 29 import org.apache.commons.jcs3.utils.serialization.StandardSerializer; 30 30 import org.openstreetmap.josm.data.preferences.BooleanProperty; 31 31 import org.openstreetmap.josm.data.preferences.IntegerProperty; … … 60 60 // raising logging level gives ~500x performance gain 61 61 // http://westsworld.dk/blog/2008/01/jcs-and-performance/ 62 jcsLog = Logger.getLogger("org.apache.commons.jcs ");62 jcsLog = Logger.getLogger("org.apache.commons.jcs3"); 63 63 try { 64 64 jcsLog.setLevel(Level.INFO); -
trunk/src/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJob.java
r15740 r16398 17 17 import java.util.regex.Matcher; 18 18 19 import org.apache.commons.jcs .access.behavior.ICacheAccess;20 import org.apache.commons.jcs .engine.behavior.ICacheElement;19 import org.apache.commons.jcs3.access.behavior.ICacheAccess; 20 import org.apache.commons.jcs3.engine.behavior.ICacheElement; 21 21 import org.openstreetmap.josm.data.cache.ICachedLoaderListener.LoadResult; 22 22 import org.openstreetmap.josm.data.imagery.TileJobOptions; -
trunk/src/org/openstreetmap/josm/data/gpx/GpxExtensionCollection.java
r15560 r16398 10 10 import java.util.stream.Stream; 11 11 12 import org.apache.commons.jcs .access.exception.InvalidArgumentException;12 import org.apache.commons.jcs3.access.exception.InvalidArgumentException; 13 13 import org.openstreetmap.josm.io.GpxReader; 14 14 import org.xml.sax.Attributes; -
trunk/src/org/openstreetmap/josm/data/imagery/CachedTileLoaderFactory.java
r13733 r16398 8 8 import java.util.concurrent.TimeUnit; 9 9 10 import org.apache.commons.jcs .access.behavior.ICacheAccess;10 import org.apache.commons.jcs3.access.behavior.ICacheAccess; 11 11 import org.openstreetmap.gui.jmapviewer.interfaces.TileLoader; 12 12 import org.openstreetmap.gui.jmapviewer.interfaces.TileLoaderListener; -
trunk/src/org/openstreetmap/josm/data/imagery/TMSCachedTileLoader.java
r14624 r16398 5 5 import java.util.concurrent.TimeUnit; 6 6 7 import org.apache.commons.jcs .access.behavior.ICacheAccess;7 import org.apache.commons.jcs3.access.behavior.ICacheAccess; 8 8 import org.openstreetmap.gui.jmapviewer.Tile; 9 9 import org.openstreetmap.gui.jmapviewer.interfaces.CachedTileLoader; -
trunk/src/org/openstreetmap/josm/data/imagery/TMSCachedTileLoaderJob.java
r15525 r16398 22 22 import java.util.regex.Pattern; 23 23 24 import org.apache.commons.jcs .access.behavior.ICacheAccess;24 import org.apache.commons.jcs3.access.behavior.ICacheAccess; 25 25 import org.openstreetmap.gui.jmapviewer.Tile; 26 26 import org.openstreetmap.gui.jmapviewer.interfaces.TileJob; -
trunk/src/org/openstreetmap/josm/data/imagery/WMSCachedTileLoader.java
r14262 r16398 2 2 package org.openstreetmap.josm.data.imagery; 3 3 4 import org.apache.commons.jcs .access.behavior.ICacheAccess;4 import org.apache.commons.jcs3.access.behavior.ICacheAccess; 5 5 import org.openstreetmap.gui.jmapviewer.Tile; 6 6 import org.openstreetmap.gui.jmapviewer.interfaces.TileJob; -
trunk/src/org/openstreetmap/josm/data/imagery/WMSCachedTileLoaderJob.java
r13733 r16398 4 4 import java.util.concurrent.ThreadPoolExecutor; 5 5 6 import org.apache.commons.jcs .access.behavior.ICacheAccess;6 import org.apache.commons.jcs3.access.behavior.ICacheAccess; 7 7 import org.openstreetmap.gui.jmapviewer.Tile; 8 8 import org.openstreetmap.gui.jmapviewer.interfaces.TileLoaderListener; -
trunk/src/org/openstreetmap/josm/gui/layer/AbstractCachedTileSourceLayer.java
r16396 r16398 5 5 import java.util.concurrent.ConcurrentHashMap; 6 6 7 import org.apache.commons.jcs .access.CacheAccess;8 import org.apache.commons.jcs .access.behavior.ICacheAccess;7 import org.apache.commons.jcs3.access.CacheAccess; 8 import org.apache.commons.jcs3.access.behavior.ICacheAccess; 9 9 import org.openstreetmap.gui.jmapviewer.interfaces.TileLoader; 10 10 import org.openstreetmap.gui.jmapviewer.tilesources.AbstractTMSTileSource; -
trunk/src/org/openstreetmap/josm/gui/layer/TMSLayer.java
r15456 r16398 6 6 import java.util.Collections; 7 7 8 import org.apache.commons.jcs .access.CacheAccess;8 import org.apache.commons.jcs3.access.CacheAccess; 9 9 import org.openstreetmap.gui.jmapviewer.JMapViewer; 10 10 import org.openstreetmap.gui.jmapviewer.OsmMercator; -
trunk/src/org/openstreetmap/josm/gui/layer/WMSLayer.java
r15716 r16398 14 14 import javax.swing.Action; 15 15 16 import org.apache.commons.jcs .access.CacheAccess;16 import org.apache.commons.jcs3.access.CacheAccess; 17 17 import org.openstreetmap.gui.jmapviewer.interfaces.TileLoader; 18 18 import org.openstreetmap.josm.data.cache.BufferedImageCacheEntry; -
trunk/src/org/openstreetmap/josm/gui/layer/WMTSLayer.java
r14120 r16398 5 5 import java.util.Collection; 6 6 7 import org.apache.commons.jcs .access.CacheAccess;7 import org.apache.commons.jcs3.access.CacheAccess; 8 8 import org.openstreetmap.gui.jmapviewer.interfaces.TileLoader; 9 9 import org.openstreetmap.josm.data.cache.BufferedImageCacheEntry; -
trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ThumbsLoader.java
r14590 r16398 17 17 import javax.imageio.ImageIO; 18 18 19 import org.apache.commons.jcs .access.behavior.ICacheAccess;19 import org.apache.commons.jcs3.access.behavior.ICacheAccess; 20 20 import org.openstreetmap.josm.data.cache.BufferedImageCacheEntry; 21 21 import org.openstreetmap.josm.data.cache.JCSCacheManager; -
trunk/src/org/openstreetmap/josm/gui/layer/gpx/ChooseTrackVisibilityAction.java
r15735 r16398 38 38 import javax.swing.table.TableRowSorter; 39 39 40 import org.apache.commons.jcs .access.exception.InvalidArgumentException;40 import org.apache.commons.jcs3.access.exception.InvalidArgumentException; 41 41 import org.openstreetmap.josm.data.SystemOfMeasurement; 42 42 import org.openstreetmap.josm.data.gpx.GpxConstants; -
trunk/src/org/openstreetmap/josm/gui/preferences/display/GPXSettingsPanel.java
r15606 r16398 27 27 import javax.swing.JSlider; 28 28 29 import org.apache.commons.jcs .access.exception.InvalidArgumentException;29 import org.apache.commons.jcs3.access.exception.InvalidArgumentException; 30 30 import org.openstreetmap.josm.actions.ExpertToggleAction; 31 31 import org.openstreetmap.josm.data.gpx.GpxData; -
trunk/src/org/openstreetmap/josm/gui/preferences/imagery/CacheSettingsPanel.java
r14731 r16398 27 27 import javax.swing.table.TableModel; 28 28 29 import org.apache.commons.jcs .access.CacheAccess;30 import org.apache.commons.jcs .engine.stats.behavior.ICacheStats;31 import org.apache.commons.jcs .engine.stats.behavior.IStatElement;32 import org.apache.commons.jcs .engine.stats.behavior.IStats;29 import org.apache.commons.jcs3.access.CacheAccess; 30 import org.apache.commons.jcs3.engine.stats.behavior.ICacheStats; 31 import org.apache.commons.jcs3.engine.stats.behavior.IStatElement; 32 import org.apache.commons.jcs3.engine.stats.behavior.IStats; 33 33 import org.openstreetmap.josm.data.cache.BufferedImageCacheEntry; 34 34 import org.openstreetmap.josm.data.cache.JCSCacheManager;
Note:
See TracChangeset
for help on using the changeset viewer.