You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by js...@apache.org on 2007/05/13 18:43:33 UTC
svn commit: r537612 - in /incubator/tuscany/java/sca/modules:
core-spi/src/main/java/org/apache/tuscany/sca/scope/
core/src/main/java/org/apache/tuscany/sca/core/scope/
core/src/test/java/org/apache/tuscany/sca/core/scope/
implementation-java-runtime/s...
Author: jsdelfino
Date: Sun May 13 09:43:32 2007
New Revision: 537612
URL: http://svn.apache.org/viewvc?view=rev&rev=537612
Log:
Removed unnecessary isStarted method and BaseInstanceWrapper class.
Removed:
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/BaseInstanceWrapper.java
incubator/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/scope/InstanceWrapperBaseTestCase.java
incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/context/InstanceWrapperBaseTestCase.java
Modified:
incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/scope/InstanceWrapper.java
incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceWrapper.java
incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentInfo.java
Modified: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/scope/InstanceWrapper.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/scope/InstanceWrapper.java?view=diff&rev=537612&r1=537611&r2=537612
==============================================================================
--- incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/scope/InstanceWrapper.java (original)
+++ incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/scope/InstanceWrapper.java Sun May 13 09:43:32 2007
@@ -33,11 +33,6 @@
T getInstance();
/**
- * @return
- */
- boolean isStarted();
-
- /**
* @throws TargetInitializationException
*/
void start() throws TargetInitializationException;
Modified: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceWrapper.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceWrapper.java?view=diff&rev=537612&r1=537611&r2=537612
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceWrapper.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceWrapper.java Sun May 13 09:43:32 2007
@@ -18,34 +18,37 @@
*/
package org.apache.tuscany.sca.implementation.java.context;
-import org.apache.tuscany.sca.core.scope.BaseInstanceWrapper;
import org.apache.tuscany.sca.implementation.java.injection.EventInvoker;
+import org.apache.tuscany.sca.scope.InstanceWrapper;
import org.apache.tuscany.sca.scope.TargetDestructionException;
import org.apache.tuscany.sca.scope.TargetInitializationException;
/**
* @version $Rev$ $Date$
*/
-public class ReflectiveInstanceWrapper<T> extends BaseInstanceWrapper<T> {
+public class ReflectiveInstanceWrapper<T> implements InstanceWrapper<T> {
private final EventInvoker<T> initInvoker;
private final EventInvoker<T> destroyInvoker;
+ private final T instance;
public ReflectiveInstanceWrapper(T instance, EventInvoker<T> initInvoker, EventInvoker<T> destroyInvoker) {
- super(instance);
+ this.instance = instance;
this.initInvoker = initInvoker;
this.destroyInvoker = destroyInvoker;
}
+
+ public T getInstance() {
+ return instance;
+ }
public void start() throws TargetInitializationException {
if (initInvoker != null) {
initInvoker.invokeEvent(instance);
}
- super.start();
}
public void stop() throws TargetDestructionException {
- super.stop();
if (destroyInvoker != null) {
destroyInvoker.invokeEvent(instance);
}
Modified: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentInfo.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentInfo.java?view=diff&rev=537612&r1=537611&r2=537612
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentInfo.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentInfo.java Sun May 13 09:43:32 2007
@@ -113,14 +113,6 @@
}
}
- public Object getTargetInstance() throws TargetResolutionException {
- InstanceWrapper wrapper = component.getScopeContainer().getWrapper(groupId);
- if (!wrapper.isStarted()) {
- wrapper.start();
- }
- return wrapper.getInstance();
- }
-
public InstanceWrapper<?> createInstanceWrapper() throws ObjectCreationException {
return configuration.createFactory().newInstance();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org