Changeset 8424 in josm
- Timestamp:
- 2015-05-24T22:48:58+02:00 (9 years ago)
- Location:
- trunk/src/org/openstreetmap/josm
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/data/cache/ICachedLoaderJob.java
r8168 r8424 6 6 7 7 /** 8 * 8 * 9 9 * @author Wiktor Niesiobędzki 10 10 * … … 14 14 /** 15 15 * returns cache entry key 16 * 16 * 17 17 * @param tile 18 18 * @return cache key for tile … … 23 23 * method to get download URL for Job 24 24 * @return URL that should be fetched 25 * 25 * 26 26 */ 27 27 public URL getUrl(); … … 33 33 /** 34 34 * fetches object from cache, or returns null when object is not found 35 * 35 * 36 36 * @return filled tile with data or null when no cache entry found 37 37 */ … … 41 41 * Submit job for background fetch, and listener will be 42 42 * fed with value object 43 * 43 * 44 44 * @param listener 45 * @param force true if the load should skip all the caches (local & remote) 45 46 */ 46 public void submit(ICachedLoaderListener listener );47 public void submit(ICachedLoaderListener listener, boolean force); 47 48 } -
trunk/src/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJob.java
r8413 r8424 109 109 private ThreadPoolExecutor downloadJobExecutor; 110 110 private Runnable finishTask; 111 private boolean force = false; 111 112 112 113 /** … … 159 160 160 161 @Override 161 public void submit(ICachedLoaderListener listener) { 162 public void submit(ICachedLoaderListener listener, boolean force) { 163 this.force = force; 162 164 boolean first = false; 163 165 URL url = getUrl(); … … 181 183 } 182 184 183 if (first ) {185 if (first || force) { 184 186 ensureCacheElement(); 185 if ( cacheElement != null && isCacheElementValid() && (isObjectLoadable())) {187 if (!force && cacheElement != null && isCacheElementValid() && (isObjectLoadable())) { 186 188 // we got something in cache, and it's valid, so lets return it 187 189 log.log(Level.FINE, "JCS - Returning object from cache: {0}", getCacheKey()); … … 234 236 } 235 237 238 @Override 236 239 public void run() { 237 240 final Thread currentThread = Thread.currentThread(); … … 429 432 urlConn.setRequestProperty(e.getKey(), e.getValue()); 430 433 } 434 if (force) { 435 urlConn.setUseCaches(false); 436 } 431 437 return urlConn; 432 438 } -
trunk/src/org/openstreetmap/josm/data/imagery/TMSCachedTileLoaderJob.java
r8418 r8424 154 154 } 155 155 156 public void submit() { 156 @Override 157 public void submit(boolean force) { 157 158 tile.initLoading(); 158 super.submit(this );159 super.submit(this, force); 159 160 } 160 161 … … 282 283 return new BufferedImageCacheEntry(content); 283 284 } 285 286 @Override 287 public void submit() { 288 submit(false); 289 } 284 290 } -
trunk/src/org/openstreetmap/josm/gui/layer/TMSLayer.java
r8418 r8424 602 602 if (clickedTile != null) { 603 603 clickedTile.setLoaded(false); 604 tileLoader.createTileLoaderJob(clickedTile).submit( );604 tileLoader.createTileLoaderJob(clickedTile).submit(true); 605 605 } 606 606 } … … 847 847 if (tile.isLoading()) 848 848 return false; 849 tileLoader.createTileLoaderJob(tile).submit( );849 tileLoader.createTileLoaderJob(tile).submit(force); 850 850 return true; 851 851 } … … 1259 1259 List<Tile> allTiles = allTilesCreate(); 1260 1260 Collections.sort(allTiles, getTileDistanceComparator()); 1261 for (Tile t : allTiles) { //, getTileDistanceComparator())) {1262 loadTile(t, f alse);1261 for (Tile t : allTiles) { 1262 loadTile(t, force); 1263 1263 } 1264 1264 }
Note:
See TracChangeset
for help on using the changeset viewer.