X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=system%2Fgeneral%2Fsrc%2Fmain%2Fjava%2Forg%2Fwamblee%2Fsystem%2Fcontainer%2FContainer.java;h=cb7a0981df0140a3097b363fee3bc5cf99e9bbf6;hb=0d8d8f24656e585ee75558cfd6a4c661f8f14985;hp=d86ec1ceaa42ded130612eb9c4d8ae46ccbd8c99;hpb=2d4a478a1f03e7e8c4a3c10a96a8f83c2ee570ea;p=utils

diff --git a/system/general/src/main/java/org/wamblee/system/container/Container.java b/system/general/src/main/java/org/wamblee/system/container/Container.java
index d86ec1ce..cb7a0981 100644
--- a/system/general/src/main/java/org/wamblee/system/container/Container.java
+++ b/system/general/src/main/java/org/wamblee/system/container/Container.java
@@ -17,9 +17,7 @@ package org.wamblee.system.container;
 
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.HashSet;
 import java.util.List;
-import java.util.Set;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -47,9 +45,9 @@ public class Container extends AbstractComponent<Scope> {
 
     private static final Log LOG = LogFactory.getLog(Container.class);
 
-    private List<Component> _components;
-    private CompositeEdgeFilter _edgeFilter; 
-    private boolean _sealed;
+    private List<Component> components;
+    private CompositeEdgeFilter edgeFilter; 
+    private boolean sealed;
 
     /**
      * Constructs the container
@@ -66,10 +64,10 @@ public class Container extends AbstractComponent<Scope> {
     public Container(String aName, Component[] aComponents,
             List<ProvidedInterface> aProvided, List<RequiredInterface> aRequired) {
         super(aName, aProvided, aRequired);
-        _components = new ArrayList<Component>();
+        components = new ArrayList<Component>();
 
-        _edgeFilter = new CompositeEdgeFilter();
-        _sealed = false;
+        edgeFilter = new CompositeEdgeFilter();
+        sealed = false;
         for (Component component : aComponents) {
             addComponent(component);
         }
@@ -109,7 +107,7 @@ public class Container extends AbstractComponent<Scope> {
             throw new SystemAssemblyException("Duplicate component '"
                     + aComponent.getName() + "'");
         }
-        _components.add(aComponent);
+        components.add(aComponent);
         aComponent.addContext(getQualifiedName());
         return this;
     }
@@ -148,7 +146,7 @@ public class Container extends AbstractComponent<Scope> {
         				+ aProvidedInterface + "'");
         	}
         }
-        _edgeFilter.add(new ConnectRequiredProvidedEdgeFilter(aClientComponent, aRequiredInterface, aServerComponent, aProvidedInterface));
+        edgeFilter.add(new ConnectRequiredProvidedEdgeFilter(aClientComponent, aRequiredInterface, aServerComponent, aProvidedInterface));
     }
     
     /**
@@ -178,7 +176,7 @@ public class Container extends AbstractComponent<Scope> {
         				+ aExternalRequiredInterface + "'");
         	}
         }
-        _edgeFilter.add(new ConnectRequiredExternallyRequiredEdgeFilter(
+        edgeFilter.add(new ConnectRequiredExternallyRequiredEdgeFilter(
                 aComponent, aRequiredInterface, aExternalRequiredInterface));
     }
     
@@ -204,7 +202,7 @@ public class Container extends AbstractComponent<Scope> {
         				+ aExternalProvided + "'");
         	}
         }
-        _edgeFilter.add(new ConnectExternalProvidedProvidedFilter(aExternalProvided, aComponent, aProvidedInterface));
+        edgeFilter.add(new ConnectExternalProvidedProvidedFilter(aExternalProvided, aComponent, aProvidedInterface));
     }
 
 
@@ -225,7 +223,7 @@ public class Container extends AbstractComponent<Scope> {
     @Override
     public void addContext(String aContext) {
         super.addContext(aContext);
-        for (Component component : _components) {
+        for (Component component : components) {
             component.addContext(aContext);
         }
     }
@@ -248,7 +246,7 @@ public class Container extends AbstractComponent<Scope> {
      * be added.
      */
     public void seal() {
-        _sealed = true;
+        sealed = true;
     }
 
     /**
@@ -257,7 +255,7 @@ public class Container extends AbstractComponent<Scope> {
      * @return True iff the container is sealed.
      */
     public boolean isSealed() {
-        return _sealed;
+        return sealed;
     }
 
     /**
@@ -273,7 +271,6 @@ public class Container extends AbstractComponent<Scope> {
 
     @Override
     protected Scope doStart(Scope aExternalScope) {
-        checkSealed();
         validate();
         Scope scope = new DefaultScope(getProvidedInterfaces().toArray(new ProvidedInterface[0]), aExternalScope);
         ComponentGraph graph = doStartOptionalDryRun(scope, false);
@@ -294,14 +291,12 @@ public class Container extends AbstractComponent<Scope> {
     private ComponentGraph doStartOptionalDryRun(Scope aScope, boolean aDryRun) {
         ComponentGraph graph = createComponentGraph();
         graph.validate();
-        if (!aDryRun) {
-            graph.link();
-        }
+        graph.link();
 
         LOG.info("Starting '" + getQualifiedName() + "'");
 
         List<Component> started = new ArrayList<Component>();
-        for (Component component : _components) {
+        for (Component component : components) {
             try {
                 // Start the service.
                 if (!aDryRun) {
@@ -326,14 +321,14 @@ public class Container extends AbstractComponent<Scope> {
         for (RequiredInterface req : getRequiredInterfaces()) {
             graph.addRequiredInterface(this, req);
         }
-        for (Component comp : _components) {
+        for (Component comp : components) {
             graph.addComponent(comp);
         }
         for (ProvidedInterface prov: getProvidedInterfaces()) { 
             graph.addProvidedInterface(this, prov);
         }
 
-        graph.addEdgeFilter(_edgeFilter);
+        graph.addEdgeFilter(edgeFilter);
         return graph;
     }
 
@@ -354,15 +349,15 @@ public class Container extends AbstractComponent<Scope> {
 
     @Override
     protected void doStop(Scope aScope) {
-        for (int i = _components.size() - 1; i >= 0; i--) {
-            Component component = _components.get(i);
+        for (int i = components.size() - 1; i >= 0; i--) {
+            Component component = components.get(i);
             Object runtime = aScope.getRuntime(component);
             component.stop(runtime);
         }
     }
 
     private void checkSealed() {
-        if (_sealed) {
+        if (sealed) {
             throw new SystemAssemblyException("Container is sealed");
         }
     }
@@ -373,7 +368,7 @@ public class Container extends AbstractComponent<Scope> {
      * @return Component or null if not found. 
      */
     public Component findComponent(String aName) { 
-    	for (Component<?> component: _components) { 
+    	for (Component<?> component: components) { 
     		if ( component.getName().equals(aName)) { 
     			return component; 
     		}