rename service to interface.

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

diff --git a/system/general/src/main/java/org/wamblee/system/core/Container.java b/system/general/src/main/java/org/wamblee/system/core/Container.java
index b6f0a4ce318b361a9f375c6a7f94842921dbf07f..ec45283e2d0fff00b1bc711658d80f5310414994 100644 (file)
--- a/system/general/src/main/java/org/wamblee/system/core/Container.java
+++ b/system/general/src/main/java/org/wamblee/system/core/Container.java
@@ -87,22 +87,22 @@ public class Container extends AbstractComponent {
        private void validate(RequiredInterface[] aRequired) {
                List<ProvidedInterface> provided = new ArrayList<ProvidedInterface>();
                for (Component system : _systems) {
-                       provided.addAll(Arrays.asList(system.getProvidedServices()));
+                       provided.addAll(Arrays.asList(system.getProvidedInterfaces()));
                }
 
                List<RequiredInterface> required = new ArrayList<RequiredInterface>();
                for (Component system : _systems) {
-                       required.addAll(Arrays.asList(system.getRequiredServices()));
+                       required.addAll(Arrays.asList(system.getRequiredInterfaces()));
                }
 
-               for (ProvidedInterface service : getProvidedServices()) {
+               for (ProvidedInterface service : getProvidedInterfaces()) {
                        if (!(provided.contains(service))) {
                                throw new SystemAssemblyException(getName() + ": Service '" + service
                                                + "' is not provided by any of the subsystems");
                        }
                }
 
-               for (RequiredInterface service : getRequiredServices()) {
+               for (RequiredInterface service : getRequiredInterfaces()) {
                        if (!(required.contains(service))) {
                                info("Service '"
                                                + service
@@ -138,7 +138,7 @@ public class Container extends AbstractComponent {
                
                // all interfaces from the required list of this container are
                // provided to the components inside it.
-               RequiredInterface[] required = getRequiredServices();
+               RequiredInterface[] required = getRequiredInterfaces();
                for (RequiredInterface intf: required) { 
                    ProvidedInterface provider = intf.getProvider(); 
                    if ( provider == null ) { 
@@ -163,14 +163,14 @@ public class Container extends AbstractComponent {
                
                // Add the provides of all externally required interfaces to the list of available
                // interfaces
-               for (RequiredInterface required: getRequiredServices()) { 
+               for (RequiredInterface required: getRequiredInterfaces()) { 
                        allProvided.add(required.getProvider());
                }
                
                for (Component system : _systems) {
                        // Check if all required services are already provided by earlier
                        // systems.
-                       RequiredInterface[] required = system.getRequiredServices();
+                       RequiredInterface[] required = system.getRequiredInterfaces();
 
                        for (RequiredInterface descriptor : required) {
                                ProvidedInterface[] filtered = filterProvidedServices(
@@ -200,7 +200,7 @@ public class Container extends AbstractComponent {
                        system.start();
 
                        // add all provided services
-                       ProvidedInterface[] provided = system.getProvidedServices();
+                       ProvidedInterface[] provided = system.getProvidedInterfaces();
                        allProvided.addAll(Arrays.asList(provided));
                }
        }