X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=system%2Fgeneral%2Fsrc%2Fmain%2Fjava%2Forg%2Fwamblee%2Fsystem%2FContainer.java;h=a23a7373aba0b9635ec9ad4e7c9b5d802d753281;hb=0af4854898104bd6322c0f22feb6dc285859f420;hp=ee3a053595db2d7a7444d091db19947b0cd4c527;hpb=cc58fc5b498c82163904e8ccdc5eed7b96406a65;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 ee3a0535..a23a7373 100644
--- a/system/general/src/main/java/org/wamblee/system/Container.java
+++ b/system/general/src/main/java/org/wamblee/system/Container.java
@@ -29,7 +29,7 @@ public class Container extends AbstractComponent {
 	 * @param aRequired Required services by the system. 
 	 */
 	public Container(String aName, ServiceRegistry aRegistry, Component[] aSystems,
-			ProvidedInterfaceDescriptor[] aProvided, RequiredInterfaceDescriptor[] aRequired) {
+			ProvidedInterface[] aProvided, RequiredInterface[] aRequired) {
 		super(aName, aRegistry, aProvided, aRequired);
 		_systems = aSystems;
 		validate();
@@ -42,24 +42,24 @@ public class Container extends AbstractComponent {
 	 * Also logs a warning in case of superfluous requirements.  
 	 */
 	private void validate() {
-		List<ProvidedInterfaceDescriptor> provided = new ArrayList<ProvidedInterfaceDescriptor>();
+		List<ProvidedInterface> provided = new ArrayList<ProvidedInterface>();
 		for (Component system : _systems) {
 			provided.addAll(Arrays.asList(system.getProvidedServices()));
 		}
 
-		List<RequiredInterfaceDescriptor> required = new ArrayList<RequiredInterfaceDescriptor>();
+		List<RequiredInterface> required = new ArrayList<RequiredInterface>();
 		for (Component system : _systems) {
 			required.addAll(Arrays.asList(system.getRequiredServices()));
 		}
 
-		for (ProvidedInterfaceDescriptor service : getProvidedServices()) {
+		for (ProvidedInterface service : getProvidedServices()) {
 			if (!(provided.contains(service))) {
 				throw new SystemAssemblyException(getName() + ": Service '" + service
 						+ "' is not provided by any of the subsystems");
 			}
 		}
 
-		for (RequiredInterfaceDescriptor service : getRequiredServices()) {
+		for (RequiredInterface service : getRequiredServices()) {
 			if (!(required.contains(service))) {
 				info("Service '"
 						+ service
@@ -67,16 +67,16 @@ public class Container extends AbstractComponent {
 			}
 		}
 
-		List<RequiredInterfaceDescriptor> reallyRequired = new ArrayList<RequiredInterfaceDescriptor>(
+		List<RequiredInterface> reallyRequired = new ArrayList<RequiredInterface>(
 				required);
-		for (ProvidedInterfaceDescriptor service : provided) {
+		for (ProvidedInterface service : provided) {
 			reallyRequired.remove(service); 
 		}
-		for (RequiredInterfaceDescriptor service: getRequiredServices()) { 
+		for (RequiredInterface service: getRequiredServices()) { 
 			reallyRequired.remove(service); 
 		}
 		String missingRequired = "";
-		for (RequiredInterfaceDescriptor service: reallyRequired) {
+		for (RequiredInterface service: reallyRequired) {
 			missingRequired += service + "\n";
 		}
 		if ( missingRequired.length() > 0 ) { 
@@ -86,12 +86,12 @@ public class Container extends AbstractComponent {
 
 	@Override
 	protected void doStart(String aContext, Service[] aRequiredServices) {
-		List<ProvidedInterfaceDescriptor> descriptors = new ArrayList<ProvidedInterfaceDescriptor>();
+		List<ProvidedInterface> descriptors = new ArrayList<ProvidedInterface>();
 		for (Service service : aRequiredServices) {
 			descriptors.add(service.getDescriptor());
 		}
 		SystemAssembler assembler = new SystemAssembler(aContext + "." + getName(), _systems,
-				descriptors.toArray(new ProvidedInterfaceDescriptor[0]));
+				descriptors.toArray(new ProvidedInterface[0]));
 		assembler.start(getRegistry(), aRequiredServices);
 	}