X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=system%2Fgeneral%2Fsrc%2Fmain%2Fjava%2Forg%2Fwamblee%2Fsystem%2FContainer.java;h=ee3a053595db2d7a7444d091db19947b0cd4c527;hb=90df0a8dddc38ee5bc9b3a372af3e4d019293886;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..ee3a0535 100644
--- a/system/general/src/main/java/org/wamblee/system/Container.java
+++ b/system/general/src/main/java/org/wamblee/system/Container.java
@@ -42,24 +42,24 @@ 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()));
 		}
 
-		for (InterfaceDescriptor service : getProvidedServices()) {
+		for (ProvidedInterfaceDescriptor service : getProvidedServices()) {
 			if (!(provided.contains(service))) {
 				throw new SystemAssemblyException(getName() + ": Service '" + service
 						+ "' is not provided by any of the subsystems");
 			}
 		}
 
-		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 ) {