[Swift-commit] r7319 - trunk/src/org/griphyn/vdl/karajan/lib/cache

[hategan at ci.uchicago.edu]

Author: hategan
Date: 2013-11-25 00:06:06 -0600 (Mon, 25 Nov 2013)
New Revision: 7319

Modified:
   trunk/src/org/griphyn/vdl/karajan/lib/cache/CacheMapAdapter.java
   trunk/src/org/griphyn/vdl/karajan/lib/cache/VDLFileCache.java
Log:
generics

Modified: trunk/src/org/griphyn/vdl/karajan/lib/cache/CacheMapAdapter.java
===================================================================
--- trunk/src/org/griphyn/vdl/karajan/lib/cache/CacheMapAdapter.java	2013-11-25 06:04:56 UTC (rev 7318)
+++ trunk/src/org/griphyn/vdl/karajan/lib/cache/CacheMapAdapter.java	2013-11-25 06:06:06 UTC (rev 7319)
@@ -24,7 +24,7 @@
 import java.util.Map;
 import java.util.Set;
 
-public class CacheMapAdapter implements Map {
+public class CacheMapAdapter implements Map<Object, Collection<String>> {
 	private VDLFileCache cache;
 	
 	public CacheMapAdapter(VDLFileCache cache) {
@@ -43,11 +43,11 @@
 		throw new UnsupportedOperationException();
 	}
 
-	public Set entrySet() {
+	public Set<Map.Entry<Object, Collection<String>>> entrySet() {
 		throw new UnsupportedOperationException();
 	}
 
-	public Object get(Object key) {
+	public Collection<String> get(Object key) {
 		return cache.getPaths(key);
 	}
 
@@ -55,19 +55,19 @@
 		throw new UnsupportedOperationException();
 	}
 
-	public Set keySet() {
+	public Set<Object> keySet() {
 		throw new UnsupportedOperationException();
 	}
 
-	public Object put(Object key, Object value) {
+	public Collection<String> put(Object key, Collection<String> value) {
 		throw new UnsupportedOperationException();
 	}
 
-	public void putAll(Map t) {
+	public void putAll(Map<? extends Object, ? extends Collection<String>> t) {
 		throw new UnsupportedOperationException();
 	}
 
-	public Object remove(Object key) {
+	public Collection<String> remove(Object key) {
 		throw new UnsupportedOperationException();
 	}
 
@@ -75,7 +75,7 @@
 		throw new UnsupportedOperationException();
 	}
 
-	public Collection values() {
+	public Collection<Collection<String>> values() {
 		throw new UnsupportedOperationException();
 	}
 	

Modified: trunk/src/org/griphyn/vdl/karajan/lib/cache/VDLFileCache.java
===================================================================
--- trunk/src/org/griphyn/vdl/karajan/lib/cache/VDLFileCache.java	2013-11-25 06:04:56 UTC (rev 7318)
+++ trunk/src/org/griphyn/vdl/karajan/lib/cache/VDLFileCache.java	2013-11-25 06:06:06 UTC (rev 7319)
@@ -123,11 +123,11 @@
 	 * Returns a collection of {@link File} objects representing the files
 	 * stored in the cache for the specified host
 	 */
-	Collection getFiles(Object host);
+	Collection<File> getFiles(Object host);
 	
 	/**
 	 * Returns a collection of {@link String} objects representing the file paths
 	 * stored in the cache for the specified host
 	 */
-	Collection getPaths(Object host);
+	Collection<String> getPaths(Object host);
 }