X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=system%2Fgeneral%2Fsrc%2Fmain%2Fjava%2Forg%2Fwamblee%2Fsystem%2FDefaultServiceRegistry.java;h=ae3f8b3240e8ac5652339e724b5f001538c7ec40;hb=6f277575685808a5c5a76555dd3e839dc5255031;hp=3fe5c71dc2e18bfca4cf17f904a02f5eed14e40c;hpb=4c7e63f11337abfaa6ea13eab4b6ca11891f4977;p=utils

diff --git a/system/general/src/main/java/org/wamblee/system/DefaultServiceRegistry.java b/system/general/src/main/java/org/wamblee/system/DefaultServiceRegistry.java
index 3fe5c71d..ae3f8b32 100644
--- a/system/general/src/main/java/org/wamblee/system/DefaultServiceRegistry.java
+++ b/system/general/src/main/java/org/wamblee/system/DefaultServiceRegistry.java
@@ -15,7 +15,7 @@ public class DefaultServiceRegistry implements ServiceRegistry {
 	}
 
 	@Override
-	public synchronized Service register(ServiceDescriptor aDescriptor,
+	public synchronized Service register(ProvidedInterfaceDescriptor aDescriptor,
 			Object aService) {
 		_count++;
 		String id = "" + _count;
@@ -23,11 +23,18 @@ public class DefaultServiceRegistry implements ServiceRegistry {
 		_services.put(id, svc);
 		return svc;
 	}
+	
+	@Override
+	public void remove(Service aService) {
+		Service svc = _services.remove(aService.getId());
+		if ( svc == null ) { 
+			throw new IllegalArgumentException("Service '" + aService.getId() + "' does not exist");
+		}
+	}
 
 	@Override
-	public synchronized Service find(String id) {
-		// TODO Auto-generated method stub
-		return null;
+	public synchronized Service find(String aId) {
+		return _services.get(aId);
 	}
 
 	@Override