X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=system%2Fgeneral%2Fsrc%2Fmain%2Fjava%2Forg%2Fwamblee%2Fsystem%2FAbstractComponent.java;h=8b6109f233a951cf72edae3a6eb5765abc320e2a;hb=b0e1c060d6207c0fc06e4673764a6980da775210;hp=93f62c1e718b434e5e89a77237dcdf4d9889d9c3;hpb=98856488516fbc8ba95bf0fd2fb739575da9ac5a;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 93f62c1e..8b6109f2 100644
--- a/system/general/src/main/java/org/wamblee/system/AbstractComponent.java
+++ b/system/general/src/main/java/org/wamblee/system/AbstractComponent.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2007 the original author or authors.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */ 
 package org.wamblee.system;
 
 import java.util.ArrayList;
@@ -16,7 +31,8 @@ public abstract class AbstractComponent implements Component {
 
 	private static final Log LOG = LogFactory.getLog(AbstractComponent.class);
 
-	private Status _status; 
+	private Status _status;
+	private String _context; 
 	private String _name; 
 	private List<ProvidedInterface> _provided;
 	private List<RequiredInterface> _required;
@@ -35,6 +51,7 @@ public abstract class AbstractComponent implements Component {
 	protected AbstractComponent(String aName, ProvidedInterface[] aProvided,
 			RequiredInterface[] aRequired) {
 		_status = Status.NOT_STARTED;
+		_context = null; 
 		_name = aName;
 		_provided = new ArrayList<ProvidedInterface>();
 		_provided.addAll(Arrays.asList(aProvided));
@@ -52,6 +69,24 @@ public abstract class AbstractComponent implements Component {
 	public final String getName() {
 		return _name;
 	}
+	
+	@Override
+	public void addContext(String aContext) {
+		if (_context == null ) { 
+			_context = aContext; 
+		}
+		else { 
+			_context = aContext + "." + _context;
+		}
+	}
+	
+	@Override
+	public String getQualifiedName() {
+		if ( _context == null ) { 
+			return getName(); 
+		}
+		return _context + "." + getName(); 
+	}
 
 	@Override
 	public final ProvidedInterface[] getProvidedServices() {
@@ -64,15 +99,15 @@ public abstract class AbstractComponent implements Component {
 	}
 
 	@Override
-	public final void start(String aContext) {
-		LOG.info("Initializing '" + aContext + "." + _name + "'");
-		doStart(aContext + "." + getName());
+	public final void start() {
+		LOG.info("Initializing '" + getQualifiedName() + "'");
+		doStart();
 		_status = Status.RUNNING;
 		if ( _running.size() != _provided.size()) { 
 			List<ProvidedInterface> remaining = 
 				new ArrayList<ProvidedInterface>(_provided);
 			remaining.removeAll(_running);
-			throw new SystemAssemblyException(aContext + "." + getName() + ": not all services were started, missing " + remaining);
+			throw new SystemAssemblyException(getQualifiedName() + ": not all services were started, missing " + remaining);
 		}
 	}
 
@@ -80,7 +115,7 @@ public abstract class AbstractComponent implements Component {
 	 * Must be implemented for initializing the subsystem. The implementation
 	 * must call {@link #addService(Service)} for each service that is started.
 	 */
-	protected abstract void doStart(String aContext);
+	protected abstract void doStart();
 
 	/**
 	 * Implementations must call this method to indicate that a new service has
@@ -89,9 +124,9 @@ public abstract class AbstractComponent implements Component {
 	 * @param aService
 	 *            Service.
 	 */
-	protected final void addService(String aContext,
+	protected final void addService(
 			ProvidedInterface aDescriptor, Object aService) {
-		LOG.info(aContext + ": service '" + aService + "' started.");
+		LOG.info("Interface '" + getQualifiedName() + "." + aDescriptor.getName() + "' started.");
 		_running.add(aDescriptor);
 		aDescriptor.publish(aService);
 	}