rename subsystem to component.

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

diff --git a/system/general/src/main/java/org/wamblee/system/SystemAssembler.java b/system/general/src/main/java/org/wamblee/system/SystemAssembler.java
index 7b45f8b1d7b047389a2fc12b34e420624fa6a5e2..561e3f9569ebcf39db1770a5bcda7ee517075e16 100644 (file)
--- a/system/general/src/main/java/org/wamblee/system/SystemAssembler.java
+++ b/system/general/src/main/java/org/wamblee/system/SystemAssembler.java
@@ -22,30 +22,30 @@ public class SystemAssembler {
 
        private static final String ROOT_CONTEXT_NAME = "root";
        private String _context;
-       private SubSystem[] _systems;
+       private Component[] _systems;
 
-       public static RequiredServiceDescriptor[] filterRequiredServices(
-                       ProvidedServiceDescriptor aProvided,
-                       Collection<RequiredServiceDescriptor> aDescriptors) {
-               List<RequiredServiceDescriptor> required = new ArrayList<RequiredServiceDescriptor>();
-               for (RequiredServiceDescriptor descriptor : aDescriptors) {
+       public static RequiredInterfaceDescriptor[] filterRequiredServices(
+                       ProvidedInterfaceDescriptor aProvided,
+                       Collection<RequiredInterfaceDescriptor> aDescriptors) {
+               List<RequiredInterfaceDescriptor> required = new ArrayList<RequiredInterfaceDescriptor>();
+               for (RequiredInterfaceDescriptor descriptor : aDescriptors) {
                        if (descriptor.implementedBy(aProvided)) {
                                required.add(descriptor);
                        }
                }
-               return required.toArray(new RequiredServiceDescriptor[0]);
+               return required.toArray(new RequiredInterfaceDescriptor[0]);
        }
 
-       public static ProvidedServiceDescriptor[] filterProvidedServices(
-                       RequiredServiceDescriptor aRequired,
-                       Collection<ProvidedServiceDescriptor> aProvided) {
-               List<ProvidedServiceDescriptor> provided = new ArrayList<ProvidedServiceDescriptor>();
-               for (ProvidedServiceDescriptor descriptor : aProvided) {
+       public static ProvidedInterfaceDescriptor[] filterProvidedServices(
+                       RequiredInterfaceDescriptor aRequired,
+                       Collection<ProvidedInterfaceDescriptor> aProvided) {
+               List<ProvidedInterfaceDescriptor> provided = new ArrayList<ProvidedInterfaceDescriptor>();
+               for (ProvidedInterfaceDescriptor descriptor : aProvided) {
                        if (aRequired.implementedBy(descriptor)) {
                                provided.add(descriptor);
                        }
                }
-               return provided.toArray(new ProvidedServiceDescriptor[0]);
+               return provided.toArray(new ProvidedInterfaceDescriptor[0]);
        }
 
        /**
@@ -57,8 +57,8 @@ public class SystemAssembler {
         *            Available services from other systems outside of the systems
         *            that this assembler manages.
         */
-       public SystemAssembler(SubSystem[] aSystems,
-                       ProvidedServiceDescriptor[] aAvailableServices) {
+       public SystemAssembler(Component[] aSystems,
+                       ProvidedInterfaceDescriptor[] aAvailableServices) {
                this(ROOT_CONTEXT_NAME, aSystems, aAvailableServices);
        }
 
@@ -73,8 +73,8 @@ public class SystemAssembler {
         *            Available services from other systems outside of the systems
         *            that this assembler manages.
         */
-       public SystemAssembler(String aContext, SubSystem[] aSystems,
-                       ProvidedServiceDescriptor[] aAvailableServices) {
+       public SystemAssembler(String aContext, Component[] aSystems,
+                       ProvidedInterfaceDescriptor[] aAvailableServices) {
                _context = aContext;
                _systems = aSystems;
                validate(aAvailableServices);
@@ -84,20 +84,20 @@ public class SystemAssembler {
         * Determines if the systems are ordered appropriately so that all
         * dependencies are met.
         */
-       private void validate(ProvidedServiceDescriptor[] aDescriptors)
+       private void validate(ProvidedInterfaceDescriptor[] aDescriptors)
                        throws SystemAssemblyException {
 
-               List<ProvidedServiceDescriptor> allProvided = new ArrayList<ProvidedServiceDescriptor>();
-               for (ProvidedServiceDescriptor descriptor : aDescriptors) {
+               List<ProvidedInterfaceDescriptor> allProvided = new ArrayList<ProvidedInterfaceDescriptor>();
+               for (ProvidedInterfaceDescriptor descriptor : aDescriptors) {
                        allProvided.add(descriptor);
                }
-               for (SubSystem system : _systems) {
+               for (Component system : _systems) {
                        // Check if all required services are already provided by earlier
                        // systems.
-                       RequiredServiceDescriptor[] required = system.getRequiredServices();
+                       RequiredInterfaceDescriptor[] required = system.getRequiredServices();
 
-                       for (RequiredServiceDescriptor descriptor : required) {
-                               ProvidedServiceDescriptor[] filtered = filterProvidedServices(
+                       for (RequiredInterfaceDescriptor descriptor : required) {
+                               ProvidedInterfaceDescriptor[] filtered = filterProvidedServices(
                                                descriptor, allProvided);
 
                                if (filtered.length == 0) {
@@ -120,7 +120,7 @@ public class SystemAssembler {
                        }
 
                        // add all provided services
-                       ProvidedServiceDescriptor[] provided = system.getProvidedServices();
+                       ProvidedInterfaceDescriptor[] provided = system.getProvidedServices();
                        allProvided.addAll(Arrays.asList(provided));
                }
        }
@@ -136,20 +136,20 @@ public class SystemAssembler {
         */
        public void start(ServiceRegistry aRegistry, Service[] aRequiredServices) {
                LOG.info("Starting '" + _context + "'");
-               Map<ProvidedServiceDescriptor, Service> allProvided = new HashMap<ProvidedServiceDescriptor, Service>();
+               Map<ProvidedInterfaceDescriptor, Service> allProvided = new HashMap<ProvidedInterfaceDescriptor, Service>();
 
                for (Service service : aRequiredServices) {
                        allProvided.put(service.getDescriptor(), service);
                }
-               for (SubSystem system : _systems) {
+               for (Component system : _systems) {
                        
                        // Compose a list of the required services required for the subsystem.
                        
-                       RequiredServiceDescriptor[] descriptors = system
+                       RequiredInterfaceDescriptor[] descriptors = system
                                        .getRequiredServices();
                        List<Service> services = new ArrayList<Service>();
-                       for (RequiredServiceDescriptor descriptor : descriptors) {
-                               ProvidedServiceDescriptor[] provided = filterProvidedServices(
+                       for (RequiredInterfaceDescriptor descriptor : descriptors) {
+                               ProvidedInterfaceDescriptor[] provided = filterProvidedServices(
                                                descriptor, allProvided.keySet());
                                services.add(allProvided.get(provided[0]));
                        }