rename subsystem to component.

[utils] / system / general / src / main / java / org / wamblee / system / AbstractComponent.java

diff --git a/system/general/src/main/java/org/wamblee/system/AbstractSubSystem.java b/system/general/src/main/java/org/wamblee/system/AbstractComponent.java
similarity index 72%
rename from system/general/src/main/java/org/wamblee/system/AbstractSubSystem.java
rename to system/general/src/main/java/org/wamblee/system/AbstractComponent.java
index 6e9cebbd0966fa5b1814c735d67e0cca36a49334..5c96b5491f650288dce681a15337b389f71490d8 100644 (file)
--- a/system/general/src/main/java/org/wamblee/system/AbstractSubSystem.java
+++ b/system/general/src/main/java/org/wamblee/system/AbstractComponent.java
@@ -13,15 +13,15 @@ import org.apache.commons.logging.LogFactory;
 /**
  * Abstract subsystem class making it easy to implement new subsystems.
  */
-public abstract class AbstractSubSystem implements SubSystem {
+public abstract class AbstractComponent implements Component {
 
-       private static final Log LOG = LogFactory.getLog(AbstractSubSystem.class);
+       private static final Log LOG = LogFactory.getLog(AbstractComponent.class);
 
        private String _name;
        private ServiceRegistry _registry; 
-       private List<ServiceDescriptor> _provided;
-       private List<ServiceDescriptor> _required;
-       private Map<ServiceDescriptor, Service> _running;
+       private List<InterfaceDescriptor> _provided;
+       private List<InterfaceDescriptor> _required;
+       private Map<InterfaceDescriptor, Service> _running;
        
        /**
         * Constructs the subsystem.
@@ -35,15 +35,15 @@ public abstract class AbstractSubSystem implements SubSystem {
         * @param aRequired
         *            Required services.
         */
-       protected AbstractSubSystem(String aName, ServiceRegistry aRegistry, ServiceDescriptor[] aProvided,
-                       ServiceDescriptor[] aRequired) {
+       protected AbstractComponent(String aName, ServiceRegistry aRegistry, InterfaceDescriptor[] aProvided,
+                       InterfaceDescriptor[] aRequired) {
                _name = aName;
                _registry = aRegistry; 
-               _provided = new ArrayList<ServiceDescriptor>();
+               _provided = new ArrayList<InterfaceDescriptor>();
                _provided.addAll(Arrays.asList(aProvided));
-               _required = new ArrayList<ServiceDescriptor>();
+               _required = new ArrayList<InterfaceDescriptor>();
                _required.addAll(Arrays.asList(aRequired));
-               _running = new HashMap<ServiceDescriptor, Service>();
+               _running = new HashMap<InterfaceDescriptor, Service>();
        }
 
        @Override
@@ -56,13 +56,13 @@ public abstract class AbstractSubSystem implements SubSystem {
        }
 
        @Override
-       public final ProvidedServiceDescriptor[] getProvidedServices() {
-               return _provided.toArray(new ProvidedServiceDescriptor[0]);
+       public final ProvidedInterfaceDescriptor[] getProvidedServices() {
+               return _provided.toArray(new ProvidedInterfaceDescriptor[0]);
        }
 
        @Override
-       public final RequiredServiceDescriptor[] getRequiredServices() {
-               return _required.toArray(new RequiredServiceDescriptor[0]);
+       public final RequiredInterfaceDescriptor[] getRequiredServices() {
+               return _required.toArray(new RequiredInterfaceDescriptor[0]);
        }
 
        @Override
@@ -93,7 +93,7 @@ public abstract class AbstractSubSystem implements SubSystem {
         *            Service.
         */
        protected final void addService(String aContext,
-                       ProvidedServiceDescriptor aDescriptor, Object aService) {
+                       ProvidedInterfaceDescriptor aDescriptor, Object aService) {
                LOG.info(aContext + ": service '" + aService + "' started.");
                Service svc = getRegistry().register(aDescriptor, aService);
                _running.put(svc.getDescriptor(), svc);