X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=system%2Fgeneral%2Fsrc%2Fmain%2Fjava%2Forg%2Fwamblee%2Fsystem%2Fcore%2FAbstractComponent.java;h=38df3bc4c9bc297874834eaf1953fd3083e8962d;hb=1bfc42afcea288a918e8befe65fd8f87b99ba2e4;hp=9608f4179d2aca1a07b4ed4ed81d96d6217d9113;hpb=c210d3c212308d3c5a84f4c19e84a95175e4f172;p=utils

diff --git a/system/general/src/main/java/org/wamblee/system/core/AbstractComponent.java b/system/general/src/main/java/org/wamblee/system/core/AbstractComponent.java
index 9608f417..38df3bc4 100644
--- a/system/general/src/main/java/org/wamblee/system/core/AbstractComponent.java
+++ b/system/general/src/main/java/org/wamblee/system/core/AbstractComponent.java
@@ -35,8 +35,8 @@ public abstract class AbstractComponent<Type> implements Component<Type> {
 
 	private String _context;
 	private String _name;
-	private List<ProvidedInterface> _provided;
-	private List<RequiredInterface> _required;
+	private ReadWriteProvidedInterfaces _provided;
+	private ReadWriteRequiredInterfaces _required;
 
 	/**
 	 * Constructs the subsystem.
@@ -53,22 +53,20 @@ public abstract class AbstractComponent<Type> implements Component<Type> {
 		_remaining = new ThreadLocal<List<ProvidedInterface>>();
 		_context = null;
 		_name = aName;
-		_provided = new ArrayList<ProvidedInterface>();
-		_provided.addAll(Arrays.asList(aProvided));
-		_required = new ArrayList<RequiredInterface>();
-		_required.addAll(Arrays.asList(aRequired));
+		_provided = new ReadWriteProvidedInterfaces(aProvided);
+		_required = new ReadWriteRequiredInterfaces(aRequired);
 	}
 	
 	protected AbstractComponent(String aName) {
 		this(aName, new ProvidedInterface[0], new RequiredInterface[0]);
 	}
 	
-	protected AbstractComponent addProvidedInterface(ProvidedInterface aProvided) { 
+	public AbstractComponent addProvidedInterface(ProvidedInterface aProvided) { 
 		_provided.add(aProvided);
 		return this; 
 	}
 	
-	protected AbstractComponent addRequiredInterface(RequiredInterface aRequired) { 
+	public AbstractComponent addRequiredInterface(RequiredInterface aRequired) { 
 		_required.add(aRequired);
 		return this;
 	}
@@ -87,6 +85,7 @@ public abstract class AbstractComponent<Type> implements Component<Type> {
 		}
 	}
 	
+	@Override
 	public String getContext() {
 		return _context;
 	}
@@ -100,23 +99,24 @@ public abstract class AbstractComponent<Type> implements Component<Type> {
 	}
 
 	@Override
-	public final ProvidedInterface[] getProvidedInterfaces() {
-		return _provided.toArray(new ProvidedInterface[0]);
+	public final ProvidedInterfaces getProvidedInterfaces() {
+		return _provided.readOnlyView();
 	}
 
 	@Override
-	public final RequiredInterface[] getRequiredInterfaces() {
-		return _required.toArray(new RequiredInterface[0]);
+	public final RequiredInterfaces getRequiredInterfaces() {
+		return _required.readOnlyView();
 	}
 
 	@Override
 	public final Type start(Scope aScope) {
-		LOG.info("Initializing '" + getQualifiedName() + "'");
+		LOG.info("Initialization starting '" + getQualifiedName() + "'");
 		List<ProvidedInterface> oldRemaining = _remaining.get();
-		_remaining.set(new ArrayList<ProvidedInterface>(Arrays.asList(getProvidedInterfaces())));
+		_remaining.set(new ArrayList<ProvidedInterface>(Arrays.asList(getProvidedInterfaces().toArray())));
 		try {
 			Type runtime = doStart(aScope);
 			checkNotStartedInterfaces();
+			LOG.info("Initialization finished '" + getQualifiedName() + "'");
 			return runtime;
 		} finally {
 			_remaining.set(oldRemaining);
@@ -157,13 +157,18 @@ public abstract class AbstractComponent<Type> implements Component<Type> {
 			Object aService, Scope aScope) {
 		LOG.info("Interface '" + getQualifiedName() + "."
 				+ aDescriptor.getName() + "' started.");
-		_remaining.get().remove(aDescriptor);
+		if ( !_remaining.get().remove(aDescriptor) ) { 
+		    throw new SystemAssemblyException("Component '" + getQualifiedName() + "' started an unexpected interface '" + 
+		            aDescriptor + "' that was not registerd as a provided interface before");
+		}
 		aScope.publishInterface(aDescriptor, aService);
 	}
 
 	@Override
 	public void stop(Type aRuntime) {
+	    LOG.info("Stopping initiated '" + getQualifiedName() + "'");
 		doStop(aRuntime);
+		LOG.info("Stopping completed '" + getQualifiedName() + "'");
 	}
 
 	protected abstract void doStop(Type aRuntime);
@@ -172,5 +177,23 @@ public abstract class AbstractComponent<Type> implements Component<Type> {
 	public String toString() {
 		return getQualifiedName();
 	}
+	
+	public ProvidedInterface findProvidedInterface(String aName) { 
+	    for (ProvidedInterface provided: getProvidedInterfaces()) { 
+	        if ( provided.getName().equals(aName)) { 
+	            return provided; 
+	        }
+	    }
+	    return null; 
+	}
+	
+	public RequiredInterface findRequiredInterface(String aName) { 
+	    for (RequiredInterface required: getRequiredInterfaces()) { 
+	        if ( required.getName().equals(aName)) { 
+	            return required; 
+	        }
+	    }
+	    return null; 
+	}
 
 }