Changeset 8176 in josm for trunk/src/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJob.java
- Timestamp:
- 2015-04-07T22:17:42+02:00 (9 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJob.java
r8174 r8176 27 27 import org.apache.commons.jcs.engine.behavior.ICacheElement; 28 28 import org.openstreetmap.gui.jmapviewer.FeatureAdapter; 29 import org.openstreetmap.josm.data.cache.ICachedLoaderListener.LoadResult; 29 30 import org.openstreetmap.josm.data.preferences.IntegerProperty; 30 31 … … 152 153 // we got something in cache, and it's valid, so lets return it 153 154 log.log(Level.FINE, "JCS - Returning object from cache: {0}", getCacheKey()); 154 finishLoading( true);155 finishLoading(LoadResult.SUCCESS); 155 156 return; 156 157 } … … 162 163 // queue was full, try again later 163 164 log.log(Level.FINE, "JCS - rejected job for: {0}", getCacheKey()); 164 finishLoading( false);165 finishLoading(LoadResult.REJECTED); 165 166 } 166 167 } … … 206 207 // try to load object from remote resource 207 208 if (loadObject()) { 208 finishLoading( true);209 finishLoading(LoadResult.SUCCESS); 209 210 } else { 210 211 // if loading failed - check if we can return stale entry 211 212 if (isObjectLoadable()) { 212 213 // try to get stale entry in cache 213 finishLoading( true);214 finishLoading(LoadResult.SUCCESS); 214 215 log.log(Level.FINE, "JCS - found stale object in cache: {0}", getUrl()); 215 216 } else { 216 217 // failed completely 217 finishLoading( false);218 finishLoading(LoadResult.FAILURE); 218 219 } 219 220 } … … 224 225 225 226 226 private void finishLoading( boolean success) {227 private void finishLoading(LoadResult result) { 227 228 Set<ICachedLoaderListener> listeners = null; 228 229 synchronized (inProgress) { … … 235 236 try { 236 237 for (ICachedLoaderListener l: listeners) { 237 l.loadingFinished(cacheData, success);238 l.loadingFinished(cacheData, result); 238 239 } 239 240 } catch (Exception e) { … … 241 242 log.log(Level.FINE, "Stacktrace", e); 242 243 for (ICachedLoaderListener l: listeners) { 243 l.loadingFinished(cacheData, false);244 l.loadingFinished(cacheData, LoadResult.FAILURE); 244 245 } 245 246
Note:
See TracChangeset
for help on using the changeset viewer.