[jboss-cvs] jboss-seam/src/main/org/jboss/seam/jsf ...

[Gavin King]

  User: gavin   
  Date: 06/11/29 21:09:11

  Modified:    src/main/org/jboss/seam/jsf   SeamELResolver.java
                        SeamVariableResolver.java
  Log:
  qualified names with . instead of $ in EL
  
  Revision  Changes    Path
  1.3       +5 -0      jboss-seam/src/main/org/jboss/seam/jsf/SeamELResolver.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: SeamELResolver.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/jsf/SeamELResolver.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- SeamELResolver.java	26 Oct 2006 17:42:23 -0000	1.2
  +++ SeamELResolver.java	30 Nov 2006 02:09:11 -0000	1.3
  @@ -6,6 +6,7 @@
   import javax.el.ELResolver;
   
   import org.jboss.seam.Component;
  +import org.jboss.seam.core.Init;
   
   public class SeamELResolver extends ELResolver
   {
  @@ -36,6 +37,10 @@
            String name = (String) property;
            name = name.replace('$', '.');
            Object result = Component.getInstance(name);
  +         if (result==null)
  +         {
  +            result = Init.instance().getRootNamespace().getChild(name);
  +         }
            if (result!=null)
            {
               context.setPropertyResolved(true);
  
  
  
  1.17      +3 -2      jboss-seam/src/main/org/jboss/seam/jsf/SeamVariableResolver.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: SeamVariableResolver.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/jsf/SeamVariableResolver.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -b -r1.16 -r1.17
  --- SeamVariableResolver.java	25 Oct 2006 15:14:36 -0000	1.16
  +++ SeamVariableResolver.java	30 Nov 2006 02:09:11 -0000	1.17
  @@ -14,6 +14,7 @@
   import org.apache.commons.logging.Log;
   import org.apache.commons.logging.LogFactory;
   import org.jboss.seam.Component;
  +import org.jboss.seam.core.Init;
   
   /**
    * Resolves a variable name in the Seam contexts, according to
  @@ -22,7 +23,7 @@
    * 
    * @author Gavin King
    * @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
  - * @version $Revision: 1.16 $
  + * @version $Revision: 1.17 $
    */
   public class SeamVariableResolver extends VariableResolver
   {
  @@ -52,7 +53,7 @@
               if (managedBean==null)
               {
                  log.debug("could not resolve name");
  -               return null;
  +               return Init.instance().getRootNamespace().getChild(name);
               }
               else 
               {