Mail Archive Home | fractal-commits List | Febuary 2006 Index
| <-- Date Index --> | <-- Thread Index --> |
Date: Wednesday, February 22, 2006 @ 13:33:58
Author: seintur
Path: /cvsroot/fractal/aokell
Modified:
features/loggable/off/src/org/objectweb/fractal/aokell/lib/control/lifecycle/NonCompositeLifeCycleControllerImpl.java
features/membrane/comp/src/org/objectweb/fractal/aokell/lib/control/attribute/AttributeControllerType.fractal
features/membrane/comp/src/org/objectweb/fractal/aokell/lib/control/binding/BindingControllerType.fractal
features/membrane/comp/src/org/objectweb/fractal/aokell/lib/control/binding/UseBindingControllerType.fractal
features/membrane/comp/src/org/objectweb/fractal/aokell/lib/control/component/ComponentControllerType.fractal
features/membrane/comp/src/org/objectweb/fractal/aokell/lib/control/component/UseComponentControllerType.fractal
features/membrane/comp/src/org/objectweb/fractal/aokell/lib/control/content/ContentControllerType.fractal
features/membrane/comp/src/org/objectweb/fractal/aokell/lib/control/content/UseContentControllerType.fractal
features/membrane/comp/src/org/objectweb/fractal/aokell/lib/control/factory/FactoryControllerType.fractal
features/membrane/comp/src/org/objectweb/fractal/aokell/lib/control/lifecycle/LifeCycleControllerType.fractal
features/membrane/comp/src/org/objectweb/fractal/aokell/lib/control/name/NameControllerType.fractal
features/membrane/comp/src/org/objectweb/fractal/aokell/lib/control/name/UseNameControllerType.fractal
features/membrane/comp/src/org/objectweb/fractal/aokell/lib/control/superc/SuperControllerType.fractal
features/membrane/comp/src/org/objectweb/fractal/aokell/lib/control/superc/UseSuperControllerType.fractal
features/membrane/comp/src/org/objectweb/fractal/aokell/lib/factory/MembraneFactoryImpl.java
features/membrane/comp/src/org/objectweb/fractal/aokell/lib/membrane/Base.fractal
features/membrane/comp/src/org/objectweb/fractal/aokell/lib/membrane/MCompositeImpl.java
features/membrane/comp/src/org/objectweb/fractal/aokell/lib/membrane/MPrimitiveImpl.java
features/membrane/comp/src/org/objectweb/fractal/aokell/lib/membrane/composite/AutoBindingComposite.fractal
features/membrane/comp/src/org/objectweb/fractal/aokell/lib/membrane/composite/Composite.fractal
features/membrane/comp/src/org/objectweb/fractal/aokell/lib/membrane/composite/CompositeTemplate.fractal
features/membrane/comp/src/org/objectweb/fractal/aokell/lib/membrane/composite/ParametricComposite.fractal
features/membrane/comp/src/org/objectweb/fractal/aokell/lib/membrane/composite/ParametricCompositeTemplate.fractal
features/membrane/comp/src/org/objectweb/fractal/aokell/lib/membrane/flat/Flat.fractal
features/membrane/comp/src/org/objectweb/fractal/aokell/lib/membrane/flat/FlatTemplate.fractal
features/membrane/comp/src/org/objectweb/fractal/aokell/lib/membrane/flat/ParametricFlat.fractal
features/membrane/comp/src/org/objectweb/fractal/aokell/lib/membrane/flat/ParametricFlatTemplate.fractal
features/membrane/comp/src/org/objectweb/fractal/aokell/lib/membrane/primitive/AutoBindingPrimitive.fractal
features/membrane/comp/src/org/objectweb/fractal/aokell/lib/membrane/primitive/ParametricPrimitive.fractal
features/membrane/comp/src/org/objectweb/fractal/aokell/lib/membrane/primitive/ParametricPrimitiveTemplate.fractal
features/membrane/comp/src/org/objectweb/fractal/aokell/lib/membrane/primitive/Primitive.fractal
features/membrane/comp/src/org/objectweb/fractal/aokell/lib/membrane/primitive/PrimitiveTemplate.fractal
features/membrane/comp/src/org/objectweb/fractal/aokell/lib/util/MFractalHelper.java
features/membrane/comp/src/org/objectweb/fractal/aokell/lib/util/MembraneHelper.java
src/org/objectweb/fractal/aokell/lib/control/attribute/AttributeControllerImpl.java
src/org/objectweb/fractal/aokell/lib/control/binding/AbstractBindingControllerImpl.java
src/org/objectweb/fractal/aokell/lib/control/binding/CompositeAutoBindingControllerImpl.java
src/org/objectweb/fractal/aokell/lib/control/binding/PrimitiveAutoBindingControllerImpl.java
Implementation of componentized membranes modified.
Control-component and component interface names now follow the same rules.
Control-component can thus be manipulated with the Fractal API like any other
regular component.
-----------------------------------------------------------------------------------------------------------------------+
features/loggable/off/src/org/objectweb/fractal/aokell/lib/control/lifecycle/NonCompositeLifeCycleControllerImpl.java
| 11 +-
features/membrane/comp/src/org/objectweb/fractal/aokell/lib/control/attribute/AttributeControllerType.fractal
| 2
features/membrane/comp/src/org/objectweb/fractal/aokell/lib/control/binding/BindingControllerType.fractal
| 2
features/membrane/comp/src/org/objectweb/fractal/aokell/lib/control/binding/UseBindingControllerType.fractal
| 2
features/membrane/comp/src/org/objectweb/fractal/aokell/lib/control/component/ComponentControllerType.fractal
| 2
features/membrane/comp/src/org/objectweb/fractal/aokell/lib/control/component/UseComponentControllerType.fractal
| 2
features/membrane/comp/src/org/objectweb/fractal/aokell/lib/control/content/ContentControllerType.fractal
| 2
features/membrane/comp/src/org/objectweb/fractal/aokell/lib/control/content/UseContentControllerType.fractal
| 2
features/membrane/comp/src/org/objectweb/fractal/aokell/lib/control/factory/FactoryControllerType.fractal
| 2
features/membrane/comp/src/org/objectweb/fractal/aokell/lib/control/lifecycle/LifeCycleControllerType.fractal
| 2
features/membrane/comp/src/org/objectweb/fractal/aokell/lib/control/name/NameControllerType.fractal
| 2
features/membrane/comp/src/org/objectweb/fractal/aokell/lib/control/name/UseNameControllerType.fractal
| 2
features/membrane/comp/src/org/objectweb/fractal/aokell/lib/control/superc/SuperControllerType.fractal
| 2
features/membrane/comp/src/org/objectweb/fractal/aokell/lib/control/superc/UseSuperControllerType.fractal
| 2
features/membrane/comp/src/org/objectweb/fractal/aokell/lib/factory/MembraneFactoryImpl.java
| 41 +++++-----
features/membrane/comp/src/org/objectweb/fractal/aokell/lib/membrane/Base.fractal
| 2
features/membrane/comp/src/org/objectweb/fractal/aokell/lib/membrane/MCompositeImpl.java
| 2
features/membrane/comp/src/org/objectweb/fractal/aokell/lib/membrane/MPrimitiveImpl.java
| 24 ++---
features/membrane/comp/src/org/objectweb/fractal/aokell/lib/membrane/composite/AutoBindingComposite.fractal
| 32 +++----
features/membrane/comp/src/org/objectweb/fractal/aokell/lib/membrane/composite/Composite.fractal
| 32 +++----
features/membrane/comp/src/org/objectweb/fractal/aokell/lib/membrane/composite/CompositeTemplate.fractal
| 28 +++---
features/membrane/comp/src/org/objectweb/fractal/aokell/lib/membrane/composite/ParametricComposite.fractal
| 6 -
features/membrane/comp/src/org/objectweb/fractal/aokell/lib/membrane/composite/ParametricCompositeTemplate.fractal
| 4
features/membrane/comp/src/org/objectweb/fractal/aokell/lib/membrane/flat/Flat.fractal
| 18 ++--
features/membrane/comp/src/org/objectweb/fractal/aokell/lib/membrane/flat/FlatTemplate.fractal
| 16 +--
features/membrane/comp/src/org/objectweb/fractal/aokell/lib/membrane/flat/ParametricFlat.fractal
| 4
features/membrane/comp/src/org/objectweb/fractal/aokell/lib/membrane/flat/ParametricFlatTemplate.fractal
| 4
features/membrane/comp/src/org/objectweb/fractal/aokell/lib/membrane/primitive/AutoBindingPrimitive.fractal
| 24 ++---
features/membrane/comp/src/org/objectweb/fractal/aokell/lib/membrane/primitive/ParametricPrimitive.fractal
| 4
features/membrane/comp/src/org/objectweb/fractal/aokell/lib/membrane/primitive/ParametricPrimitiveTemplate.fractal
| 4
features/membrane/comp/src/org/objectweb/fractal/aokell/lib/membrane/primitive/Primitive.fractal
| 24 ++---
features/membrane/comp/src/org/objectweb/fractal/aokell/lib/membrane/primitive/PrimitiveTemplate.fractal
| 22 ++---
features/membrane/comp/src/org/objectweb/fractal/aokell/lib/util/MFractalHelper.java
| 12 +-
features/membrane/comp/src/org/objectweb/fractal/aokell/lib/util/MembraneHelper.java
| 22 +++--
src/org/objectweb/fractal/aokell/lib/control/attribute/AttributeControllerImpl.java
| 3
src/org/objectweb/fractal/aokell/lib/control/binding/AbstractBindingControllerImpl.java
| 32 +++----
src/org/objectweb/fractal/aokell/lib/control/binding/CompositeAutoBindingControllerImpl.java
| 11 +-
src/org/objectweb/fractal/aokell/lib/control/binding/PrimitiveAutoBindingControllerImpl.java
| 11 +-
38 files changed, 216 insertions(+), 203 deletions(-)
Index:
aokell/features/loggable/off/src/org/objectweb/fractal/aokell/lib/control/lifecycle/NonCompositeLifeCycleControllerImpl.java
diff -u
aokell/features/loggable/off/src/org/objectweb/fractal/aokell/lib/control/lifecycle/NonCompositeLifeCycleControllerImpl.java:1.2
aokell/features/loggable/off/src/org/objectweb/fractal/aokell/lib/control/lifecycle/NonCompositeLifeCycleControllerImpl.java:1.3
---
aokell/features/loggable/off/src/org/objectweb/fractal/aokell/lib/control/lifecycle/NonCompositeLifeCycleControllerImpl.java:1.2
Wed Feb 15 02:19:32 2006
+++
aokell/features/loggable/off/src/org/objectweb/fractal/aokell/lib/control/lifecycle/NonCompositeLifeCycleControllerImpl.java
Wed Feb 22 13:33:57 2006
@@ -21,7 +21,7 @@
* Author: Lionel Seinturier
* Contributors: Romain Rouvoy
*
-----------------------------------------------------------------------------
- * $Id: NonCompositeLifeCycleControllerImpl.java,v 1.2 2006/02/15 01:19:32
seintur Exp $
+ * $Id: NonCompositeLifeCycleControllerImpl.java,v 1.3 2006/02/22 12:33:57
seintur Exp $
*
-----------------------------------------------------------------------------
*/
@@ -32,6 +32,7 @@
import org.objectweb.fractal.aokell.lib.membrane.marker.LifeCycleType;
import org.objectweb.fractal.aokell.lib.util.FractalHelper;
import org.objectweb.fractal.aokell.lib.util.GlueHelper;
+import org.objectweb.fractal.aokell.lib.util.MembraneHelper;
import org.objectweb.fractal.api.NoSuchInterfaceException;
import org.objectweb.fractal.api.control.IllegalLifeCycleException;
import org.objectweb.fractal.api.control.LifeCycleController;
@@ -81,11 +82,11 @@
private void setFcState(final boolean start) throws
IllegalLifeCycleException {
/*
- * For Julia-like components, notify the content. AspectJ-like
- * components can not be notified: the control interface is directly
- * introduced into the content.
+ * For Julia-like components, notify the content. AO components can
not
+ * be notified: the control interface is directly introduced into the
+ * content.
*/
- Object contentPart = FractalHelper.getContent(compctrl);
+ Object contentPart = MembraneHelper.getFcContent(compctrl);
if( !(contentPart instanceof LifeCycleType) &&
contentPart instanceof LifeCycleController ) {
if (start)
Index:
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/control/attribute/AttributeControllerType.fractal
diff -u
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/control/attribute/AttributeControllerType.fractal:1.1
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/control/attribute/AttributeControllerType.fractal:1.2
---
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/control/attribute/AttributeControllerType.fractal:1.1
Sat Feb 11 06:43:58 2006
+++
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/control/attribute/AttributeControllerType.fractal
Wed Feb 22 13:33:58 2006
@@ -26,7 +26,7 @@
<definition
name="org.objectweb.fractal.aokell.lib.control.attribute.AttributeControllerType">
<interface
- name="/attribute-controller"
+ name="///attribute-controller"
signature="org.objectweb.fractal.api.control.AttributeController"
role="server"
/>
Index:
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/control/binding/BindingControllerType.fractal
diff -u
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/control/binding/BindingControllerType.fractal:1.1
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/control/binding/BindingControllerType.fractal:1.2
---
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/control/binding/BindingControllerType.fractal:1.1
Sat Feb 11 06:43:53 2006
+++
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/control/binding/BindingControllerType.fractal
Wed Feb 22 13:33:58 2006
@@ -26,7 +26,7 @@
<definition
name="org.objectweb.fractal.aokell.lib.control.binding.BindingControllerType">
<interface
- name="binding-controller"
+ name="//binding-controller"
signature="org.objectweb.fractal.aokell.lib.control.binding.BindingControllerItf"
role="server"
/>
Index:
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/control/binding/UseBindingControllerType.fractal
diff -u
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/control/binding/UseBindingControllerType.fractal:1.1
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/control/binding/UseBindingControllerType.fractal:1.2
---
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/control/binding/UseBindingControllerType.fractal:1.1
Sat Feb 11 06:43:53 2006
+++
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/control/binding/UseBindingControllerType.fractal
Wed Feb 22 13:33:58 2006
@@ -27,7 +27,7 @@
<definition
name="org.objectweb.fractal.aokell.lib.control.binding.UseBindingControllerType"
>
<interface
- name="binding-controller"
+ name="//binding-controller"
signature="org.objectweb.fractal.aokell.lib.control.binding.BindingControllerItf"
role="client"
/>
Index:
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/control/component/ComponentControllerType.fractal
diff -u
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/control/component/ComponentControllerType.fractal:1.1
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/control/component/ComponentControllerType.fractal:1.2
---
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/control/component/ComponentControllerType.fractal:1.1
Sat Feb 11 06:43:54 2006
+++
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/control/component/ComponentControllerType.fractal
Wed Feb 22 13:33:58 2006
@@ -26,7 +26,7 @@
<definition
name="org.objectweb.fractal.aokell.lib.control.component.ComponentControllerType">
<interface
- name="component"
+ name="//component"
signature="org.objectweb.fractal.aokell.lib.control.component.ComponentItf"
role="server"
/>
Index:
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/control/component/UseComponentControllerType.fractal
diff -u
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/control/component/UseComponentControllerType.fractal:1.1
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/control/component/UseComponentControllerType.fractal:1.2
---
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/control/component/UseComponentControllerType.fractal:1.1
Sat Feb 11 06:43:54 2006
+++
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/control/component/UseComponentControllerType.fractal
Wed Feb 22 13:33:58 2006
@@ -27,7 +27,7 @@
<definition
name="org.objectweb.fractal.aokell.lib.control.component.UseComponentControllerType"
>
<interface
- name="component"
+ name="//component"
signature="org.objectweb.fractal.aokell.lib.control.component.ComponentItf"
role="client"
/>
Index:
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/control/content/ContentControllerType.fractal
diff -u
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/control/content/ContentControllerType.fractal:1.1
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/control/content/ContentControllerType.fractal:1.2
---
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/control/content/ContentControllerType.fractal:1.1
Sat Feb 11 06:43:58 2006
+++
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/control/content/ContentControllerType.fractal
Wed Feb 22 13:33:58 2006
@@ -26,7 +26,7 @@
<definition
name="org.objectweb.fractal.aokell.lib.control.content.ContentControllerType">
<interface
- name="content-controller"
+ name="//content-controller"
signature="org.objectweb.fractal.aokell.lib.control.content.ContentControllerItf"
role="server"
/>
Index:
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/control/content/UseContentControllerType.fractal
diff -u
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/control/content/UseContentControllerType.fractal:1.1
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/control/content/UseContentControllerType.fractal:1.2
---
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/control/content/UseContentControllerType.fractal:1.1
Sat Feb 11 06:43:58 2006
+++
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/control/content/UseContentControllerType.fractal
Wed Feb 22 13:33:58 2006
@@ -26,7 +26,7 @@
<definition
name="org.objectweb.fractal.aokell.lib.control.content.UseContentControllerType">
<interface
- name="content-controller"
+ name="//content-controller"
signature="org.objectweb.fractal.aokell.lib.control.content.ContentControllerItf"
role="client"
/>
Index:
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/control/factory/FactoryControllerType.fractal
diff -u
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/control/factory/FactoryControllerType.fractal:1.1
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/control/factory/FactoryControllerType.fractal:1.2
---
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/control/factory/FactoryControllerType.fractal:1.1
Sat Feb 11 06:43:56 2006
+++
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/control/factory/FactoryControllerType.fractal
Wed Feb 22 13:33:57 2006
@@ -26,7 +26,7 @@
<definition
name="org.objectweb.fractal.aokell.lib.control.factory.FactoryControllerType">
<interface
- name="factory"
+ name="//factory"
signature="org.objectweb.fractal.aokell.lib.control.factory.FactoryItf"
role="server"
/>
Index:
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/control/lifecycle/LifeCycleControllerType.fractal
diff -u
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/control/lifecycle/LifeCycleControllerType.fractal:1.1
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/control/lifecycle/LifeCycleControllerType.fractal:1.2
---
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/control/lifecycle/LifeCycleControllerType.fractal:1.1
Sat Feb 11 06:43:52 2006
+++
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/control/lifecycle/LifeCycleControllerType.fractal
Wed Feb 22 13:33:58 2006
@@ -26,7 +26,7 @@
<definition
name="org.objectweb.fractal.aokell.lib.control.lifecycle.LifeCycleControllerType">
<interface
- name="lifecycle-controller"
+ name="//lifecycle-controller"
signature="org.objectweb.fractal.aokell.lib.control.lifecycle.LifeCycleControllerItf"
role="server"
/>
Index:
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/control/name/NameControllerType.fractal
diff -u
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/control/name/NameControllerType.fractal:1.1
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/control/name/NameControllerType.fractal:1.2
---
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/control/name/NameControllerType.fractal:1.1
Sat Feb 11 06:43:52 2006
+++
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/control/name/NameControllerType.fractal
Wed Feb 22 13:33:57 2006
@@ -26,7 +26,7 @@
<definition
name="org.objectweb.fractal.aokell.lib.control.name.NameControllerType">
<interface
- name="name-controller"
+ name="//name-controller"
signature="org.objectweb.fractal.aokell.lib.control.name.NameControllerItf"
role="server"
/>
Index:
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/control/name/UseNameControllerType.fractal
diff -u
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/control/name/UseNameControllerType.fractal:1.1
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/control/name/UseNameControllerType.fractal:1.2
---
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/control/name/UseNameControllerType.fractal:1.1
Sat Feb 11 06:43:52 2006
+++
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/control/name/UseNameControllerType.fractal
Wed Feb 22 13:33:57 2006
@@ -26,7 +26,7 @@
<definition
name="org.objectweb.fractal.aokell.lib.control.name.UseNameControllerType">
<interface
- name="name-controller"
+ name="//name-controller"
signature="org.objectweb.fractal.aokell.lib.control.name.NameControllerItf"
role="client"
/>
Index:
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/control/superc/SuperControllerType.fractal
diff -u
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/control/superc/SuperControllerType.fractal:1.1
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/control/superc/SuperControllerType.fractal:1.2
---
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/control/superc/SuperControllerType.fractal:1.1
Sat Feb 11 06:43:59 2006
+++
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/control/superc/SuperControllerType.fractal
Wed Feb 22 13:33:57 2006
@@ -26,7 +26,7 @@
<definition
name="org.objectweb.fractal.aokell.lib.control.superc.SuperControllerType">
<interface
- name="super-controller"
+ name="//super-controller"
signature="org.objectweb.fractal.aokell.lib.control.superc.SuperControllerItf"
role="server"
/>
Index:
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/control/superc/UseSuperControllerType.fractal
diff -u
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/control/superc/UseSuperControllerType.fractal:1.1
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/control/superc/UseSuperControllerType.fractal:1.2
---
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/control/superc/UseSuperControllerType.fractal:1.1
Sat Feb 11 06:43:59 2006
+++
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/control/superc/UseSuperControllerType.fractal
Wed Feb 22 13:33:57 2006
@@ -26,7 +26,7 @@
<definition
name="org.objectweb.fractal.aokell.lib.control.superc.UseSuperControllerType">
<interface
- name="super-controller"
+ name="//super-controller"
signature="org.objectweb.fractal.aokell.lib.control.superc.SuperControllerItf"
role="client"
/>
Index:
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/factory/MembraneFactoryImpl.java
diff -u
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/factory/MembraneFactoryImpl.java:1.1
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/factory/MembraneFactoryImpl.java:1.2
---
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/factory/MembraneFactoryImpl.java:1.1
Sat Feb 11 06:43:59 2006
+++
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/factory/MembraneFactoryImpl.java
Wed Feb 22 13:33:58 2006
@@ -30,8 +30,9 @@
import org.objectweb.fractal.aokell.lib.membrane.MPrimitiveImpl;
import org.objectweb.fractal.aokell.lib.membrane.MembraneDef;
import org.objectweb.fractal.aokell.lib.membrane.Membranes;
-import org.objectweb.fractal.aokell.lib.util.FractalHelper;
+import org.objectweb.fractal.aokell.lib.type.InterfaceTypeImpl;
import org.objectweb.fractal.aokell.lib.util.MFractalHelper;
+import org.objectweb.fractal.aokell.lib.util.MembraneHelper;
import org.objectweb.fractal.api.Component;
import org.objectweb.fractal.api.Interface;
import org.objectweb.fractal.api.Type;
@@ -96,23 +97,23 @@
* Retrieve the component controller from the previously instantiated
* control membrane.
*/
- ComponentItf compctrlitf =
- (ComponentItf)
FractalHelper.getFcInterface(membrane,"component");
+ ComponentItf compctrl =
+ (ComponentItf) MembraneHelper.getFcCompCtrlImpl(membrane);
/*
* Link the content part and the component controller.
*/
- compctrlitf.setContentPart(content);
+ compctrl.setContentPart(content);
if( content instanceof BaseType ) {
- ((BaseType) content).setFcComponent(compctrlitf);
+ ((BaseType) content).setFcComponent(compctrl);
}
/*
* Set the attributes exported by the component controller.
*/
- compctrlitf.setType(type);
- compctrlitf.setControllerDesc(controllerDesc);
- compctrlitf.setContentDesc(contentDesc);
+ compctrl.setType(type);
+ compctrl.setControllerDesc(controllerDesc);
+ compctrl.setContentDesc(contentDesc);
/*
* Initialize controllers.
@@ -137,13 +138,21 @@
for (int i = 0; i < itfs.length; i++) {
Interface itf = (Interface) itfs[i];
- if( ! itf.getFcItfName().startsWith("//") ) {
+ if( itf.getFcItfName().startsWith("//") ) {
itf = MFractalHelper.followBindingsUpToLastInterface(itf);
- InterfaceType it = (InterfaceType) itf.getFcItfType();
Component itfOwner = itf.getFcItfOwner();
- Controller ctrl =
- (Controller) MFractalHelper.getContent(itfOwner);
- compctrlitf.addFcController(it,ctrl);
+
+ InterfaceType it = (InterfaceType) itf.getFcItfType();
+ InterfaceTypeImpl itused =
+ new InterfaceTypeImpl(
+ it.getFcItfName().substring(2), // remove //
+ it.getFcItfSignature(),
+ it.isFcClientItf(),
+ it.isFcOptionalItf(),
+ it.isFcCollectionItf() );
+
+ Object ctrl = MFractalHelper.getContent(itfOwner);
+ compctrl.addFcController(itused,(Controller)ctrl);
}
}
@@ -151,11 +160,7 @@
* Re-initialize the component controller.
* Control interfaces have been updated.
*/
- Interface citf =
-
MFractalHelper.followBindingsUpToLastInterface((Interface)compctrlitf);
- Component c = citf.getFcItfOwner();
- Controller compctrl = (Controller) MFractalHelper.getContent(c);
- compctrl.initFcCtrl();
+ ((Controller)compctrl).initFcCtrl();
return (Component) compctrl;
}
Index:
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/membrane/Base.fractal
diff -u
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/membrane/Base.fractal:1.1
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/membrane/Base.fractal:1.2
---
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/membrane/Base.fractal:1.1
Sat Feb 11 06:43:55 2006
+++
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/membrane/Base.fractal
Wed Feb 22 13:33:57 2006
@@ -31,7 +31,7 @@
<component name="ComponentController"
definition="org.objectweb.fractal.aokell.lib.control.component.NonCompositeComponentController"
/>
- <binding client="this.component"
server="ComponentController.component" />
+ <binding client="this.//component"
server="ComponentController.//component" />
<controller desc="mComposite" />
</definition>
Index:
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/membrane/MCompositeImpl.java
diff -u
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/membrane/MCompositeImpl.java:1.1
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/membrane/MCompositeImpl.java:1.2
---
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/membrane/MCompositeImpl.java:1.1
Sat Feb 11 06:43:55 2006
+++
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/membrane/MCompositeImpl.java
Wed Feb 22 13:33:57 2006
@@ -66,7 +66,7 @@
final public static InterfaceType CONTENT_TYPE =
new InterfaceTypeImpl(
- "//content-controller",
+ "content-controller",
ContentController.class.getName(),
false, false, false);
Index:
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/membrane/MPrimitiveImpl.java
diff -u
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/membrane/MPrimitiveImpl.java:1.1
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/membrane/MPrimitiveImpl.java:1.2
---
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/membrane/MPrimitiveImpl.java:1.1
Sat Feb 11 06:43:55 2006
+++
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/membrane/MPrimitiveImpl.java
Wed Feb 22 13:33:57 2006
@@ -32,7 +32,7 @@
import org.objectweb.fractal.aokell.lib.control.superc.SuperControllerItf;
import org.objectweb.fractal.aokell.lib.interf.Delegator;
-import
org.objectweb.fractal.aokell.lib.interf.DelegatorForBoundableMInterface;
+import
org.objectweb.fractal.aokell.lib.interf.DelegatorForBoundableInterface;
import
org.objectweb.fractal.aokell.lib.interf.DelegatorForImplementedInterface;
import org.objectweb.fractal.aokell.lib.type.InterfaceTypeImpl;
import org.objectweb.fractal.api.Component;
@@ -82,8 +82,8 @@
protected DelegatorForImplementedInterface dfii =
DelegatorForImplementedInterface.get();
- protected DelegatorForBoundableMInterface dfbi =
- DelegatorForBoundableMInterface.get();
+ protected DelegatorForBoundableInterface dfbi =
+ DelegatorForBoundableInterface.get();
protected Delegator getDelegator( InterfaceType it ) {
return it.isFcClientItf() ? (Delegator)dfbi : (Delegator)dfii;
@@ -96,7 +96,7 @@
final public static InterfaceType COMPONENT_TYPE =
new InterfaceTypeImpl(
- "//component",
+ "component",
Component.class.getName(),
false, false, false);
@@ -114,17 +114,17 @@
}
}
- if( interfaceName.equals("///content") ) {
+ if( interfaceName.equals("/content") ) {
return content;
}
/*
* Delegate the query to the component controller.
- * Needed for hidden interfaces (e.g. /content ou /desc).
+ * Needed for hidden interfaces (e.g. ///content ou ///desc).
*/
- if( ! interfaceName.equals("component") ) {
- Component compctrl = (Component) getFcInterface("component");
- return compctrl.getFcInterface(interfaceName);
+ if( ! interfaceName.equals("//component") ) {
+ Component compctrl = (Component) getFcInterface("//component");
+ return compctrl.getFcInterface(interfaceName.substring(2));
}
throw new NoSuchInterfaceException(interfaceName);
@@ -143,7 +143,7 @@
final public static InterfaceType BINDING_TYPE =
new InterfaceTypeImpl(
- "//binding-controller",
+ "binding-controller",
BindingController.class.getName(),
false, false, false);
@@ -181,7 +181,7 @@
final public static InterfaceType NAME_TYPE =
new InterfaceTypeImpl(
- "//name-controller",
+ "name-controller",
NameController.class.getName(),
false, false, false);
@@ -202,7 +202,7 @@
final public static InterfaceType SUPER_TYPE =
new InterfaceTypeImpl(
- "//super-controller",
+ "super-controller",
SuperControllerItf.class.getName(),
false, false, false);
Index:
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/membrane/composite/AutoBindingComposite.fractal
diff -u
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/membrane/composite/AutoBindingComposite.fractal:1.1
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/membrane/composite/AutoBindingComposite.fractal:1.2
---
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/membrane/composite/AutoBindingComposite.fractal:1.1
Sat Feb 11 06:43:55 2006
+++
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/membrane/composite/AutoBindingComposite.fractal
Wed Feb 22 13:33:57 2006
@@ -28,7 +28,7 @@
name="org.objectweb.fractal.aokell.lib.membrane.composite.AutoBindingComposite"
extends="org.objectweb.fractal.aokell.lib.control.content.ContentControllerType,org.objectweb.fractal.aokell.lib.control.lifecycle.LifeCycleControllerType,org.objectweb.fractal.aokell.lib.control.binding.BindingControllerType,org.objectweb.fractal.aokell.lib.control.component.ComponentControllerType,org.objectweb.fractal.aokell.lib.control.name.NameControllerType,org.objectweb.fractal.aokell.lib.control.superc.SuperControllerType"
>
- <component name="ComponentController"
+ <component name="Comp"
definition="org.objectweb.fractal.aokell.lib.control.component.CompositeComponentController"
/>
<component name="NC"
@@ -46,22 +46,22 @@
<component name="CC"
definition="org.objectweb.fractal.aokell.lib.control.content.ContentController"
/>
- <binding client="this.component"
server="ComponentController.component" />
- <binding client="this.name-controller" server="NC.name-controller" />
- <binding client="this.lifecycle-controller"
server="LC.lifecycle-controller" />
- <binding client="this.binding-controller"
server="BC.binding-controller" />
- <binding client="this.super-controller" server="SC.super-controller"
/>
- <binding client="this.content-controller"
server="CC.content-controller" />
+ <binding client="this.//component" server="Comp.//component" />
+ <binding client="this.//name-controller"
server="NC.//name-controller" />
+ <binding client="this.//lifecycle-controller"
server="LC.//lifecycle-controller" />
+ <binding client="this.//binding-controller"
server="BC.//binding-controller" />
+ <binding client="this.//super-controller"
server="SC.//super-controller" />
+ <binding client="this.//content-controller"
server="CC.//content-controller" />
- <binding client="ComponentController.binding-controller"
server="BC.binding-controller" />
- <binding client="BC.component" server="ComponentController.component"
/>
- <binding client="BC.super-controller" server="SC.super-controller" />
- <binding client="BC.name-controller" server="NC.name-controller" />
- <binding client="BC.content-controller"
server="CC.content-controller" />
- <binding client="CC.component" server="ComponentController.component"
/>
- <binding client="LC.binding-controller"
server="BC.binding-controller" />
- <binding client="LC.component" server="ComponentController.component"
/>
- <binding client="LC.content-controller"
server="CC.content-controller" />
+ <binding client="Comp.//binding-controller"
server="BC.//binding-controller" />
+ <binding client="BC.//component" server="Comp.//component" />
+ <binding client="BC.//super-controller"
server="SC.//super-controller" />
+ <binding client="BC.//name-controller" server="NC.//name-controller"
/>
+ <binding client="BC.//content-controller"
server="CC.//content-controller" />
+ <binding client="CC.//component" server="Comp.//component" />
+ <binding client="LC.//binding-controller"
server="BC.//binding-controller" />
+ <binding client="LC.//component" server="Comp.//component" />
+ <binding client="LC.//content-controller"
server="CC.//content-controller" />
<controller desc="mComposite" />
Index:
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/membrane/composite/Composite.fractal
diff -u
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/membrane/composite/Composite.fractal:1.1
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/membrane/composite/Composite.fractal:1.2
---
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/membrane/composite/Composite.fractal:1.1
Sat Feb 11 06:43:55 2006
+++
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/membrane/composite/Composite.fractal
Wed Feb 22 13:33:57 2006
@@ -28,7 +28,7 @@
name="org.objectweb.fractal.aokell.lib.membrane.composite.Composite"
extends="org.objectweb.fractal.aokell.lib.control.content.ContentControllerType,org.objectweb.fractal.aokell.lib.control.lifecycle.LifeCycleControllerType,org.objectweb.fractal.aokell.lib.control.binding.BindingControllerType,org.objectweb.fractal.aokell.lib.control.component.ComponentControllerType,org.objectweb.fractal.aokell.lib.control.name.NameControllerType,org.objectweb.fractal.aokell.lib.control.superc.SuperControllerType"
>
- <component name="ComponentController"
+ <component name="Comp"
definition="org.objectweb.fractal.aokell.lib.control.component.CompositeComponentController"
/>
<component name="NC"
@@ -46,22 +46,22 @@
<component name="CC"
definition="org.objectweb.fractal.aokell.lib.control.content.ContentController"
/>
- <binding client="this.component"
server="ComponentController.component" />
- <binding client="this.name-controller" server="NC.name-controller" />
- <binding client="this.lifecycle-controller"
server="LC.lifecycle-controller" />
- <binding client="this.binding-controller"
server="BC.binding-controller" />
- <binding client="this.super-controller" server="SC.super-controller"
/>
- <binding client="this.content-controller"
server="CC.content-controller" />
+ <binding client="this.//component" server="Comp.//component" />
+ <binding client="this.//name-controller"
server="NC.//name-controller" />
+ <binding client="this.//lifecycle-controller"
server="LC.//lifecycle-controller" />
+ <binding client="this.//binding-controller"
server="BC.//binding-controller" />
+ <binding client="this.//super-controller"
server="SC.//super-controller" />
+ <binding client="this.//content-controller"
server="CC.//content-controller" />
- <binding client="ComponentController.binding-controller"
server="BC.binding-controller" />
- <binding client="BC.component" server="ComponentController.component"
/>
- <binding client="BC.super-controller" server="SC.super-controller" />
- <binding client="BC.name-controller" server="NC.name-controller" />
- <binding client="BC.content-controller"
server="CC.content-controller" />
- <binding client="CC.component" server="ComponentController.component"
/>
- <binding client="LC.binding-controller"
server="BC.binding-controller" />
- <binding client="LC.component" server="ComponentController.component"
/>
- <binding client="LC.content-controller"
server="CC.content-controller" />
+ <binding client="Comp.//binding-controller"
server="BC.//binding-controller" />
+ <binding client="BC.//component" server="Comp.//component" />
+ <binding client="BC.//super-controller"
server="SC.//super-controller" />
+ <binding client="BC.//name-controller" server="NC.//name-controller"
/>
+ <binding client="BC.//content-controller"
server="CC.//content-controller" />
+ <binding client="CC.//component" server="Comp.//component" />
+ <binding client="LC.//binding-controller"
server="BC.//binding-controller" />
+ <binding client="LC.//component" server="Comp.//component" />
+ <binding client="LC.//content-controller"
server="CC.//content-controller" />
<controller desc="mComposite" />
Index:
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/membrane/composite/CompositeTemplate.fractal
diff -u
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/membrane/composite/CompositeTemplate.fractal:1.1
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/membrane/composite/CompositeTemplate.fractal:1.2
---
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/membrane/composite/CompositeTemplate.fractal:1.1
Sat Feb 11 06:43:55 2006
+++
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/membrane/composite/CompositeTemplate.fractal
Wed Feb 22 13:33:57 2006
@@ -28,7 +28,7 @@
name="org.objectweb.fractal.aokell.lib.membrane.composite.CompositeTemplate"
extends="org.objectweb.fractal.aokell.lib.control.factory.FactoryControllerType,org.objectweb.fractal.aokell.lib.control.content.ContentControllerType,org.objectweb.fractal.aokell.lib.control.binding.BindingControllerType,org.objectweb.fractal.aokell.lib.control.component.ComponentControllerType,org.objectweb.fractal.aokell.lib.control.name.NameControllerType,org.objectweb.fractal.aokell.lib.control.superc.SuperControllerType"
>
- <component name="ComponentController"
+ <component name="Comp"
definition="org.objectweb.fractal.aokell.lib.control.component.CompositeComponentController"
/>
<component name="NC"
@@ -46,20 +46,20 @@
<component name="FC"
definition="org.objectweb.fractal.aokell.lib.control.factory.CompositeFactoryController"
/>
- <binding client="this.component"
server="ComponentController.component" />
- <binding client="this.name-controller" server="NC.name-controller" />
- <binding client="this.binding-controller"
server="BC.binding-controller" />
- <binding client="this.super-controller" server="SC.super-controller"
/>
- <binding client="this.content-controller"
server="CC.content-controller" />
- <binding client="this.factory" server="FC.factory" />
+ <binding client="this.//component" server="Comp.//component" />
+ <binding client="this.//name-controller"
server="NC.//name-controller" />
+ <binding client="this.//binding-controller"
server="BC.//binding-controller" />
+ <binding client="this.//super-controller"
server="SC.//super-controller" />
+ <binding client="this.//content-controller"
server="CC.//content-controller" />
+ <binding client="this.//factory" server="FC.//factory" />
- <binding client="ComponentController.binding-controller"
server="BC.binding-controller" />
- <binding client="BC.component" server="ComponentController.component"
/>
- <binding client="BC.super-controller" server="SC.super-controller" />
- <binding client="BC.name-controller" server="NC.name-controller" />
- <binding client="BC.content-controller"
server="CC.content-controller" />
- <binding client="CC.component" server="ComponentController.component"
/>
- <binding client="FC.component" server="ComponentController.component"
/>
+ <binding client="Comp.//binding-controller"
server="BC.//binding-controller" />
+ <binding client="BC.//component" server="Comp.//component" />
+ <binding client="BC.//super-controller"
server="SC.//super-controller" />
+ <binding client="BC.//name-controller" server="NC.//name-controller"
/>
+ <binding client="BC.//content-controller"
server="CC.//content-controller" />
+ <binding client="CC.//component" server="Comp.//component" />
+ <binding client="FC.//component" server="Comp.//component" />
<controller desc="mComposite" />
Index:
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/membrane/composite/ParametricComposite.fractal
diff -u
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/membrane/composite/ParametricComposite.fractal:1.1
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/membrane/composite/ParametricComposite.fractal:1.2
---
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/membrane/composite/ParametricComposite.fractal:1.1
Sat Feb 11 06:43:55 2006
+++
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/membrane/composite/ParametricComposite.fractal
Wed Feb 22 13:33:57 2006
@@ -31,9 +31,7 @@
<component name="AC"
definition="org.objectweb.fractal.aokell.lib.control.attribute.AttributeController"
/>
- <binding
- client="this./attribute-controller"
- server="AC./attribute-controller" />
- <binding client="AC.component" server="ComponentController.component"
/>
+ <binding client="this.///attribute-controller"
server="AC.///attribute-controller" />
+ <binding client="AC.//component" server="Comp.//component" />
</definition>
Index:
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/membrane/composite/ParametricCompositeTemplate.fractal
diff -u
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/membrane/composite/ParametricCompositeTemplate.fractal:1.1
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/membrane/composite/ParametricCompositeTemplate.fractal:1.2
---
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/membrane/composite/ParametricCompositeTemplate.fractal:1.1
Sat Feb 11 06:43:55 2006
+++
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/membrane/composite/ParametricCompositeTemplate.fractal
Wed Feb 22 13:33:57 2006
@@ -31,7 +31,7 @@
<component name="AC"
definition="org.objectweb.fractal.aokell.lib.control.attribute.AttributeController"
/>
- <binding client="this./attribute-controller"
server="AC./attribute-controller" />
- <binding client="AC.component" server="ComponentController.component"
/>
+ <binding client="this.///attribute-controller"
server="AC.///attribute-controller" />
+ <binding client="AC.//component" server="Comp.//component" />
</definition>
Index:
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/membrane/flat/Flat.fractal
diff -u
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/membrane/flat/Flat.fractal:1.1
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/membrane/flat/Flat.fractal:1.2
---
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/membrane/flat/Flat.fractal:1.1
Sat Feb 11 06:43:53 2006
+++
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/membrane/flat/Flat.fractal
Wed Feb 22 13:33:57 2006
@@ -28,7 +28,7 @@
name="org.objectweb.fractal.aokell.lib.membrane.flat.Flat"
extends="org.objectweb.fractal.aokell.lib.control.component.ComponentControllerType,org.objectweb.fractal.aokell.lib.control.name.NameControllerType,org.objectweb.fractal.aokell.lib.control.lifecycle.LifeCycleControllerType,org.objectweb.fractal.aokell.lib.control.binding.BindingControllerType"
>
- <component name="ComponentController"
+ <component name="Comp"
definition="org.objectweb.fractal.aokell.lib.control.component.NonCompositeComponentController"
/>
<component name="NC"
@@ -40,15 +40,15 @@
<component name="BC"
definition="org.objectweb.fractal.aokell.lib.control.binding.FlatBindingController"
/>
- <binding client="this.component"
server="ComponentController.component" />
- <binding client="this.name-controller" server="NC.name-controller" />
- <binding client="this.lifecycle-controller"
server="LC.lifecycle-controller" />
- <binding client="this.binding-controller"
server="BC.binding-controller" />
+ <binding client="this.//component" server="Comp.//component" />
+ <binding client="this.//name-controller"
server="NC.//name-controller" />
+ <binding client="this.//lifecycle-controller"
server="LC.//lifecycle-controller" />
+ <binding client="this.//binding-controller"
server="BC.//binding-controller" />
- <binding client="ComponentController.binding-controller"
server="BC.binding-controller" />
- <binding client="BC.component" server="ComponentController.component"
/>
- <binding client="LC.binding-controller"
server="BC.binding-controller" />
- <binding client="LC.component" server="ComponentController.component"
/>
+ <binding client="Comp.//binding-controller"
server="BC.//binding-controller" />
+ <binding client="BC.//component" server="Comp.//component" />
+ <binding client="LC.//binding-controller"
server="BC.//binding-controller" />
+ <binding client="LC.//component" server="Comp.//component" />
<controller desc="mComposite" />
Index:
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/membrane/flat/FlatTemplate.fractal
diff -u
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/membrane/flat/FlatTemplate.fractal:1.1
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/membrane/flat/FlatTemplate.fractal:1.2
---
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/membrane/flat/FlatTemplate.fractal:1.1
Sat Feb 11 06:43:53 2006
+++
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/membrane/flat/FlatTemplate.fractal
Wed Feb 22 13:33:57 2006
@@ -28,7 +28,7 @@
name="org.objectweb.fractal.aokell.lib.membrane.flat.FlatTemplate"
extends="org.objectweb.fractal.aokell.lib.control.factory.FactoryControllerType,org.objectweb.fractal.aokell.lib.control.component.ComponentControllerType,org.objectweb.fractal.aokell.lib.control.name.NameControllerType,org.objectweb.fractal.aokell.lib.control.binding.BindingControllerType"
>
- <component name="ComponentController"
+ <component name="Comp"
definition="org.objectweb.fractal.aokell.lib.control.component.NonCompositeComponentController"
/>
<component name="NC"
@@ -40,14 +40,14 @@
<component name="FC"
definition="org.objectweb.fractal.aokell.lib.control.factory.NonCompositeFactoryController"
/>
- <binding client="this.component"
server="ComponentController.component" />
- <binding client="this.name-controller" server="NC.name-controller" />
- <binding client="this.binding-controller"
server="BC.binding-controller" />
- <binding client="this.factory" server="FC.factory" />
+ <binding client="this.//component" server="Comp.//component" />
+ <binding client="this.//name-controller"
server="NC.//name-controller" />
+ <binding client="this.//binding-controller"
server="BC.//binding-controller" />
+ <binding client="this.//factory" server="FC.//factory" />
- <binding client="ComponentController.binding-controller"
server="BC.binding-controller" />
- <binding client="BC.component" server="ComponentController.component"
/>
- <binding client="FC.component" server="ComponentController.component"
/>
+ <binding client="Comp.//binding-controller"
server="BC.//binding-controller" />
+ <binding client="BC.//component" server="Comp.//component" />
+ <binding client="FC.//component" server="Comp.//component" />
<controller desc="mComposite" />
Index:
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/membrane/flat/ParametricFlat.fractal
diff -u
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/membrane/flat/ParametricFlat.fractal:1.1
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/membrane/flat/ParametricFlat.fractal:1.2
---
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/membrane/flat/ParametricFlat.fractal:1.1
Sat Feb 11 06:43:53 2006
+++
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/membrane/flat/ParametricFlat.fractal
Wed Feb 22 13:33:57 2006
@@ -31,7 +31,7 @@
<component name="AC"
definition="org.objectweb.fractal.aokell.lib.control.attribute.AttributeController"
/>
- <binding client="this./attribute-controller"
server="AC./attribute-controller" />
- <binding client="AC.component" server="ComponentController.component"
/>
+ <binding client="this.///attribute-controller"
server="AC.///attribute-controller" />
+ <binding client="AC.//component" server="Comp.//component" />
</definition>
Index:
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/membrane/flat/ParametricFlatTemplate.fractal
diff -u
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/membrane/flat/ParametricFlatTemplate.fractal:1.1
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/membrane/flat/ParametricFlatTemplate.fractal:1.2
---
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/membrane/flat/ParametricFlatTemplate.fractal:1.1
Sat Feb 11 06:43:53 2006
+++
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/membrane/flat/ParametricFlatTemplate.fractal
Wed Feb 22 13:33:57 2006
@@ -31,7 +31,7 @@
<component name="AC"
definition="org.objectweb.fractal.aokell.lib.control.attribute.AttributeController"
/>
- <binding client="this./attribute-controller"
server="AC./attribute-controller" />
- <binding client="AC.component" server="ComponentController.component"
/>
+ <binding client="this.///attribute-controller"
server="AC.///attribute-controller" />
+ <binding client="AC.//component" server="Comp.//component" />
</definition>
Index:
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/membrane/primitive/AutoBindingPrimitive.fractal
diff -u
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/membrane/primitive/AutoBindingPrimitive.fractal:1.1
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/membrane/primitive/AutoBindingPrimitive.fractal:1.2
---
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/membrane/primitive/AutoBindingPrimitive.fractal:1.1
Sat Feb 11 06:43:57 2006
+++
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/membrane/primitive/AutoBindingPrimitive.fractal
Wed Feb 22 13:33:57 2006
@@ -28,7 +28,7 @@
name="org.objectweb.fractal.aokell.lib.membrane.primitive.AutoBindingPrimitive"
extends="org.objectweb.fractal.aokell.lib.control.lifecycle.LifeCycleControllerType,org.objectweb.fractal.aokell.lib.control.binding.BindingControllerType,org.objectweb.fractal.aokell.lib.control.component.ComponentControllerType,org.objectweb.fractal.aokell.lib.control.name.NameControllerType,org.objectweb.fractal.aokell.lib.control.superc.SuperControllerType"
>
- <component name="ComponentController"
+ <component name="Comp"
definition="org.objectweb.fractal.aokell.lib.control.component.NonCompositeComponentController"
/>
<component name="NC"
@@ -43,18 +43,18 @@
<component name="SC"
definition="org.objectweb.fractal.aokell.lib.control.superc.SuperController"
/>
- <binding client="this.component"
server="ComponentController.component" />
- <binding client="this.name-controller" server="NC.name-controller" />
- <binding client="this.lifecycle-controller"
server="LC.lifecycle-controller" />
- <binding client="this.binding-controller"
server="BC.binding-controller" />
- <binding client="this.super-controller" server="SC.super-controller"
/>
+ <binding client="this.//component" server="Comp.//component" />
+ <binding client="this.//name-controller"
server="NC.//name-controller" />
+ <binding client="this.//lifecycle-controller"
server="LC.//lifecycle-controller" />
+ <binding client="this.//binding-controller"
server="BC.//binding-controller" />
+ <binding client="this.//super-controller"
server="SC.//super-controller" />
- <binding client="ComponentController.binding-controller"
server="BC.binding-controller" />
- <binding client="BC.component" server="ComponentController.component"
/>
- <binding client="BC.super-controller" server="SC.super-controller" />
- <binding client="BC.name-controller" server="NC.name-controller" />
- <binding client="LC.binding-controller"
server="BC.binding-controller" />
- <binding client="LC.component" server="ComponentController.component"
/>
+ <binding client="Comp.//binding-controller"
server="BC.//binding-controller" />
+ <binding client="BC.//component" server="Comp.//component" />
+ <binding client="BC.//super-controller"
server="SC.//super-controller" />
+ <binding client="BC.//name-controller" server="NC.//name-controller"
/>
+ <binding client="LC.//binding-controller"
server="BC.//binding-controller" />
+ <binding client="LC.//component" server="Comp.//component" />
<controller desc="mComposite" />
Index:
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/membrane/primitive/ParametricPrimitive.fractal
diff -u
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/membrane/primitive/ParametricPrimitive.fractal:1.1
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/membrane/primitive/ParametricPrimitive.fractal:1.2
---
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/membrane/primitive/ParametricPrimitive.fractal:1.1
Sat Feb 11 06:43:57 2006
+++
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/membrane/primitive/ParametricPrimitive.fractal
Wed Feb 22 13:33:57 2006
@@ -31,7 +31,7 @@
<component name="AC"
definition="org.objectweb.fractal.aokell.lib.control.attribute.AttributeController"
/>
- <binding client="this./attribute-controller"
server="AC./attribute-controller" />
- <binding client="AC.component" server="ComponentController.component"
/>
+ <binding client="this.///attribute-controller"
server="AC.///attribute-controller" />
+ <binding client="AC.//component" server="Comp.//component" />
</definition>
Index:
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/membrane/primitive/ParametricPrimitiveTemplate.fractal
diff -u
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/membrane/primitive/ParametricPrimitiveTemplate.fractal:1.1
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/membrane/primitive/ParametricPrimitiveTemplate.fractal:1.2
---
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/membrane/primitive/ParametricPrimitiveTemplate.fractal:1.1
Sat Feb 11 06:43:57 2006
+++
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/membrane/primitive/ParametricPrimitiveTemplate.fractal
Wed Feb 22 13:33:57 2006
@@ -31,7 +31,7 @@
<component name="AC"
definition="org.objectweb.fractal.aokell.lib.control.attribute.AttributeController"
/>
- <binding client="this./attribute-controller"
server="AC./attribute-controller" />
- <binding client="AC.component" server="ComponentController.component"
/>
+ <binding client="this.///attribute-controller"
server="AC.///attribute-controller" />
+ <binding client="AC.//component" server="Comp.//component" />
</definition>
Index:
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/membrane/primitive/Primitive.fractal
diff -u
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/membrane/primitive/Primitive.fractal:1.1
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/membrane/primitive/Primitive.fractal:1.2
---
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/membrane/primitive/Primitive.fractal:1.1
Sat Feb 11 06:43:57 2006
+++
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/membrane/primitive/Primitive.fractal
Wed Feb 22 13:33:57 2006
@@ -28,7 +28,7 @@
name="org.objectweb.fractal.aokell.lib.membrane.primitive.Primitive"
extends="org.objectweb.fractal.aokell.lib.control.lifecycle.LifeCycleControllerType,org.objectweb.fractal.aokell.lib.control.binding.BindingControllerType,org.objectweb.fractal.aokell.lib.control.component.ComponentControllerType,org.objectweb.fractal.aokell.lib.control.name.NameControllerType,org.objectweb.fractal.aokell.lib.control.superc.SuperControllerType"
>
- <component name="ComponentController"
+ <component name="Comp"
definition="org.objectweb.fractal.aokell.lib.control.component.NonCompositeComponentController"
/>
<component name="NC"
@@ -43,18 +43,18 @@
<component name="SC"
definition="org.objectweb.fractal.aokell.lib.control.superc.SuperController"
/>
- <binding client="this.component"
server="ComponentController.component" />
- <binding client="this.name-controller" server="NC.name-controller" />
- <binding client="this.lifecycle-controller"
server="LC.lifecycle-controller" />
- <binding client="this.binding-controller"
server="BC.binding-controller" />
- <binding client="this.super-controller" server="SC.super-controller"
/>
+ <binding client="this.//component" server="Comp.//component" />
+ <binding client="this.//name-controller"
server="NC.//name-controller" />
+ <binding client="this.//lifecycle-controller"
server="LC.//lifecycle-controller" />
+ <binding client="this.//binding-controller"
server="BC.//binding-controller" />
+ <binding client="this.//super-controller"
server="SC.//super-controller" />
- <binding client="ComponentController.binding-controller"
server="BC.binding-controller" />
- <binding client="BC.component" server="ComponentController.component"
/>
- <binding client="BC.super-controller" server="SC.super-controller" />
- <binding client="BC.name-controller" server="NC.name-controller" />
- <binding client="LC.binding-controller"
server="BC.binding-controller" />
- <binding client="LC.component" server="ComponentController.component"
/>
+ <binding client="Comp.//binding-controller"
server="BC.//binding-controller" />
+ <binding client="BC.//component" server="Comp.//component" />
+ <binding client="BC.//super-controller"
server="SC.//super-controller" />
+ <binding client="BC.//name-controller" server="NC.//name-controller"
/>
+ <binding client="LC.//binding-controller"
server="BC.//binding-controller" />
+ <binding client="LC.//component" server="Comp.//component" />
<controller desc="mComposite" />
Index:
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/membrane/primitive/PrimitiveTemplate.fractal
diff -u
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/membrane/primitive/PrimitiveTemplate.fractal:1.1
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/membrane/primitive/PrimitiveTemplate.fractal:1.2
---
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/membrane/primitive/PrimitiveTemplate.fractal:1.1
Sat Feb 11 06:43:57 2006
+++
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/membrane/primitive/PrimitiveTemplate.fractal
Wed Feb 22 13:33:57 2006
@@ -28,7 +28,7 @@
name="org.objectweb.fractal.aokell.lib.membrane.primitive.PrimitiveTemplate"
extends="org.objectweb.fractal.aokell.lib.control.factory.FactoryControllerType,org.objectweb.fractal.aokell.lib.control.binding.BindingControllerType,org.objectweb.fractal.aokell.lib.control.component.ComponentControllerType,org.objectweb.fractal.aokell.lib.control.name.NameControllerType,org.objectweb.fractal.aokell.lib.control.superc.SuperControllerType"
>
- <component name="ComponentController"
+ <component name="Comp"
definition="org.objectweb.fractal.aokell.lib.control.component.NonCompositeComponentController"
/>
<component name="NC"
@@ -43,17 +43,17 @@
<component name="FC"
definition="org.objectweb.fractal.aokell.lib.control.factory.NonCompositeFactoryController"
/>
- <binding client="this.component"
server="ComponentController.component" />
- <binding client="this.name-controller" server="NC.name-controller" />
- <binding client="this.binding-controller"
server="BC.binding-controller" />
- <binding client="this.super-controller" server="SC.super-controller"
/>
- <binding client="this.factory" server="FC.factory" />
+ <binding client="this.//component" server="Comp.//component" />
+ <binding client="this.//name-controller"
server="NC.//name-controller" />
+ <binding client="this.//binding-controller"
server="BC.//binding-controller" />
+ <binding client="this.//super-controller"
server="SC.//super-controller" />
+ <binding client="this.//factory" server="FC.//factory" />
- <binding client="ComponentController.binding-controller"
server="BC.binding-controller" />
- <binding client="BC.component" server="ComponentController.component"
/>
- <binding client="BC.super-controller" server="SC.super-controller" />
- <binding client="BC.name-controller" server="NC.name-controller" />
- <binding client="FC.component" server="ComponentController.component"
/>
+ <binding client="Comp.//binding-controller"
server="BC.//binding-controller" />
+ <binding client="BC.//component" server="Comp.//component" />
+ <binding client="BC.//super-controller"
server="SC.//super-controller" />
+ <binding client="BC.//name-controller" server="NC.//name-controller"
/>
+ <binding client="FC.//component" server="Comp.//component" />
<controller desc="mComposite" />
Index:
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/util/MFractalHelper.java
diff -u
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/util/MFractalHelper.java:1.2
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/util/MFractalHelper.java:1.3
---
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/util/MFractalHelper.java:1.2
Mon Feb 20 16:25:49 2006
+++
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/util/MFractalHelper.java
Wed Feb 22 13:33:57 2006
@@ -49,7 +49,7 @@
*/
public static BindingController getBindingController(Component c) {
return (BindingController)
- FractalHelper.getFcInterface(c,"//binding-controller");
+ FractalHelper.getFcInterface(c,"binding-controller");
}
/**
@@ -58,7 +58,7 @@
*/
public static ContentController getContentController(Component c) {
return (ContentController)
- FractalHelper.getFcInterface(c,"//content-controller");
+ FractalHelper.getFcInterface(c,"content-controller");
}
/**
@@ -67,7 +67,7 @@
*/
public static SuperControllerItf getSuperController(Component c) {
return (SuperControllerItf)
- FractalHelper.getFcInterface(c,"//super-controller");
+ FractalHelper.getFcInterface(c,"super-controller");
}
/**
@@ -76,11 +76,11 @@
*/
public static NameController getNameController(Component c) {
return (NameController)
- FractalHelper.getFcInterface(c,"//name-controller");
+ FractalHelper.getFcInterface(c,"name-controller");
}
public static Object getContent(Component c) {
- return FractalHelper.getFcInterface(c,"///content");
+ return FractalHelper.getFcInterface(c,"/content");
}
/**
@@ -133,7 +133,7 @@
try {
ContentController cc =
- (ContentController) c.getFcInterface("//content-controller");
+ (ContentController) c.getFcInterface("content-controller");
Component[] subs = cc.getFcSubComponents();
for (int i = 0; i < subs.length; i++) {
addAllSubComponents(subs[i],l);
Index:
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/util/MembraneHelper.java
diff -u
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/util/MembraneHelper.java:1.3
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/util/MembraneHelper.java:1.4
---
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/util/MembraneHelper.java:1.3
Wed Feb 15 07:32:21 2006
+++
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/util/MembraneHelper.java
Wed Feb 22 13:33:57 2006
@@ -48,7 +48,7 @@
public static Component getFcCompCtrlImpl( Component comp ) {
Interface itf =
- (Interface) FractalHelper.getFcInterface(comp,"component");
+ (Interface) FractalHelper.getFcInterface(comp,"//component");
Interface last = MFractalHelper.followBindingsUpToLastInterface(itf);
Component c = last.getFcItfOwner();
Object content = MFractalHelper.getContent(c);
@@ -89,7 +89,7 @@
* component.
*/
public static ComponentItf getFcCompCtrl( Component comp ) {
- return (ComponentItf) FractalHelper.getFcInterface(comp,"component");
+ return (ComponentItf)
FractalHelper.getFcInterface(comp,"//component");
}
/**
@@ -97,7 +97,7 @@
* component.
*/
public static BindingControllerItf getFcBindingCtrl( Component comp ) {
- return FractalHelper.getBindingController(comp);
+ return (BindingControllerItf)
FractalHelper.getFcInterface(comp,"//binding-controller");
}
/**
@@ -105,7 +105,7 @@
* component.
*/
public static ContentControllerItf getFcContentCtrl( Component comp ) {
- return FractalHelper.getContentController(comp);
+ return (ContentControllerItf)
FractalHelper.getFcInterface(comp,"//content-controller");
}
/**
@@ -113,13 +113,23 @@
* component.
*/
public static LifeCycleControllerItf getFcLifeCycleCtrl( Component comp
) {
- return FractalHelper.getLifeCycleController(comp);
+ return (LifeCycleControllerItf)
FractalHelper.getFcInterface(comp,"//lifecycle-controller");
}
/**
* Return the super controller reference associated to the given
component.
*/
public static SuperControllerItf getFcSuperCtrl( Component comp ) {
- return FractalHelper.getSuperController(comp);
+ return (SuperControllerItf)
FractalHelper.getFcInterface(comp,"//super-controller");
+ }
+
+ /**
+ * Return the content associated to the given component.
+ * With componentized membranes, the given component is a meta-component
+ * (i.e. component instance associated to a control-component). The
return
+ * value is the content (M0 instance) controlled by the
control-component.
+ */
+ public static Object getFcContent( Component comp ) {
+ return FractalHelper.getFcInterface(comp,"///content");
}
}
Index:
aokell/src/org/objectweb/fractal/aokell/lib/control/attribute/AttributeControllerImpl.java
diff -u
aokell/src/org/objectweb/fractal/aokell/lib/control/attribute/AttributeControllerImpl.java:1.1
aokell/src/org/objectweb/fractal/aokell/lib/control/attribute/AttributeControllerImpl.java:1.2
---
aokell/src/org/objectweb/fractal/aokell/lib/control/attribute/AttributeControllerImpl.java:1.1
Sat Feb 11 06:43:55 2006
+++
aokell/src/org/objectweb/fractal/aokell/lib/control/attribute/AttributeControllerImpl.java
Wed Feb 22 13:33:58 2006
@@ -32,6 +32,7 @@
import org.objectweb.fractal.aokell.lib.control.CloneCtrlException;
import org.objectweb.fractal.aokell.lib.control.Controller;
import org.objectweb.fractal.aokell.lib.util.FractalHelper;
+import org.objectweb.fractal.aokell.lib.util.MembraneHelper;
import org.objectweb.fractal.api.Component;
import org.objectweb.fractal.api.control.AttributeController;
@@ -114,7 +115,7 @@
public void cloneFcCtrl( Component dst, Object hints )
throws CloneCtrlException {
- Object contentPart = FractalHelper.getContent(compctrl);
+ Object contentPart = MembraneHelper.getFcContent(compctrl);
Object dstContentPart = FractalHelper.getContent(dst);
try {
Index:
aokell/src/org/objectweb/fractal/aokell/lib/control/binding/AbstractBindingControllerImpl.java
diff -u
aokell/src/org/objectweb/fractal/aokell/lib/control/binding/AbstractBindingControllerImpl.java:1.4
aokell/src/org/objectweb/fractal/aokell/lib/control/binding/AbstractBindingControllerImpl.java:1.5
---
aokell/src/org/objectweb/fractal/aokell/lib/control/binding/AbstractBindingControllerImpl.java:1.4
Wed Feb 15 02:53:02 2006
+++
aokell/src/org/objectweb/fractal/aokell/lib/control/binding/AbstractBindingControllerImpl.java
Wed Feb 22 13:33:57 2006
@@ -82,11 +82,11 @@
public String[] listFc() {
/*
- * For Julia-like components, notify the content. AspectJ-like
- * components can not be notified: the control interface is directly
- * introduced into the content.
+ * For Julia-like components, notify the content. AO components can
not
+ * be notified: the control interface is directly introduced into the
+ * content.
*/
- Object contentPart = FractalHelper.getContent(compctrl);
+ Object contentPart = MembraneHelper.getFcContent(compctrl);
if( ! (contentPart instanceof BindingType) &&
contentPart instanceof BindingController ) {
((BindingController)contentPart).listFc();
@@ -124,11 +124,11 @@
public Object lookupFc(String arg0) throws NoSuchInterfaceException {
/*
- * For Julia-like components, notify the content. AspectJ-like
- * components can not be notified: the control interface is directly
- * introduced into the content.
+ * For Julia-like components, notify the content. AO components can
not
+ * be notified: the control interface is directly introduced into the
+ * content.
*/
- Object contentPart = FractalHelper.getContent(compctrl);
+ Object contentPart = MembraneHelper.getFcContent(compctrl);
if( ! (contentPart instanceof BindingType) &&
contentPart instanceof BindingController ) {
try {
@@ -233,11 +233,11 @@
protected void bindFcContent(String arg0, Object arg1) {
/*
- * For Julia-like components, notify the content. AspectJ-like
- * components can not be notified: the control interface is directly
- * introduced into the content.
+ * For Julia-like components, notify the content. AO components can
not
+ * be notified: the control interface is directly introduced into the
+ * content.
*/
- Object contentPart = FractalHelper.getContent(compctrl);
+ Object contentPart = MembraneHelper.getFcContent(compctrl);
if( ! (contentPart instanceof BindingType) &&
contentPart instanceof BindingController ) {
try {
@@ -268,11 +268,11 @@
IllegalLifeCycleException {
/*
- * For Julia-like components, notify the content. AspectJ-like
- * components can not be notified: the control interface is directly
- * introduced into the content.
+ * For Julia-like components, notify the content. AO components can
not
+ * be notified: the control interface is directly introduced into the
+ * content.
*/
- Object contentPart = FractalHelper.getContent(compctrl);
+ Object contentPart = MembraneHelper.getFcContent(compctrl);
if( ! (contentPart instanceof BindingType) &&
contentPart instanceof BindingController ) {
try {
Index:
aokell/src/org/objectweb/fractal/aokell/lib/control/binding/CompositeAutoBindingControllerImpl.java
diff -u
aokell/src/org/objectweb/fractal/aokell/lib/control/binding/CompositeAutoBindingControllerImpl.java:1.1
aokell/src/org/objectweb/fractal/aokell/lib/control/binding/CompositeAutoBindingControllerImpl.java:1.2
---
aokell/src/org/objectweb/fractal/aokell/lib/control/binding/CompositeAutoBindingControllerImpl.java:1.1
Sat Feb 11 06:43:52 2006
+++
aokell/src/org/objectweb/fractal/aokell/lib/control/binding/CompositeAutoBindingControllerImpl.java
Wed Feb 22 13:33:57 2006
@@ -23,6 +23,7 @@
package org.objectweb.fractal.aokell.lib.control.binding;
+import org.objectweb.fractal.aokell.lib.util.MembraneHelper;
import org.objectweb.fractal.api.Component;
import org.objectweb.fractal.api.Interface;
import org.objectweb.fractal.api.NoSuchInterfaceException;
@@ -76,9 +77,8 @@
String sItfName = clientItfType.getFcItfName();
ContentController cc;
try {
- cc = (ContentController)
- compctrl.getFcInterface("content-controller");
- } catch (NoSuchInterfaceException e) {
+ cc = MembraneHelper.getFcContentCtrl(compctrl);
+ } catch (RuntimeException e) {
cc = null;
}
if (cc != null && !clientItfName.equals(sItfName)) {
@@ -153,9 +153,8 @@
if (clientItfType.isFcCollectionItf()) {
ContentController cc;
try {
- cc = (ContentController)
- compctrl.getFcInterface("content-controller");
- } catch (NoSuchInterfaceException e) {
+ cc = MembraneHelper.getFcContentCtrl(compctrl);
+ } catch (RuntimeException e) {
return;
}
String sItfName = clientItfType.getFcItfName();
Index:
aokell/src/org/objectweb/fractal/aokell/lib/control/binding/PrimitiveAutoBindingControllerImpl.java
diff -u
aokell/src/org/objectweb/fractal/aokell/lib/control/binding/PrimitiveAutoBindingControllerImpl.java:1.1
aokell/src/org/objectweb/fractal/aokell/lib/control/binding/PrimitiveAutoBindingControllerImpl.java:1.2
---
aokell/src/org/objectweb/fractal/aokell/lib/control/binding/PrimitiveAutoBindingControllerImpl.java:1.1
Sat Feb 11 06:43:52 2006
+++
aokell/src/org/objectweb/fractal/aokell/lib/control/binding/PrimitiveAutoBindingControllerImpl.java
Wed Feb 22 13:33:57 2006
@@ -23,6 +23,7 @@
package org.objectweb.fractal.aokell.lib.control.binding;
+import org.objectweb.fractal.aokell.lib.util.MembraneHelper;
import org.objectweb.fractal.api.Component;
import org.objectweb.fractal.api.Interface;
import org.objectweb.fractal.api.NoSuchInterfaceException;
@@ -76,9 +77,8 @@
String sItfName = clientItfType.getFcItfName();
ContentController cc;
try {
- cc = (ContentController)
- compctrl.getFcInterface("content-controller");
- } catch (NoSuchInterfaceException e) {
+ cc = MembraneHelper.getFcContentCtrl(compctrl);
+ } catch (RuntimeException e) {
cc = null;
}
if (cc != null && !clientItfName.equals(sItfName)) {
@@ -153,9 +153,8 @@
if (clientItfType.isFcCollectionItf()) {
ContentController cc;
try {
- cc = (ContentController)
- compctrl.getFcInterface("content-controller");
- } catch (NoSuchInterfaceException e) {
+ cc = MembraneHelper.getFcContentCtrl(compctrl);
+ } catch (RuntimeException e) {
return;
}
String sItfName = clientItfType.getFcItfName();
| <-- Date Index --> | <-- Thread Index --> |
Powered by MHonArc.
Copyright © 2006-2007, OW2 Consortium | contact | webmaster.