CVS update of aokell (2 files)

[Lionel Seinturier <seintur@xxxxxxxxxxxxxxxxxxxxxxxxx>]

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

Modified: 
features/membrane/comp/src/org/objectweb/fractal/aokell/lib/util/MembraneHelper.java
          
          
src/org/objectweb/fractal/aokell/lib/control/factory/AbstractFactoryImpl.java

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


--------------------------------------------------------------------------------------+
 
features/membrane/comp/src/org/objectweb/fractal/aokell/lib/util/MembraneHelper.java
 |    3 +--
 
src/org/objectweb/fractal/aokell/lib/control/factory/AbstractFactoryImpl.java 
       |    8 +++++---
 2 files changed, 6 insertions(+), 5 deletions(-)


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.4
 
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/util/MembraneHelper.java:1.5
--- 
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/util/MembraneHelper.java:1.4
     Wed Feb 22 13:33:57 2006
+++ 
aokell/features/membrane/comp/src/org/objectweb/fractal/aokell/lib/util/MembraneHelper.java
 Thu Feb 23 14:31:02 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;
@@ -59,7 +58,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/factory/AbstractFactoryImpl.java
diff -u 
aokell/src/org/objectweb/fractal/aokell/lib/control/factory/AbstractFactoryImpl.java:1.2
 
aokell/src/org/objectweb/fractal/aokell/lib/control/factory/AbstractFactoryImpl.java:1.3
--- 
aokell/src/org/objectweb/fractal/aokell/lib/control/factory/AbstractFactoryImpl.java:1.2
    Wed Feb 15 02:22:15 2006
+++ 
aokell/src/org/objectweb/fractal/aokell/lib/control/factory/AbstractFactoryImpl.java
        Thu Feb 23 14:31:02 2006
@@ -163,11 +163,13 @@
             ComponentItf c = (ComponentItf) entry.getKey();
             Component newC = (Component) entry.getValue();
             
-            Controller[] ctrls = MembraneHelper.getFcControllers(c);
+            Object[] ctrls = MembraneHelper.getFcControllers(c);
             
             for( int i = 0; i < ctrls.length; i++ ) {
-                Controller ctrl = ctrls[i];
-                cloneFcCtrl(newContent,order,rank,newC,ctrl);
+                if( ctrls[i] instanceof Controller ) {
+                    Controller ctrl = (Controller) ctrls[i];
+                    cloneFcCtrl(newContent,order,rank,newC,ctrl);
+                }
             }
         }
     }