RequiredInterfaceDescriptor no longer extends InterfaceDescriptor.

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

diff --git a/system/general/src/main/java/org/wamblee/system/Container.java b/system/general/src/main/java/org/wamblee/system/Container.java
index a80aa1a21f0c7136b2acd66d8c2b8f9eff6091bf..158c0a06b5c04c394269ccf74ce9004466e1eaf0 100644 (file)
--- a/system/general/src/main/java/org/wamblee/system/Container.java
+++ b/system/general/src/main/java/org/wamblee/system/Container.java
@@ -42,12 +42,12 @@ public class Container extends AbstractComponent {
         * Also logs a warning in case of superfluous requirements.  
         */
        private void validate() {
-               List<InterfaceDescriptor> provided = new ArrayList<InterfaceDescriptor>();
+               List<ProvidedInterfaceDescriptor> provided = new ArrayList<ProvidedInterfaceDescriptor>();
                for (Component system : _systems) {
                        provided.addAll(Arrays.asList(system.getProvidedServices()));
                }
 
-               List<InterfaceDescriptor> required = new ArrayList<InterfaceDescriptor>();
+               List<RequiredInterfaceDescriptor> required = new ArrayList<RequiredInterfaceDescriptor>();
                for (Component system : _systems) {
                        required.addAll(Arrays.asList(system.getRequiredServices()));
                }
@@ -59,7 +59,7 @@ public class Container extends AbstractComponent {
                        }
                }
 
-               for (InterfaceDescriptor service : getRequiredServices()) {
+               for (RequiredInterfaceDescriptor service : getRequiredServices()) {
                        if (!(required.contains(service))) {
                                info("Service '"
                                                + service
@@ -67,16 +67,16 @@ public class Container extends AbstractComponent {
                        }
                }
 
-               List<InterfaceDescriptor> reallyRequired = new ArrayList<InterfaceDescriptor>(
+               List<RequiredInterfaceDescriptor> reallyRequired = new ArrayList<RequiredInterfaceDescriptor>(
                                required);
-               for (InterfaceDescriptor service : provided) {
+               for (ProvidedInterfaceDescriptor service : provided) {
                        reallyRequired.remove(service); 
                }
-               for (InterfaceDescriptor service: getRequiredServices()) { 
+               for (RequiredInterfaceDescriptor service: getRequiredServices()) { 
                        reallyRequired.remove(service); 
                }
                String missingRequired = "";
-               for (InterfaceDescriptor service: reallyRequired) {
+               for (RequiredInterfaceDescriptor service: reallyRequired) {
                        missingRequired += service + "\n";
                }
                if ( missingRequired.length() > 0 ) {