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

[Gavin King]

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

  Modified:    src/main/org/jboss/seam/jbpm  SeamVariableResolver.java
  Log:
  qualified names with . instead of $ in EL
  
  Revision  Changes    Path
  1.3       +10 -1     jboss-seam/src/main/org/jboss/seam/jbpm/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/jbpm/SeamVariableResolver.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- SeamVariableResolver.java	14 Jan 2006 12:14:56 -0000	1.2
  +++ SeamVariableResolver.java	30 Nov 2006 02:09:10 -0000	1.3
  @@ -1,6 +1,7 @@
   package org.jboss.seam.jbpm;
   
   import org.jboss.seam.Component;
  +import org.jboss.seam.core.Init;
   import org.jbpm.jpdl.el.ELException;
   import org.jbpm.jpdl.el.VariableResolver;
   
  @@ -8,7 +9,15 @@
   
   	public Object resolveVariable(String name) throws ELException {
   	   name = name.replace('$', '.');
  -	   return Component.getInstance(name, true);
  +	   Object instance = Component.getInstance(name, true);
  +      if (instance==null)
  +      {
  +         return Init.instance().getRootNamespace().getChild(name);
  +      }
  +      else
  +      {
  +         return instance;
  +      }
   	}
   
   }