/ - Diff - gvSIG raster - gvSIG

Revision 1799

     import org.gvsig.raster.cache.tile.exception.TileGettingException;
     import org.gvsig.raster.cache.tile.impl.TileCacheImpl;
     import org.gvsig.raster.cache.tile.impl.TileImpl;
     import org.gvsig.raster.cache.tile.impl.memory.LRUTileCache;
     import org.gvsig.raster.cache.tile.impl.pool.ThreadPoolImpl;
     import org.gvsig.raster.cache.tile.layer.TiledLayer;
     import org.gvsig.raster.cache.tile.provider.CacheStruct;
-...
     	public TiledLayerImpl(TileCacheImpl tileCache,
     			TileServer provider,
     			ITileFileSystemStrategy strategy,
     			LRUTileCache memCache) {
     			ITileFileSystemStrategy strategy
     			/*LRUTileCache memCache*/) {
     		this.tileCache = tileCache;
     		this.provider = provider;
     		this.basePath = tileCache.getBaseDirectory();

     import org.gvsig.raster.cache.tile.TileCacheLocator;
     import org.gvsig.raster.cache.tile.disk.ITileFileSystemStrategy;
     import org.gvsig.raster.cache.tile.impl.layer.TiledLayerImpl;
     import org.gvsig.raster.cache.tile.impl.memory.MemoryManager;
     import org.gvsig.raster.cache.tile.layer.TiledLayer;
     import org.gvsig.raster.cache.tile.provider.TileServer;
-...
      */
     public class TileCacheImpl implements TileCache {
     	private ArrayList<TiledLayerImpl>   layerList            = null;
     	private MemoryManager               memoryManager        = null;
     	//private MemoryManager               memoryManager        = null;
     	private String                      baseDir              = null;
     	private double                      currentSize          = 0;
     	protected String                    preffixSizeFileName  = "c_len";
-...
     	public TileCacheImpl(String baseDir) {
     		this.layerList = new ArrayList<TiledLayerImpl>();
     		memoryManager = new MemoryManager();
     		//memoryManager = new MemoryManager();
     		this.baseDir = baseDir;
     		loadSize();
+    	}
-...
     	 */
     	public TiledLayer createLayer(TileServer provider, String strategyType) {
     		ITileFileSystemStrategy strat = ((DefaultTileCacheManager)TileCacheLocator.getManager()).createStrategy(strategyType);
     		TiledLayerImpl l = new TiledLayerImpl(this, provider, strat, memoryManager.createLRUTileCache());
     		TiledLayerImpl l = new TiledLayerImpl(this, provider, strat/*, memoryManager.createLRUTileCache()*/);
     		layerList.add(l);
     		return l;
+    	}

      */
     package org.gvsig.raster.cache.tile.impl.memory;
     import java.util.HashMap;
     import java.util.LinkedList;
     import java.util.logging.Level;
     import java.util.logging.Logger;
     import org.gvsig.raster.cache.buffer.Buffer;
     //import org.gvsig.raster.cache.buffer.Buffer;
     /**
      * A Last Recent Used cache of Bitmaps
-...
      * @author rblanco
+     *
      */
     public class LRUTileCache extends HashMap<String, Buffer> {
     	private static final long        serialVersionUID = 6215141;
     	private final int                maxCacheSize;
     	private LinkedList<String>       list             = null;
     	private final static Logger      log              = Logger.getLogger("LRUTileCache");
     	/**
     	 * The Constructor
     	 * @param maxCacheSize The cache size in number of Bitmaps
     	 */
     	public LRUTileCache(final int maxCacheSize) {
     		super(maxCacheSize);
     		this.maxCacheSize = Math.max(0, maxCacheSize);
     		this.list = new LinkedList<String>();
+    	}
     	/**
     	 * Clears the cache
     	 */
     	public synchronized void clear() {
     		try {
     			/*for (final Buffer b : this.values()) {
     				if (b != null) {
     					b.recycle();
+    				}
     			}*/
     			super.clear();
     			list.clear();
     		} catch (Exception e) {
     			log.log(Level.SEVERE, "clear cache: ", e);
+    		}
+    	}
     	/**
     	 * Adds a Bitmap to the cache. If the cache is full, removes the last
     	 */
     	public synchronized Buffer put(final String key, final Buffer value) {
     		try {
     			if (maxCacheSize == 0) {
     				return null;
+    			}
     			// if the key isn't in the cache and the cache is full...
     			if (!super.containsKey(key) && !list.isEmpty()
     					&& list.size() + 1 > maxCacheSize) {
     				final Object deadKey = list.removeLast();
     				super.remove(deadKey);
     				//if (bitmap != null)
     					//bitmap.recycle();
+    			}
     			updateKey(key);
     		} catch (Exception e) {
     			log.log(Level.SEVERE, "put", e);
+    		}
     		return super.put(key, value);
+    	}
     	/**
     	 * Returns a cached Bitmap given a key
     	 * @param key The key of the Bitmap stored on the HashMap
     	 * @return The Bitmap or null if it is not stored in the cache
     	 */
     	public synchronized Buffer get(final String key) {
     		try {
     			final Buffer value = super.get(key);
     			if (value != null) {
     				updateKey(key);
+    			}
     			return value;
     		} catch (Exception e) {
     			log.log(Level.SEVERE, "get",  e);
     			return null;
+    		}
+    	}
     	/**
     	 * Removes a Bitmap from the cache
     	 * @param key The key of the Bitmap to remove
     	 */
     	public synchronized void remove(final String key) {
     		try {
     			list.remove(key);
     		} catch (Exception e) {
     			log.log(Level.SEVERE, "remove", e);
+    		}
     		super.remove(key);
     		//if (bitmap != null)
     			//bitmap.recycle();
+    	}
     	/**
     	 * The key is touched (recent used) and added to the top of the list
     	 * @param key The key to be updated
     	 */
     	private void updateKey(final String key) {
     		try {
     			list.remove(key);
     			list.addFirst(key);
     		} catch (Exception e) {
     			log.log(Level.SEVERE, "updatekey", e);
+    		}
+    	}
     public class LRUTileCache {
     //	extends HashMap<String, Buffer> {
     //	private static final long        serialVersionUID = 6215141;
     //	private final int                maxCacheSize;
     //	private LinkedList<String>       list             = null;
     //	private final static Logger      log              = Logger.getLogger("LRUTileCache");
     //
     //	/**
     //	 * The Constructor
     //	 * @param maxCacheSize The cache size in number of Bitmaps
     //	 */
     //	public LRUTileCache(final int maxCacheSize) {
     //		super(maxCacheSize);
     //		this.maxCacheSize = Math.max(0, maxCacheSize);
     //		this.list = new LinkedList<String>();
     //	}
     //
     //	/**
     //	 * Clears the cache
     //	 */
     //	public synchronized void clear() {
     //		try {
     //			/*for (final Buffer b : this.values()) {
     //				if (b != null) {
     //					b.recycle();
     //				}
     //			}*/
     //			super.clear();
     //			list.clear();
     //		} catch (Exception e) {
     //			log.log(Level.SEVERE, "clear cache: ", e);
     //		}
     //	}
     //
     //	/**
     //	 * Adds a Bitmap to the cache. If the cache is full, removes the last
     //	 */
     //	public synchronized Buffer put(final String key, final Buffer value) {
     //		try {
     //			if (maxCacheSize == 0) {
     //				return null;
     //			}
     //
     //			// if the key isn't in the cache and the cache is full...
     //			if (!super.containsKey(key) && !list.isEmpty()
     //					&& list.size() + 1 > maxCacheSize) {
     //				final Object deadKey = list.removeLast();
     //				super.remove(deadKey);
     //				//if (bitmap != null)
     //					//bitmap.recycle();
     //			}
     //
     //			updateKey(key);
     //		} catch (Exception e) {
     //			log.log(Level.SEVERE, "put", e);
     //		}
     //		return super.put(key, value);
     //	}
     //
     //	/**
     //	 * Returns a cached Bitmap given a key
     //	 * @param key The key of the Bitmap stored on the HashMap
     //	 * @return The Bitmap or null if it is not stored in the cache
     //	 */
     //	public synchronized Buffer get(final String key) {
     //		try {
     //			final Buffer value = super.get(key);
     //			if (value != null) {
     //				updateKey(key);
     //			}
     //			return value;
     //		} catch (Exception e) {
     //			log.log(Level.SEVERE, "get",  e);
     //			return null;
     //		}
     //	}
     //
     //	/**
     //	 * Removes a Bitmap from the cache
     //	 * @param key The key of the Bitmap to remove
     //	 */
     //	public synchronized void remove(final String key) {
     //		try {
     //			list.remove(key);
     //		} catch (Exception e) {
     //			log.log(Level.SEVERE, "remove", e);
     //		}
     //		super.remove(key);
     //		//if (bitmap != null)
     //			//bitmap.recycle();
     //	}
     //
     //	/**
     //	 * The key is touched (recent used) and added to the top of the list
     //	 * @param key The key to be updated
     //	 */
     //	private void updateKey(final String key) {
     //		try {
     //			list.remove(key);
     //			list.addFirst(key);
     //		} catch (Exception e) {
     //			log.log(Level.SEVERE, "updatekey", e);
     //		}
     //	}
+    }

Also available in: Unified diff

Application: gvSIG desktop » gvSIG raster

Revision 1799