X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=system%2Fgeneral%2Fsrc%2Fmain%2Fjava%2Forg%2Fwamblee%2Fsystem%2FContainer.java;h=158c0a06b5c04c394269ccf74ce9004466e1eaf0;hb=477828fdedd84f2deec2e4305d336a730a9b3afa;hp=a80aa1a21f0c7136b2acd66d8c2b8f9eff6091bf;hpb=e055966cbba51cbf35546dbc50f29516cf6e304f;p=utils 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 a80aa1a2..158c0a06 100644 --- 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 provided = new ArrayList(); + List provided = new ArrayList(); for (Component system : _systems) { provided.addAll(Arrays.asList(system.getProvidedServices())); } - List required = new ArrayList(); + List required = new ArrayList(); 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 reallyRequired = new ArrayList( + List reallyRequired = new ArrayList( 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 ) {