Author: nbelaevski Date: 2008-06-05 19:30:12 -0400 (Thu, 05 Jun 2008) New Revision: 8925 Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/cache/LRUMapCache.java trunk/framework/impl/src/main/java/org/ajax4jsf/cache/OSCacheCache.java trunk/framework/impl/src/main/java/org/ajax4jsf/util/LRUMap.java Log: http://jira.jboss.com/jira/browse/RF-1004 - LRUMapCache switched to org.ajax4jsf LRUMap implementation - Cache-related stuff generified Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/cache/LRUMapCache.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/cache/LRUMapCache.java 2008-06-05 23:30:01 UTC (rev 8924) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/cache/LRUMapCache.java 2008-06-05 23:30:12 UTC (rev 8925) @@ -24,14 +24,14 @@ import java.util.HashMap; import java.util.Map; -import org.apache.commons.collections.map.LRUMap; +import org.ajax4jsf.util.LRUMap; /** * @author Nick - mailto:nbelaevski@exadel.com * created 01.05.2007 * */ -public class LRUMapCache extends LRUMap implements Cache { +public class LRUMapCache extends LRUMap<Object, Object> implements Cache { /** * @@ -59,7 +59,7 @@ } - private Map futures = new HashMap(); + private Map<Object, LRUMapFuture> futures = new HashMap<Object, LRUMapFuture>(); public synchronized Object get(Object key, Object context) throws CacheException { @@ -124,6 +124,7 @@ // TODO Auto-generated method stub } + } class LRUMapFuture { Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/cache/OSCacheCache.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/cache/OSCacheCache.java 2008-06-05 23:30:01 UTC (rev 8924) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/cache/OSCacheCache.java 2008-06-05 23:30:12 UTC (rev 8925) @@ -24,8 +24,8 @@ import java.util.Collection; import java.util.Map; import java.util.Set; +import java.util.Map.Entry; - import com.opensymphony.oscache.base.NeedsRefreshException; /** @@ -79,7 +79,7 @@ /* (non-Javadoc) * @see org.ajax4jsf.resource.cache.Cache#entrySet() */ - public Set entrySet() { + public Set<Entry<Object, Object>> entrySet() { // TODO Auto-generated method stub return null; } @@ -131,7 +131,7 @@ /* (non-Javadoc) * @see org.ajax4jsf.resource.cache.Cache#keySet() */ - public Set keySet() { + public Set<Object> keySet() { // TODO Auto-generated method stub return null; } @@ -169,7 +169,7 @@ /* (non-Javadoc) * @see org.ajax4jsf.resource.cache.Cache#putAll(java.util.Map) */ - public void putAll(Map t) { + public void putAll(Map<? extends Object, ? extends Object> t) { // TODO Auto-generated method stub } @@ -206,7 +206,7 @@ /* (non-Javadoc) * @see org.ajax4jsf.resource.cache.Cache#values() */ - public Collection values() { + public Collection<Object> values() { // TODO Auto-generated method stub return null; } Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/util/LRUMap.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/util/LRUMap.java 2008-06-05 23:30:01 UTC (rev 8924) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/util/LRUMap.java 2008-06-05 23:30:12 UTC (rev 8925) @@ -23,6 +23,13 @@ /** + * Default capacity constructor + */ + public LRUMap() { + this(100); + } + + /** * @param capacity - maximal cache capacity. */ public LRUMap(int capacity) {