[jboss-cvs] jboss-seam/src/ui/org/jboss/seam/ui/facelet ...

[Peter Muir]

  User: pmuir   
  Date: 07/05/04 08:38:36

  Modified:    src/ui/org/jboss/seam/ui/facelet  
                        SeamExpressionFactory.java
                        SeamFaceletViewHandler.java
  Log:
  Add support for listeners with empty parameters back in
  
  Revision  Changes    Path
  1.9       +4 -3      jboss-seam/src/ui/org/jboss/seam/ui/facelet/SeamExpressionFactory.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: SeamExpressionFactory.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/ui/org/jboss/seam/ui/facelet/SeamExpressionFactory.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -b -r1.8 -r1.9
  --- SeamExpressionFactory.java	24 Apr 2007 02:34:23 -0000	1.8
  +++ SeamExpressionFactory.java	4 May 2007 12:38:36 -0000	1.9
  @@ -28,7 +28,7 @@
   import javax.el.ValueExpression;
   import javax.faces.event.FacesEvent;
   
  -import com.sun.facelets.compiler.SAXCompiler;
  +import org.jboss.el.ExpressionFactoryImpl;
   
   /**
    * This ExpressionFactory replaces the one normally used in Facelets.  It
  @@ -39,12 +39,13 @@
    */
   public class SeamExpressionFactory extends ExpressionFactory 
   {
  +   
       private static ExpressionFactory faceletsExpressionFactory;
       
       static 
       {
  -        // wrap the ExpressionFactory that Facelets would have created
  -        faceletsExpressionFactory = new SAXCompiler().createExpressionFactory();
  +        // Use jboss-el
  +        faceletsExpressionFactory = new ExpressionFactoryImpl();
       }
       
       public SeamExpressionFactory() {}
  
  
  
  1.5       +1 -1      jboss-seam/src/ui/org/jboss/seam/ui/facelet/SeamFaceletViewHandler.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: SeamFaceletViewHandler.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/ui/org/jboss/seam/ui/facelet/SeamFaceletViewHandler.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -b -r1.4 -r1.5
  --- SeamFaceletViewHandler.java	16 Apr 2007 22:21:20 -0000	1.4
  +++ SeamFaceletViewHandler.java	4 May 2007 12:38:36 -0000	1.5
  @@ -36,7 +36,7 @@
   public class SeamFaceletViewHandler 
       extends FaceletViewHandler 
   {
  -    private static final String SEAM_EXPRESSION_FACTORY = "org.jboss.el.ExpressionFactoryImpl";
  +    private static final String SEAM_EXPRESSION_FACTORY = "org.jboss.seam.ui.facelet.SeamExpressionFactory";
       
       public SeamFaceletViewHandler(ViewHandler parent)
       {