X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=system%2Fgeneral%2Fsrc%2Fmain%2Fjava%2Forg%2Fwamblee%2Fsystem%2FAbstractSubSystem.java;h=6e9cebbd0966fa5b1814c735d67e0cca36a49334;hb=b6364aebdb15bb0648e8db2030d8ad793e209af6;hp=6ae6f3cc566fc7f29cf01ca1fd74a3b7476a9b8b;hpb=16504cb35c59542f7817abfe3c852e9fedd870a3;p=utils diff --git a/system/general/src/main/java/org/wamblee/system/AbstractSubSystem.java b/system/general/src/main/java/org/wamblee/system/AbstractSubSystem.java index 6ae6f3cc..6e9cebbd 100644 --- a/system/general/src/main/java/org/wamblee/system/AbstractSubSystem.java +++ b/system/general/src/main/java/org/wamblee/system/AbstractSubSystem.java @@ -2,6 +2,7 @@ package org.wamblee.system; import java.util.ArrayList; import java.util.Arrays; +import java.util.Collection; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -55,13 +56,13 @@ public abstract class AbstractSubSystem implements SubSystem { } @Override - public final ServiceDescriptor[] getProvidedServices() { - return _provided.toArray(new ServiceDescriptor[0]); + public final ProvidedServiceDescriptor[] getProvidedServices() { + return _provided.toArray(new ProvidedServiceDescriptor[0]); } @Override - public final ServiceDescriptor[] getRequiredServices() { - return _required.toArray(new ServiceDescriptor[0]); + public final RequiredServiceDescriptor[] getRequiredServices() { + return _required.toArray(new RequiredServiceDescriptor[0]); } @Override @@ -92,7 +93,7 @@ public abstract class AbstractSubSystem implements SubSystem { * Service. */ protected final void addService(String aContext, - ServiceDescriptor aDescriptor, Object aService) { + ProvidedServiceDescriptor aDescriptor, Object aService) { LOG.info(aContext + ": service '" + aService + "' started."); Service svc = getRegistry().register(aDescriptor, aService); _running.put(svc.getDescriptor(), svc);