X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=system%2Fgeneral%2Fsrc%2Fmain%2Fjava%2Forg%2Fwamblee%2Fsystem%2Fcore%2FAbstractComponent.java;h=9000f4ae5234a1bc8e2b54536fdd20d29f15c0a2;hb=102eebeba2200f9bb2d8523bdfe7ace4ff663628;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..9000f4ae 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
@@ -63,12 +63,12 @@ public abstract class AbstractComponent<Type> implements Component<Type> {
 		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 +87,7 @@ public abstract class AbstractComponent<Type> implements Component<Type> {
 		}
 	}
 	
+	@Override
 	public String getContext() {
 		return _context;
 	}
@@ -111,12 +112,13 @@ public abstract class AbstractComponent<Type> implements Component<Type> {
 
 	@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())));
 		try {
 			Type runtime = doStart(aScope);
 			checkNotStartedInterfaces();
+			LOG.info("Initialization finished '" + getQualifiedName() + "'");
 			return runtime;
 		} finally {
 			_remaining.set(oldRemaining);
@@ -157,13 +159,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 +179,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; 
+	}
 
 }