X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=system%2Fgeneral%2Fsrc%2Fmain%2Fjava%2Forg%2Fwamblee%2Fsystem%2FAbstractComponent.java;h=a78b46f1152720a10fd94b62da686a2a42776eb7;hb=0af4854898104bd6322c0f22feb6dc285859f420;hp=885cad6e1056980a5b2c769b2b9866ce8d7842fc;hpb=cc58fc5b498c82163904e8ccdc5eed7b96406a65;p=utils

diff --git a/system/general/src/main/java/org/wamblee/system/AbstractComponent.java b/system/general/src/main/java/org/wamblee/system/AbstractComponent.java
index 885cad6e..a78b46f1 100644
--- a/system/general/src/main/java/org/wamblee/system/AbstractComponent.java
+++ b/system/general/src/main/java/org/wamblee/system/AbstractComponent.java
@@ -21,9 +21,9 @@ public abstract class AbstractComponent implements Component {
 	private Status _status; 
 	private String _name;
 	private ServiceRegistry _registry; 
-	private List<ProvidedInterfaceDescriptor> _provided;
-	private List<RequiredInterfaceDescriptor> _required;
-	private Map<ProvidedInterfaceDescriptor, Service> _running;
+	private List<ProvidedInterface> _provided;
+	private List<RequiredInterface> _required;
+	private Map<ProvidedInterface, Service> _running;
 	
 	/**
 	 * Constructs the subsystem.
@@ -37,16 +37,16 @@ public abstract class AbstractComponent implements Component {
 	 * @param aRequired
 	 *            Required services.
 	 */
-	protected AbstractComponent(String aName, ServiceRegistry aRegistry, ProvidedInterfaceDescriptor[] aProvided,
-			RequiredInterfaceDescriptor[] aRequired) {
+	protected AbstractComponent(String aName, ServiceRegistry aRegistry, ProvidedInterface[] aProvided,
+			RequiredInterface[] aRequired) {
 		_status = Status.NOT_STARTED;
 		_name = aName;
 		_registry = aRegistry; 
-		_provided = new ArrayList<ProvidedInterfaceDescriptor>();
+		_provided = new ArrayList<ProvidedInterface>();
 		_provided.addAll(Arrays.asList(aProvided));
-		_required = new ArrayList<RequiredInterfaceDescriptor>();
+		_required = new ArrayList<RequiredInterface>();
 		_required.addAll(Arrays.asList(aRequired));
-		_running = new HashMap<ProvidedInterfaceDescriptor, Service>();
+		_running = new HashMap<ProvidedInterface, Service>();
 	}
 	
 	@Override
@@ -64,13 +64,13 @@ public abstract class AbstractComponent implements Component {
 	}
 
 	@Override
-	public final ProvidedInterfaceDescriptor[] getProvidedServices() {
-		return _provided.toArray(new ProvidedInterfaceDescriptor[0]);
+	public final ProvidedInterface[] getProvidedServices() {
+		return _provided.toArray(new ProvidedInterface[0]);
 	}
 
 	@Override
-	public final RequiredInterfaceDescriptor[] getRequiredServices() {
-		return _required.toArray(new RequiredInterfaceDescriptor[0]);
+	public final RequiredInterface[] getRequiredServices() {
+		return _required.toArray(new RequiredInterface[0]);
 	}
 
 	@Override
@@ -102,7 +102,7 @@ public abstract class AbstractComponent implements Component {
 	 *            Service.
 	 */
 	protected final void addService(String aContext,
-			ProvidedInterfaceDescriptor aDescriptor, Object aService) {
+			ProvidedInterface aDescriptor, Object aService) {
 		LOG.info(aContext + ": service '" + aService + "' started.");
 		Service svc = getRegistry().register(aDescriptor, aService);
 		_running.put(svc.getDescriptor(), svc);