CVS update of aokell (4 files)

[Lionel Seinturier <seintur@xxxxxxxxxxxxxxxxxxxxxxxxx>]

    Date: Thursday, February 23, 2006 @ 14:04:44
  Author: seintur
    Path: /cvsroot/fractal/aokell

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

It is no longer necessary for controllers to implement the Controller 
interface.
Controllers may be instances of any type.


--------------------------------------------------------------------------------------------+
 
features/membrane/oo/src/org/objectweb/fractal/aokell/lib/factory/MembraneFactoryImpl.java
 |   10 ++++++----
 
features/membrane/oo/src/org/objectweb/fractal/aokell/lib/util/MembraneHelper.java
         |    3 +--
 src/org/objectweb/fractal/aokell/lib/control/component/ComponentImpl.java    
              |    9 +++++----
 src/org/objectweb/fractal/aokell/lib/control/component/ComponentItf.java     
              |    5 ++---
 4 files changed, 14 insertions(+), 13 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.1
 
aokell/features/membrane/oo/src/org/objectweb/fractal/aokell/lib/factory/MembraneFactoryImpl.java:1.2
--- 
aokell/features/membrane/oo/src/org/objectweb/fractal/aokell/lib/factory/MembraneFactoryImpl.java:1.1
       Sat Feb 11 06:43:58 2006
+++ 
aokell/features/membrane/oo/src/org/objectweb/fractal/aokell/lib/factory/MembraneFactoryImpl.java
   Thu Feb 23 14:04:44 2006
@@ -141,15 +141,17 @@
             
             // Skip the component controller
             if( ! Component.class.isAssignableFrom(ctrlcl) ) {
-                Controller ctrl = null;
+                Object ctrl = null;
                 try {
-                    ctrl = (Controller) ctrlcl.newInstance();
+                    ctrl = ctrlcl.newInstance();
                 }
                 catch( Exception e ) {
                     throw new InstantiationException(e.getMessage());
                 }
-                ctrl.setFcCompCtrl(compctrl);
-                ctrl.initFcCtrl();
+                if( ctrl instanceof Controller ) {
+                    ((Controller)ctrl).setFcCompCtrl(compctrl);
+                    ((Controller)ctrl).initFcCtrl();
+                }
                 compctrl.addFcController(mdef.ctrls[i].type,ctrl);
             }
         }
Index: 
aokell/features/membrane/oo/src/org/objectweb/fractal/aokell/lib/util/MembraneHelper.java
diff -u 
aokell/features/membrane/oo/src/org/objectweb/fractal/aokell/lib/util/MembraneHelper.java:1.7
 
aokell/features/membrane/oo/src/org/objectweb/fractal/aokell/lib/util/MembraneHelper.java:1.8
--- 
aokell/features/membrane/oo/src/org/objectweb/fractal/aokell/lib/util/MembraneHelper.java:1.7
       Wed Feb 22 13:41:24 2006
+++ 
aokell/features/membrane/oo/src/org/objectweb/fractal/aokell/lib/util/MembraneHelper.java
   Thu Feb 23 14:04:44 2006
@@ -23,7 +23,6 @@
 
 package org.objectweb.fractal.aokell.lib.util;
 
-import org.objectweb.fractal.aokell.lib.control.Controller;
 import org.objectweb.fractal.aokell.lib.control.binding.BindingControllerItf;
 import org.objectweb.fractal.aokell.lib.control.component.ComponentItf;
 import org.objectweb.fractal.aokell.lib.control.content.ContentControllerItf;
@@ -53,7 +52,7 @@
     /**
      * Return the controllers associated to the given component.
      */
-    public static Controller[] getFcControllers( Component comp ) {
+    public static Object[] getFcControllers( Component comp ) {
         return ((ComponentItf)comp).getFcControllers();
     }
     
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.1
 
aokell/src/org/objectweb/fractal/aokell/lib/control/component/ComponentImpl.java:1.2
--- 
aokell/src/org/objectweb/fractal/aokell/lib/control/component/ComponentImpl.java:1.1
        Sat Feb 11 06:43:55 2006
+++ 
aokell/src/org/objectweb/fractal/aokell/lib/control/component/ComponentImpl.java
    Thu Feb 23 14:04:44 2006
@@ -279,21 +279,22 @@
         this.controllerDesc = controllerDesc;
     }
     
-    // <InterfaceType,Controller>
+    // <InterfaceType,Object>
+    // Not all controllers implements Controller (hence Object)
     private Map ctrls = new HashMap();
     
     /**
      * Return the array of control interfaces implemented by the component.
      */
-    public Controller[] getFcControllers() {
+    public Object[] getFcControllers() {
         Collection values = ctrls.values();
-        return (Controller[]) values.toArray( new Controller[values.size()] 
);
+        return values.toArray();
     }
 
     /**
      * Declare a new controller implemented by the component.
      */
-    public void addFcController( InterfaceType it, Controller ctrl ) {
+    public void addFcController( InterfaceType it, Object ctrl ) {
         ctrls.put(it,ctrl);
     }
     
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.1
 
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.1
 Sat Feb 11 06:43:55 2006
+++ 
aokell/src/org/objectweb/fractal/aokell/lib/control/component/ComponentItf.java
     Thu Feb 23 14:04:44 2006
@@ -25,7 +25,6 @@
 
 import java.util.List;
 
-import org.objectweb.fractal.aokell.lib.control.Controller;
 import org.objectweb.fractal.aokell.lib.type.InterfaceTypeImpl;
 import org.objectweb.fractal.api.Component;
 import org.objectweb.fractal.api.NoSuchInterfaceException;
@@ -51,12 +50,12 @@
     /**
      * Return the list of controllers implemented by the component.
      */
-    public Controller[] getFcControllers();
+    public Object[] getFcControllers();
     
     /**
      * Declare a new controller implemented by the component.
      */
-    public void addFcController( InterfaceType it, Controller ctrl );
+    public void addFcController( InterfaceType it, Object ctrl );
 
     /**
      * Set the content associated to this component.