svn commit: r493686 - /incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/AbstractCompositeContext.java

[jmarino]

Author: jmarino
Date: Sun Jan  7 01:27:01 2007
New Revision: 493686

URL: http://svn.apache.org/viewvc?view=rev&rev=493686
Log:
refactor composite context

Modified:
    
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/AbstractCompositeContext.java

Modified: 
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/AbstractCompositeContext.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/AbstractCompositeContext.java?view=diff&rev=493686&r1=493685&r2=493686
==============================================================================
--- 
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/AbstractCompositeContext.java
 (original)
+++ 
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/AbstractCompositeContext.java
 Sun Jan  7 01:27:01 2007
@@ -23,7 +23,7 @@
 import org.osoa.sca.ServiceRuntimeException;
 
 import org.apache.tuscany.spi.QualifiedName;
-import org.apache.tuscany.spi.component.AtomicComponent;
+import org.apache.tuscany.spi.component.Component;
 import org.apache.tuscany.spi.component.CompositeComponent;
 import org.apache.tuscany.spi.component.ReferenceBinding;
 import org.apache.tuscany.spi.component.SCAObject;
@@ -60,16 +60,7 @@
         String name = serviceInterface.getName();
         QualifiedName qName = new QualifiedName(serviceName);
         SCAObject child = composite.getChild(qName.getPartName());
-        InboundWire wire;
-        if (child instanceof CompositeComponent) {
-            CompositeComponent childComposite = (CompositeComponent) child;
-            wire = childComposite.getInboundWire(qName.getPortName());
-            if (wire == null) {
-                throw new ServiceRuntimeException("Service not found [" + 
serviceName + "]");
-            }
-        } else {
-            wire = getInboundWire(child, name, qName.getPortName());
-        }
+        InboundWire wire = getInboundWire(child, name, qName.getPortName());
         if (wire.isOptimizable()
             && wire.getServiceContract().getInterfaceClass() != null
             && 
serviceInterface.isAssignableFrom(wire.getServiceContract().getInterfaceClass()))
 {
@@ -84,8 +75,8 @@
 
     protected InboundWire getInboundWire(SCAObject child, String name, String 
serviceName) {
         InboundWire wire = null;
-        if (child instanceof AtomicComponent) {
-            wire = ((AtomicComponent) child).getInboundWire(name);
+        if (child instanceof Component) {
+            wire = ((Component) child).getInboundWire(name);
             if (wire == null) {
                 String qName = serviceName + QualifiedName.NAME_SEPARATOR + 
name;
                 throw new ServiceRuntimeException("Service not found [" + 
qName + "]");



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]