--- android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/TimeoutMap.java	2009/10/09 08:52:37	428
+++ android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/TimeoutMap.java	2010/07/07 12:02:40	966
@@ -1,11 +1,12 @@
 package dk.thoerup.traininfoservice.banedk;
 
-import java.util.concurrent.ConcurrentHashMap;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+
 
-import com.sun.xml.rpc.processor.schema.UnimplementedFeatureException;
 
 public class TimeoutMap<K,V> implements Map<K,V>{
 
@@ -35,17 +36,14 @@
 	}
 
 	@Override
-	public boolean containsKey(Object arg0) {
-		CacheItem<V> item = cache.get(arg0);
-		
-		return (item != null);
+	public boolean containsKey(Object key) {
+		return cache.containsKey(key);
 	}
 
 	@Override
 	public boolean containsValue(Object arg0) {
-		//TODO someday implement this
+		//return values().contains(arg0);
 		throw new UnsupportedOperationException();
-		
 	}
 
 	@Override
@@ -66,8 +64,9 @@
 
 	@Override
 	public void putAll(Map<? extends K, ? extends V> arg0) {
-		//TODO someday implement this
-		throw new UnsupportedOperationException();
+		for(K key : arg0.keySet()) {
+			this.put(key, arg0.get(key) );
+		}
 	}
 
 	@Override
@@ -82,8 +81,13 @@
 
 	@Override
 	public Collection<V> values() {
-		//TODO someday implement this
-		throw new UnsupportedOperationException();
+		ArrayList<V> values = new ArrayList<V>();
+		for (CacheItem<V> item : cache.values()) {
+			values.add( item.value );
+		}
+		
+		return values;
+
 	}
 
 	@Override
@@ -108,7 +112,12 @@
 	public V put(K key, V value) {		
 		CacheItem<V> item= new CacheItem<V>(value);
 		
-		return cache.put(key, item).value;
+		item = cache.put(key, item);
+		
+		if (item != null)
+			return item.value;
+		else
+			return null; 
 	}
 	
 }