CVS update of aokell (3 files)

[Lionel Seinturier <seintur@xxxxxxxxxxxxxxxxxxxxxxxxx>]

    Date: Monday, February 27, 2006 @ 18:54:01
  Author: seintur
    Path: /cvsroot/fractal/aokell

Modified: 
features/membrane/oo/src/org/objectweb/fractal/aokell/AOKellMembranes.java
           src/org/objectweb/fractal/aokell/AOKell.java
          src/org/objectweb/fractal/aokell/tools/content/ContentResolver.java

Refactoring: Retrieve membrane definitions with a method (instead of simply 
accessing a field.)


----------------------------------------------------------------------------+
 features/membrane/oo/src/org/objectweb/fractal/aokell/AOKellMembranes.java | 
  13 ++++++----
 src/org/objectweb/fractal/aokell/AOKell.java                               | 
   3 --
 src/org/objectweb/fractal/aokell/tools/content/ContentResolver.java        | 
   2 -
 3 files changed, 11 insertions(+), 7 deletions(-)


Index: 
aokell/features/membrane/oo/src/org/objectweb/fractal/aokell/AOKellMembranes.java
diff -u 
aokell/features/membrane/oo/src/org/objectweb/fractal/aokell/AOKellMembranes.java:1.1
 
aokell/features/membrane/oo/src/org/objectweb/fractal/aokell/AOKellMembranes.java:1.2
--- 
aokell/features/membrane/oo/src/org/objectweb/fractal/aokell/AOKellMembranes.java:1.1
       Sat Feb 11 06:43:59 2006
+++ 
aokell/features/membrane/oo/src/org/objectweb/fractal/aokell/AOKellMembranes.java
   Mon Feb 27 18:54:01 2006
@@ -68,17 +68,22 @@
 import org.objectweb.fractal.api.control.NameController;
 
 
-
 /**
- * The class contains a single field which defines the membranes supported by
- * AOKell.
+ * The class defines the membranes supported by AOKell.
  * 
  * @author Lionel Seinturier <Lionel.Seinturier@xxxxxxx>
  */
 public class AOKellMembranes {
 
+    /**
+     * Return the membranes supported by AOKell.
+     */
+    public static MembraneDef[] getMembranes() {
+        return MEMBRANES;
+    }
+    
     /** AOKell membranes. */
-    final public static MembraneDef[] MEMBRANES =
+    final private static MembraneDef[] MEMBRANES =
         new MembraneDef[]{
             new MembraneDef(
                     "bootstrap",
Index: aokell/src/org/objectweb/fractal/aokell/AOKell.java
diff -u aokell/src/org/objectweb/fractal/aokell/AOKell.java:1.1 
aokell/src/org/objectweb/fractal/aokell/AOKell.java:1.2
--- aokell/src/org/objectweb/fractal/aokell/AOKell.java:1.1     Sat Feb 11 
06:43:53 2006
+++ aokell/src/org/objectweb/fractal/aokell/AOKell.java Mon Feb 27 18:54:01 
2006
@@ -24,7 +24,6 @@
 package org.objectweb.fractal.aokell;
 
 
-import org.objectweb.fractal.aokell.AOKellMembranes;
 import org.objectweb.fractal.aokell.lib.factory.GenericFactoryImpl;
 import org.objectweb.fractal.aokell.lib.membrane.Membranes;
 import org.objectweb.fractal.aokell.lib.type.ComponentTypeImpl;
@@ -96,7 +95,7 @@
             return bootstrap;
         
         // Register AOKell membranes with the membrane repository
-        Membranes.get().register(AOKellMembranes.MEMBRANES);
+        Membranes.get().register(AOKellMembranes.getMembranes());
 
         // Create the bootstrap component
         GenericFactory gf = GenericFactoryImpl.get();
Index: 
aokell/src/org/objectweb/fractal/aokell/tools/content/ContentResolver.java
diff -u 
aokell/src/org/objectweb/fractal/aokell/tools/content/ContentResolver.java:1.1
 
aokell/src/org/objectweb/fractal/aokell/tools/content/ContentResolver.java:1.2
--- 
aokell/src/org/objectweb/fractal/aokell/tools/content/ContentResolver.java:1.1
      Sat Feb 11 06:43:52 2006
+++ 
aokell/src/org/objectweb/fractal/aokell/tools/content/ContentResolver.java  
Mon Feb 27 18:54:01 2006
@@ -70,7 +70,7 @@
             return;
         }
         
-        Membranes.get().register(AOKellMembranes.MEMBRANES);
+        Membranes.get().register(AOKellMembranes.getMembranes());
         new ContentResolver(args).compile();
     }