You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by jb...@apache.org on 2006/05/22 20:54:15 UTC
svn commit: r408727 - in /incubator/tuscany/sandbox/jboynes/sca:
core2/src/main/java/org/apache/tuscany/core/context/scope/
spi/src/main/java/org/apache/tuscany/spi/
spi/src/main/java/org/apache/tuscany/spi/context/
Author: jboynes
Date: Mon May 22 11:54:14 2006
New Revision: 408727
URL: http://svn.apache.org/viewvc?rev=408727&view=rev
Log:
remove name from Lifecycle and move to subclasses that have names
Modified:
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/context/scope/AbstractScopeContext.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/AbstractLifecycle.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/context/AbstractContext.java
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/context/scope/AbstractScopeContext.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/context/scope/AbstractScopeContext.java?rev=408727&r1=408726&r2=408727&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/context/scope/AbstractScopeContext.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/context/scope/AbstractScopeContext.java Mon May 22 11:54:14 2006
@@ -23,17 +23,21 @@
* @version $Rev: 399161 $ $Date: 2006-05-02 23:09:37 -0700 (Tue, 02 May 2006) $
*/
public abstract class AbstractScopeContext extends AbstractLifecycle implements ScopeContext {
-
+ private final String name;
// The event context the scope container is associated with
protected WorkContext workContext;
private Map<EventFilter, List<RuntimeEventListener>> listeners;
private static final EventFilter TRUE_FILTER = new TrueFilter();
public AbstractScopeContext(String name, WorkContext workContext) {
- super(name);
+ this.name = name;
this.workContext = workContext;
}
+ public String getName() {
+ return name;
+ }
+
public void setWorkContext(WorkContext workContext) {
this.workContext = workContext;
}
@@ -107,5 +111,7 @@
return workContext;
}
-
+ public String toString() {
+ return "ScopeContext [" + name + "] in state [" + super.toString() + ']';
+ }
}
Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/AbstractLifecycle.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/AbstractLifecycle.java?rev=408727&r1=408726&r2=408727&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/AbstractLifecycle.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/AbstractLifecycle.java Mon May 22 11:54:14 2006
@@ -17,22 +17,8 @@
* @version $Rev$ $Date$
*/
public abstract class AbstractLifecycle implements Lifecycle {
-
- private final String name;
protected int lifecycleState = UNINITIALIZED;
- public AbstractLifecycle(String name) {
- this.name = name;
- }
-
- public AbstractLifecycle() {
- this.name = null;
- }
-
- public String getName() {
- return name;
- }
-
public int getLifecycleState() {
return lifecycleState;
}
@@ -50,48 +36,25 @@
}
public String toString() {
- if (name != null) {
- switch (lifecycleState) {
- case (Lifecycle.CONFIG_ERROR):
- return new StringBuilder().append("[").append(name).append("] in state [CONFIG_ERROR]").toString();
- case (Lifecycle.ERROR):
- return new StringBuilder().append("[").append(name).append("] in state [ERROR]").toString();
- case (Lifecycle.INITIALIZING):
- return new StringBuilder().append("[").append(name).append("] in state [INITIALIZING]").toString();
- case (Lifecycle.INITIALIZED):
- return new StringBuilder().append("[").append(name).append("] in state [INITIALIZED]").toString();
- case (Lifecycle.RUNNING):
- return new StringBuilder().append("[").append(name).append("] in state [RUNNING]").toString();
- case (Lifecycle.STOPPING):
- return new StringBuilder().append("[").append(name).append("] in state [STOPPING]").toString();
- case (Lifecycle.STOPPED):
- return new StringBuilder().append("[").append(name).append("] in state [STOPPED]").toString();
- case (Lifecycle.UNINITIALIZED):
- return new StringBuilder().append("[").append(name).append("] in state [UNINITIALIZED]").toString();
- default:
- return new StringBuilder().append("[").append(name).append("] in state [UNKNOWN]").toString();
- }
- } else {
- switch (lifecycleState) {
- case (Lifecycle.CONFIG_ERROR):
- return new StringBuilder().append("state [CONFIG_ERROR]").toString();
- case (Lifecycle.ERROR):
- return new StringBuilder().append("state [ERROR]").toString();
- case (Lifecycle.INITIALIZING):
- return new StringBuilder().append("state [INITIALIZING]").toString();
- case (Lifecycle.INITIALIZED):
- return new StringBuilder().append("state [INITIALIZED]").toString();
- case (Lifecycle.RUNNING):
- return new StringBuilder().append("state [RUNNING]").toString();
- case (Lifecycle.STOPPING):
- return new StringBuilder().append("state [STOPPING]").toString();
- case (Lifecycle.STOPPED):
- return new StringBuilder().append("state [STOPPED]").toString();
- case (Lifecycle.UNINITIALIZED):
- return new StringBuilder().append("state [UNINITIALIZED]").toString();
- default:
- return new StringBuilder().append("state [UNKNOWN]").toString();
- }
+ switch (lifecycleState) {
+ case (Lifecycle.CONFIG_ERROR):
+ return "CONFIG_ERROR";
+ case (Lifecycle.ERROR):
+ return "ERROR";
+ case (Lifecycle.INITIALIZING):
+ return "INITIALIZING";
+ case (Lifecycle.INITIALIZED):
+ return "INITIALIZED";
+ case (Lifecycle.RUNNING):
+ return "RUNNING";
+ case (Lifecycle.STOPPING):
+ return "STOPPING";
+ case (Lifecycle.STOPPED):
+ return "STOPPED";
+ case (Lifecycle.UNINITIALIZED):
+ return "UNINITIALIZED";
+ default:
+ return "UNKNOWN";
}
}
}
Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/context/AbstractContext.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/context/AbstractContext.java?rev=408727&r1=408726&r2=408727&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/context/AbstractContext.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/context/AbstractContext.java Mon May 22 11:54:14 2006
@@ -30,16 +30,20 @@
* @version $Rev: 399161 $ $Date: 2006-05-02 23:09:37 -0700 (Tue, 02 May 2006) $
*/
public abstract class AbstractContext<T> extends AbstractLifecycle implements Context<T> {
-
+ private final String name;
private final CompositeContext parent;
protected Map<EventFilter, List<RuntimeEventListener>> listeners;
protected static final EventFilter TRUE_FILTER = new TrueFilter();
public AbstractContext(String name, CompositeContext<?> parent) {
- super(name);
+ this.name = name;
this.parent = parent;
}
+ public String getName() {
+ return name;
+ }
+
public CompositeContext getParent() {
return parent;
}
@@ -94,5 +98,9 @@
public void prepare() {
+ }
+
+ public String toString() {
+ return "Context [" + name + "] in state [" + super.toString() + ']';
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org