CVS update of aokell (3 files)

[Lionel Seinturier <seintur@xxxxxxxxxxxxxxxxxxxxxxxxx>]

    Date: Tuesday, March 28, 2006 @ 00:42:09
  Author: seintur
    Path: /cvsroot/fractal/aokell

Modified: 
features/membrane/oo/src/org/objectweb/fractal/aokell/lib/factory/MembraneFactoryImpl.java
          
          
src/org/objectweb/fractal/aokell/lib/control/component/ComponentImpl.java
          
          
src/org/objectweb/fractal/aokell/lib/control/component/ComponentItf.java

Initialize the component controller in just one method call.


--------------------------------------------------------------------------------------------+
 
features/membrane/oo/src/org/objectweb/fractal/aokell/lib/factory/MembraneFactoryImpl.java
 |   11 +-----
 src/org/objectweb/fractal/aokell/lib/control/component/ComponentImpl.java    
              |   18 +++-------
 src/org/objectweb/fractal/aokell/lib/control/component/ComponentItf.java     
              |   13 +------
 3 files changed, 11 insertions(+), 31 deletions(-)


Index: 
aokell/features/membrane/oo/src/org/objectweb/fractal/aokell/lib/factory/MembraneFactoryImpl.java
diff -u 
aokell/features/membrane/oo/src/org/objectweb/fractal/aokell/lib/factory/MembraneFactoryImpl.java:1.6
 
aokell/features/membrane/oo/src/org/objectweb/fractal/aokell/lib/factory/MembraneFactoryImpl.java:1.7
--- 
aokell/features/membrane/oo/src/org/objectweb/fractal/aokell/lib/factory/MembraneFactoryImpl.java:1.6
       Mon Mar 27 10:33:56 2006
+++ 
aokell/features/membrane/oo/src/org/objectweb/fractal/aokell/lib/factory/MembraneFactoryImpl.java
   Tue Mar 28 00:42:08 2006
@@ -55,26 +55,19 @@
     throws InstantiationException {
         
         /*
-         * Create the component controller.
+         * Create and initialize the component controller.
          */
         ComponentItf compctrl = newFcComponentController(controllerDesc);
+        compctrl.initFc(type,controllerDesc,contentDesc,content);
         
         /*
          * Link the content part and the component controller.
          */
-        compctrl.setContentPart(content);
         if( content instanceof BaseType ) {
             ((BaseType) content).setFcComponent(compctrl);
         }
         
         /*
-         * Set the attributes exported by the component controller.
-         */
-        compctrl.setType(type);
-        compctrl.setControllerDesc(controllerDesc);
-        compctrl.setContentDesc(contentDesc);
-        
-        /*
          * Initialize the controllers.
          */
         initFcControllers(controllerDesc,compctrl);
Index: 
aokell/src/org/objectweb/fractal/aokell/lib/control/component/ComponentImpl.java
diff -u 
aokell/src/org/objectweb/fractal/aokell/lib/control/component/ComponentImpl.java:1.6
 
aokell/src/org/objectweb/fractal/aokell/lib/control/component/ComponentImpl.java:1.7
--- 
aokell/src/org/objectweb/fractal/aokell/lib/control/component/ComponentImpl.java:1.6
        Wed Mar  8 16:54:08 2006
+++ 
aokell/src/org/objectweb/fractal/aokell/lib/control/component/ComponentImpl.java
    Tue Mar 28 00:42:08 2006
@@ -265,16 +265,14 @@
     // Implementation of the ComponentItf interface
     // ------------------------------------------------------------------
         
-    public void setType(Type type) {
+    public void initFc(
+            Type type, Object controllerDesc, Object contentDesc,
+            Object contentPart ) {
+        
         this.type = type;
-    }
-
-    public void setContentDesc(Object contentDesc) {
-        this.contentDesc = contentDesc;
-    }
-
-    public void setControllerDesc(Object controllerDesc) {
         this.controllerDesc = controllerDesc;
+        this.contentDesc = contentDesc;
+        this.contentPart = contentPart;
     }
     
     // <InterfaceType,Object>
@@ -524,10 +522,6 @@
 
     private Object contentPart;
     
-    public void setContentPart( Object contentPart ) {
-        this.contentPart = contentPart;
-    }
-    
     protected Object getContentPart() {
         return contentPart;
     }
Index: 
aokell/src/org/objectweb/fractal/aokell/lib/control/component/ComponentItf.java
diff -u 
aokell/src/org/objectweb/fractal/aokell/lib/control/component/ComponentItf.java:1.2
 
aokell/src/org/objectweb/fractal/aokell/lib/control/component/ComponentItf.java:1.3
--- 
aokell/src/org/objectweb/fractal/aokell/lib/control/component/ComponentItf.java:1.2
 Thu Feb 23 14:04:44 2006
+++ 
aokell/src/org/objectweb/fractal/aokell/lib/control/component/ComponentItf.java
     Tue Mar 28 00:42:08 2006
@@ -58,11 +58,6 @@
     public void addFcController( InterfaceType it, Object ctrl );
 
     /**
-     * Set the content associated to this component.
-     */
-    public void setContentPart( Object contentPart );
-
-    /**
      * Return the list of client interfaces implemented by this component.
      */
     public List getFcSingletonClientInterfaces();
@@ -98,9 +93,7 @@
      */
     public List getFcCollectionInterfaces();
 
-    public void setType(Type type);
-
-    public void setControllerDesc(Object controllerDesc);
-
-    public void setContentDesc(Object contentDesc);    
+    public void initFc(
+            Type type, Object controllerDesc, Object contentDesc,
+            Object contentPart );
 }