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

[Gavin King]

  User: gavin   
  Date: 07/06/19 15:02:32

  Modified:    src/main/org/jboss/seam/el   SeamELResolver.java
                        SeamExpressionFactory.java
  Log:
  repackaged built-in components
  sorry for breakage, but it had to happen eventually :-(
  
  Revision  Changes    Path
  1.2       +7 -5      jboss-seam/src/main/org/jboss/seam/el/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/el/SeamELResolver.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- SeamELResolver.java	30 May 2007 00:19:12 -0000	1.1
  +++ SeamELResolver.java	19 Jun 2007 19:02:32 -0000	1.2
  @@ -1,12 +1,14 @@
   package org.jboss.seam.el;
   
  +import static org.jboss.seam.util.JSF.DATA_MODEL;
  +import static org.jboss.seam.util.JSF.getRowCount;
  +
   import java.util.Collection;
   import java.util.Iterator;
   import java.util.Map;
   
   import javax.el.ELContext;
   import javax.el.ELResolver;
  -import javax.faces.model.DataModel;
   
   import org.jboss.seam.Component;
   import org.jboss.seam.contexts.Contexts;
  @@ -65,17 +67,17 @@
            }
            return result;
         }
  -      else if (base instanceof DataModel)
  +      else if ( DATA_MODEL.isInstance(base) )
         {
            if ( "size".equals(property) )
            {
               context.setPropertyResolved(true);
  -            return ( (DataModel) base ).getRowCount();
  +            return getRowCount(base);
            }
            else if ( "empty".equals(property) )
            {
               context.setPropertyResolved(true);
  -            return ( (DataModel) base ).getRowCount()==0;
  +            return getRowCount(base)==0;
            }
            else
            {
  @@ -131,7 +133,7 @@
      public boolean isReadOnly(ELContext context, Object base, Object property)
      {
         return base!=null && 
  -            ( (base instanceof DataModel) || (base instanceof Collection) || (base instanceof Map) );
  +            ( DATA_MODEL.isInstance(base) || (base instanceof Collection) || (base instanceof Map) );
      }
   
      @Override
  
  
  
  1.4       +2 -2      jboss-seam/src/main/org/jboss/seam/el/SeamExpressionFactory.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: SeamExpressionFactory.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/el/SeamExpressionFactory.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- SeamExpressionFactory.java	1 Jun 2007 19:47:12 -0000	1.3
  +++ SeamExpressionFactory.java	19 Jun 2007 19:02:32 -0000	1.4
  @@ -26,9 +26,9 @@
   import javax.el.ExpressionFactory;
   import javax.el.MethodExpression;
   import javax.el.ValueExpression;
  -import javax.faces.event.FacesEvent;
   
   import org.jboss.el.lang.EvaluationContext;
  +import org.jboss.seam.util.JSF;
   
   
   /**
  @@ -75,7 +75,7 @@
       @Override
       public MethodExpression createMethodExpression(ELContext elContext, String expression, Class returnType, Class[] paramTypes) 
       {
  -        if ( paramTypes.length==1 && FacesEvent.class.isAssignableFrom( paramTypes[0] ) )
  +        if ( paramTypes.length==1 && JSF.FACES_EVENT.isAssignableFrom( paramTypes[0] ) )
           {
            return new OptionalParameterMethodExpression(
                    expressionFactory.createMethodExpression( decorateELContext(elContext), expression, returnType, paramTypes ),