CVS update of aokell/features/membrane/oo/src/org/objectweb/fractal/aokell/lib (3 files)

[Lionel Seinturier <seintur@xxxxxxxxxxxxxxxxxxxxxxxxx>]

    Date: Friday, March 24, 2006 @ 13:04:53
  Author: seintur
    Path: .../aokell/features/membrane/oo/src/org/objectweb/fractal/aokell/lib

Modified: factory/MembraneFactoryImpl.java membrane/ControllerDef.java
          membrane/MembraneDef.java

Privatize ControllerDef fields.


----------------------------------+
 factory/MembraneFactoryImpl.java |    8 ++++----
 membrane/ControllerDef.java      |   12 ++++++++++--
 membrane/MembraneDef.java        |    4 ++--
 3 files changed, 16 insertions(+), 8 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.4
 
aokell/features/membrane/oo/src/org/objectweb/fractal/aokell/lib/factory/MembraneFactoryImpl.java:1.5
--- 
aokell/features/membrane/oo/src/org/objectweb/fractal/aokell/lib/factory/MembraneFactoryImpl.java:1.4
       Thu Mar 23 13:40:44 2006
+++ 
aokell/features/membrane/oo/src/org/objectweb/fractal/aokell/lib/factory/MembraneFactoryImpl.java
   Fri Mar 24 13:04:53 2006
@@ -107,7 +107,7 @@
         ComponentItf compctrl = null;
         
         for (int i = 0; i < ctrls.length; i++) {
-            Class ctrlcl = ctrls[i].impl;
+            Class ctrlcl = ctrls[i].getImpl();
             
             if( Component.class.isAssignableFrom(ctrlcl) ) {
                 Controller ctrl = null;
@@ -120,7 +120,7 @@
                 compctrl = (ComponentItf) ctrl;
                 ctrl.setFcCompCtrl(compctrl);
                 ctrl.initFcCtrl();
-                compctrl.addFcController(ctrls[i].type,ctrl);
+                compctrl.addFcController(ctrls[i].getType(),ctrl);
             }
         }
         
@@ -139,7 +139,7 @@
         ControllerDef[] ctrls = mdef.getCtrls();
         
         for (int i = 0; i < ctrls.length; i++) {
-            Class ctrlcl = ctrls[i].impl;
+            Class ctrlcl = ctrls[i].getImpl();
             
             // Skip the component controller
             if( ! Component.class.isAssignableFrom(ctrlcl) ) {
@@ -154,7 +154,7 @@
                     ((Controller)ctrl).setFcCompCtrl(compctrl);
                     ((Controller)ctrl).initFcCtrl();
                 }
-                compctrl.addFcController(ctrls[i].type,ctrl);
+                compctrl.addFcController(ctrls[i].getType(),ctrl);
             }
         }
         
Index: 
aokell/features/membrane/oo/src/org/objectweb/fractal/aokell/lib/membrane/ControllerDef.java
diff -u 
aokell/features/membrane/oo/src/org/objectweb/fractal/aokell/lib/membrane/ControllerDef.java:1.2
 
aokell/features/membrane/oo/src/org/objectweb/fractal/aokell/lib/membrane/ControllerDef.java:1.3
--- 
aokell/features/membrane/oo/src/org/objectweb/fractal/aokell/lib/membrane/ControllerDef.java:1.2
    Wed Mar  8 19:07:53 2006
+++ 
aokell/features/membrane/oo/src/org/objectweb/fractal/aokell/lib/membrane/ControllerDef.java
        Fri Mar 24 13:04:53 2006
@@ -34,13 +34,21 @@
 public class ControllerDef {
     
     /** The Fractal type implemented by the controller. */
-    public InterfaceType type;
+    private InterfaceType type;
     
     /** The class implementating the controller. */
-    public Class impl;
+    private Class impl;
     
     public ControllerDef( InterfaceType type, Class impl ) {
         this.type = type;
         this.impl = impl;
     }
+    
+    public InterfaceType getType() {
+        return type;
+    }
+    
+    public Class getImpl() {
+        return impl;
+    }
 }
Index: 
aokell/features/membrane/oo/src/org/objectweb/fractal/aokell/lib/membrane/MembraneDef.java
diff -u 
aokell/features/membrane/oo/src/org/objectweb/fractal/aokell/lib/membrane/MembraneDef.java:1.3
 
aokell/features/membrane/oo/src/org/objectweb/fractal/aokell/lib/membrane/MembraneDef.java:1.4
--- 
aokell/features/membrane/oo/src/org/objectweb/fractal/aokell/lib/membrane/MembraneDef.java:1.3
      Thu Mar 23 10:01:06 2006
+++ 
aokell/features/membrane/oo/src/org/objectweb/fractal/aokell/lib/membrane/MembraneDef.java
  Fri Mar 24 13:04:53 2006
@@ -74,9 +74,9 @@
          * It is bearable to deal with an array instead of a collection.
          */
         
-        String ctrlname = ctrl.type.getFcItfName();
+        String ctrlname = ctrl.getType().getFcItfName();
         for (int i = 0; i < ctrls.length; i++) {
-            if( ctrls[i].type.getFcItfName().equals(ctrlname) ) {
+            if( ctrls[i].getType().getFcItfName().equals(ctrlname) ) {
                 throw new IllegalArgumentException(
                         "A definition for a "+ctrlname+
                         " controller already exist in membrane "+