(no commit message)

diff --git a/trunk/system/general/src/main/java/org/wamblee/system/container/Container.java b/trunk/system/general/src/main/java/org/wamblee/system/container/Container.java
index 60456c5e4cdb98f84b74ab811eeab0c96cac53bf..9ef2ae18d817a0e35f8fda0c20c525a29d08775e 100644 (file)
--- a/trunk/system/general/src/main/java/org/wamblee/system/container/Container.java
+++ b/trunk/system/general/src/main/java/org/wamblee/system/container/Container.java
@@ -27,6 +27,7 @@ import org.wamblee.general.Pair;
 import org.wamblee.system.core.AbstractComponent;
 import org.wamblee.system.core.Component;
 import org.wamblee.system.core.DefaultScope;
+import org.wamblee.system.core.NamedInterface;
 import org.wamblee.system.core.ProvidedInterface;
 import org.wamblee.system.core.RequiredInterface;
 import org.wamblee.system.core.Scope;
@@ -47,7 +48,6 @@ public class Container extends AbstractComponent<Scope> {
     private static final Log LOG = LogFactory.getLog(Container.class);
 
     private List<Component> _components;
-    private Set<String> _componentNames;
     private CompositeEdgeFilter _edgeFilter; 
     private boolean _sealed;
 
@@ -68,7 +68,6 @@ public class Container extends AbstractComponent<Scope> {
         super(aName, aProvided, aRequired);
         _components = new ArrayList<Component>();
 
-        _componentNames = new HashSet<String>();
         _edgeFilter = new CompositeEdgeFilter();
         _sealed = false;
         for (Component component : aComponents) {
@@ -106,12 +105,11 @@ public class Container extends AbstractComponent<Scope> {
                             + aComponent.getName()
                             + "' is already part of another hierarchy");
         }
-        if (_componentNames.contains(aComponent.getName())) {
+        if ( findComponent(aComponent.getName()) != null ) {
             throw new SystemAssemblyException("Duplicate component '"
                     + aComponent.getName() + "'");
         }
         _components.add(aComponent);
-        _componentNames.add(aComponent.getName());
         aComponent.addContext(getQualifiedName());
         return this;
     }
@@ -128,7 +126,28 @@ public class Container extends AbstractComponent<Scope> {
     public void connectRequiredProvided(String aClientComponent, String aRequiredInterface, 
             String aServerComponent, String aProvidedInterface) {
         checkSealed();
-        // TODO validate 
+        Component client = findComponent(aClientComponent);
+        Component server = findComponent(aServerComponent);
+        if ( client == null ) { 
+               throw new SystemAssemblyException(getQualifiedName() + ": No component '" + aClientComponent + "' in the container");
+        }
+        if ( aRequiredInterface != null ) { 
+               if ( findInterface(client.getRequiredInterfaces(), aRequiredInterface) == null ) { 
+                       throw new SystemAssemblyException(
+                                       getQualifiedName() + ": Component '" + aClientComponent + "' does not have a required interface named '" 
+                                       + aRequiredInterface + "'");
+               }
+        }
+        if ( server == null ) { 
+               throw new SystemAssemblyException("No component '" + aClientComponent + "' in the container");
+        }
+        if ( aProvidedInterface != null ) { 
+               if ( findInterface(server.getProvidedInterfaces(), aProvidedInterface) == null) { 
+                       throw new SystemAssemblyException(
+                                       getQualifiedName() + ": Component '" + aServerComponent + "' does not have a provided interface named '" 
+                                       + aProvidedInterface + "'");
+               }
+        }
         _edgeFilter.add(new ConnectRequiredProvidedEdgeFilter(aClientComponent, aRequiredInterface, aServerComponent, aProvidedInterface));
     }
     
@@ -311,4 +330,27 @@ public class Container extends AbstractComponent<Scope> {
             throw new SystemAssemblyException("Container is sealed");
         }
     }
+    
+    /**
+     * Finds a component based on the non-qualified name of the component. 
+     * @param aName Component name. 
+     * @return Component or null if not found. 
+     */
+    public Component findComponent(String aName) { 
+       for (Component<?> component: _components) { 
+               if ( component.getName().equals(aName)) { 
+                       return component; 
+               }
+       }
+       return null; 
+    }
+    
+    private static <T extends NamedInterface> T findInterface(List<T> aInterfaces, String aInterfaceName) { 
+       for (T intf: aInterfaces) { 
+               if ( intf.getName().equals(aInterfaceName)) { 
+                       return intf; 
+               }
+       }
+       return null; 
+    }
 }