Author: nbelaevski Date: 2008-06-05 19:30:01 -0400 (Thu, 05 Jun 2008) New Revision: 8924 Modified: trunk/framework/api/src/main/java/org/ajax4jsf/cache/Cache.java Log: http://jira.jboss.com/jira/browse/RF-1004 - LRUMapCache switched to org.ajax4jsf LRUMap implementation - Cache-related stuff generified Modified: trunk/framework/api/src/main/java/org/ajax4jsf/cache/Cache.java =================================================================== --- trunk/framework/api/src/main/java/org/ajax4jsf/cache/Cache.java 2008-06-05 21:50:19 UTC (rev 8923) +++ trunk/framework/api/src/main/java/org/ajax4jsf/cache/Cache.java 2008-06-05 23:30:01 UTC (rev 8924) @@ -3,6 +3,7 @@ import java.util.Collection; import java.util.Map; import java.util.Set; +import java.util.Map.Entry; /** * <p> @@ -50,7 +51,7 @@ * case when an object is remove from the cache while the return set is * being traversed. */ - public Set entrySet(); + public Set<Entry<Object, Object>> entrySet(); /** * Equality is based on the Set returned by entrySet. Equal will return @@ -81,14 +82,14 @@ * case when an object is remove from the cache while the return set is * being traversed. */ - public Set keySet(); + public Set<Object> keySet(); /** * Copies all of the mappings from the specified map to the cache. This * would be equivalent to t.entrySet() then iterating through the Set and * calling put with each key value pair. */ - public void putAll(Map t); + public void putAll(Map<? extends Object, ? extends Object> t); /** * @return the number of objects in the cache. This should be the same @@ -99,7 +100,7 @@ /** * @return a collection view of the values contained in the cache. */ - public Collection values(); + public Collection<Object> values(); /** * The get method will return, from the cache, the object associated with