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

[Gavin King]

  User: gavin   
  Date: 07/04/23 22:34:23

  Modified:    src/ui/org/jboss/seam/ui/facelet      FaceletsRenderer.java
                        OptionalParameterMethodExpression.java
                        SeamExpressionFactory.java
  Removed:     src/ui/org/jboss/seam/ui/facelet     
                        MethodExpressionHelper.java
                        ParamMethodExpression.java
  Log:
  remove old pre-jboss-el stuff
  
  Revision  Changes    Path
  1.13      +0 -6      jboss-seam/src/ui/org/jboss/seam/ui/facelet/FaceletsRenderer.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: FaceletsRenderer.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/ui/org/jboss/seam/ui/facelet/FaceletsRenderer.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -b -r1.12 -r1.13
  --- FaceletsRenderer.java	22 Mar 2007 15:20:07 -0000	1.12
  +++ FaceletsRenderer.java	24 Apr 2007 02:34:23 -0000	1.13
  @@ -141,8 +141,6 @@
                  .getFacelet(url);
      }
   
  -   
  -
      protected void renderFacelet(FacesContext facesContext, Facelet facelet) throws IOException
      {
         UIViewRoot root = facesContext.getViewRoot();
  @@ -150,8 +148,4 @@
         JSF.renderChildren(facesContext, root);
      }
      
  -   
  -
  -   
  -   
   }
  
  
  
  1.3       +1 -1      jboss-seam/src/ui/org/jboss/seam/ui/facelet/OptionalParameterMethodExpression.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: OptionalParameterMethodExpression.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/ui/org/jboss/seam/ui/facelet/OptionalParameterMethodExpression.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- OptionalParameterMethodExpression.java	25 Feb 2007 18:20:11 -0000	1.2
  +++ OptionalParameterMethodExpression.java	24 Apr 2007 02:34:23 -0000	1.3
  @@ -9,7 +9,7 @@
   import javax.el.MethodNotFoundException;
   
   public class OptionalParameterMethodExpression extends MethodExpression
  - {
  +{
       
       private MethodExpression withParam;
       private MethodExpression withNoParam;
  
  
  
  1.8       +2 -10     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.7
  retrieving revision 1.8
  diff -u -b -r1.7 -r1.8
  --- SeamExpressionFactory.java	17 Feb 2007 17:24:52 -0000	1.7
  +++ SeamExpressionFactory.java	24 Apr 2007 02:34:23 -0000	1.8
  @@ -28,8 +28,6 @@
   import javax.el.ValueExpression;
   import javax.faces.event.FacesEvent;
   
  -import org.jboss.seam.actionparam.MethodExpressionParser;
  -
   import com.sun.facelets.compiler.SAXCompiler;
   
   /**
  @@ -46,8 +44,7 @@
       static 
       {
           // wrap the ExpressionFactory that Facelets would have created
  -        SAXCompiler compiler = new SAXCompiler();
  -        faceletsExpressionFactory = compiler.createExpressionFactory();
  +        faceletsExpressionFactory = new SAXCompiler().createExpressionFactory();
       }
       
       public SeamExpressionFactory() {}
  @@ -73,12 +70,7 @@
                                                      Class returnType, 
                                                      Class[] paramTypes) 
       {
  -        MethodExpressionParser parser = new MethodExpressionParser(expression);
  -        if ( parser.isParamExpression() )
  -        {
  -            return new ParamMethodExpression(parser, elContext);
  -        }
  -        else if ( paramTypes.length==1 && FacesEvent.class.isAssignableFrom( paramTypes[0] ) )
  +        if ( paramTypes.length==1 && FacesEvent.class.isAssignableFrom( paramTypes[0] ) )
           {
              //so that JSF action listeners don't have to declare 
              //the totally frickin useless ActionEvent parameter