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

[Gavin King]

  User: gavin   
  Date: 06/09/29 21:36:14

  Modified:    src/main/org/jboss/seam/jsf   SeamPhaseListener.java
  Added:       src/main/org/jboss/seam/jsf   SeamApplication.java
  Log:
  get rid of funny tags when using method bindings with params
  
  Revision  Changes    Path
  1.85      +10 -2     jboss-seam/src/main/org/jboss/seam/jsf/SeamPhaseListener.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: SeamPhaseListener.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/jsf/SeamPhaseListener.java,v
  retrieving revision 1.84
  retrieving revision 1.85
  diff -u -b -r1.84 -r1.85
  --- SeamPhaseListener.java	27 Sep 2006 03:53:49 -0000	1.84
  +++ SeamPhaseListener.java	30 Sep 2006 01:36:14 -0000	1.85
  @@ -11,6 +11,8 @@
   import static javax.faces.event.PhaseId.RENDER_RESPONSE;
   import static javax.faces.event.PhaseId.RESTORE_VIEW;
   
  +import javax.faces.FactoryFinder;
  +import javax.faces.application.ApplicationFactory;
   import javax.faces.application.FacesMessage;
   import javax.faces.context.FacesContext;
   import javax.faces.event.PhaseEvent;
  @@ -37,6 +39,12 @@
   
      private static final Log log = LogFactory.getLog( SeamPhaseListener.class );
      
  +   public SeamPhaseListener()
  +   {
  +      ApplicationFactory factory = (ApplicationFactory) FactoryFinder.getFactory(FactoryFinder.APPLICATION_FACTORY);
  +      factory.setApplication( new SeamApplication( factory.getApplication() ) );
  +   }
  +   
      public void beforePhase(PhaseEvent event)
      {
         log.trace( "before phase: " + event.getPhaseId() );
  @@ -52,7 +60,7 @@
         }
         else if ( event.getPhaseId() == RENDER_RESPONSE )
         {
  -         Pages.instance().applyParameterValues( event.getFacesContext().getViewRoot().getViewId() );
  +         Pages.instance().applyParameterValues( event.getFacesContext().getViewRoot().getViewId() ); //TODO?
            beforeRender(event);
         }
   
  @@ -89,7 +97,7 @@
         }
         else if ( event.getPhaseId()== APPLY_REQUEST_VALUES )
         {
  -         Pages.instance().applyParameterValues( facesContext.getViewRoot().getViewId() );
  +         Pages.instance().applyParameterValues( facesContext.getViewRoot().getViewId() ); //TODO??
         }
               
         //has to happen after, since restoreAnyConversationContext() 
  
  
  
  1.1      date: 2006/09/30 01:36:14;  author: gavin;  state: Exp;jboss-seam/src/main/org/jboss/seam/jsf/SeamApplication.java
  
  Index: SeamApplication.java
  ===================================================================
  package org.jboss.seam.jsf;
  
  import java.util.Collection;
  import java.util.Iterator;
  import java.util.Locale;
  
  import javax.faces.FacesException;
  import javax.faces.application.Application;
  import javax.faces.application.NavigationHandler;
  import javax.faces.application.StateManager;
  import javax.faces.application.ViewHandler;
  import javax.faces.component.UIComponent;
  import javax.faces.context.FacesContext;
  import javax.faces.convert.Converter;
  import javax.faces.el.MethodBinding;
  import javax.faces.el.PropertyResolver;
  import javax.faces.el.ReferenceSyntaxException;
  import javax.faces.el.ValueBinding;
  import javax.faces.el.VariableResolver;
  import javax.faces.event.ActionListener;
  import javax.faces.validator.Validator;
  
  import org.jboss.seam.actionparam.ActionParamMethodBinding;
  import org.jboss.seam.actionparam.ActionParamValueBinding;
  
  public class SeamApplication extends Application
  {
  
     private Application application;
     
     public Application getDelegate()
     {
        return application;
     }
     
     public SeamApplication(Application app)
     {
        this.application = app;
     }
  
     @Override
     public void addComponent(String componentType, String componentClass)
     {
        application.addComponent(componentType, componentClass);
     }
  
     @Override
     public void addConverter(String converterId, String converterClass)
     {
        application.addConverter(converterId, converterClass);
     }
  
     @Override
     public void addConverter(Class targetClass, String converterClass)
     {
        application.addConverter(targetClass, converterClass);
     }
  
     @Override
     public void addValidator(String validatorId, String validatorClass)
     {
        application.addValidator(validatorId, validatorClass);
     }
  
     @Override
     public UIComponent createComponent(String componentType)
           throws FacesException
     {
        return application.createComponent(componentType);
     }
  
     @Override
     public UIComponent createComponent(ValueBinding componentBinding,
           FacesContext context, String componentType) throws FacesException
     {
        return application.createComponent(componentBinding, context, componentType);
     }
  
     @Override
     public Converter createConverter(String converterId)
     {
        return application.createConverter(converterId);
     }
  
     @Override
     public Converter createConverter(Class targetClass)
     {
        return application.createConverter(targetClass);
     }
  
     @Override
     public MethodBinding createMethodBinding(String ref, Class[] params)
           throws ReferenceSyntaxException
     {
        return new ActionParamMethodBinding(application, ref);
        //return app.createMethodBinding(ref, params);
     }
  
     @Override
     public Validator createValidator(String validatorId) throws FacesException
     {
        return application.createValidator(validatorId);
     }
  
     @Override
     public ValueBinding createValueBinding(String ref)
           throws ReferenceSyntaxException
     {
        return new ActionParamValueBinding(application, ref);
        //return app.createValueBinding(ref);
     }
  
     @Override
     public ActionListener getActionListener()
     {
        return application.getActionListener();
     }
  
     @Override
     public Iterator getComponentTypes()
     {
        return application.getComponentTypes();
     }
  
     @Override
     public Iterator getConverterIds()
     {
        return application.getConverterIds();
     }
  
     @Override
     public Iterator getConverterTypes()
     {
        return application.getComponentTypes();
     }
  
     @Override
     public Locale getDefaultLocale()
     {
        return application.getDefaultLocale();
     }
  
     @Override
     public String getDefaultRenderKitId()
     {
        return application.getDefaultRenderKitId();
     }
  
     @Override
     public String getMessageBundle()
     {
        return application.getMessageBundle();
     }
  
     @Override
     public NavigationHandler getNavigationHandler()
     {
        return application.getNavigationHandler();
     }
  
     @Override
     public PropertyResolver getPropertyResolver()
     {
        return application.getPropertyResolver();
     }
  
     @Override
     public StateManager getStateManager()
     {
        return application.getStateManager();
     }
  
     @Override
     public Iterator getSupportedLocales()
     {
        return application.getSupportedLocales();
     }
  
     @Override
     public Iterator getValidatorIds()
     {
        return application.getValidatorIds();
     }
  
     @Override
     public VariableResolver getVariableResolver()
     {
        return application.getVariableResolver();
     }
  
     @Override
     public ViewHandler getViewHandler()
     {
        return application.getViewHandler();
     }
  
     @Override
     public void setActionListener(ActionListener listener)
     {
        application.setActionListener(listener);
     }
  
     @Override
     public void setDefaultLocale(Locale locale)
     {
        application.setDefaultLocale(locale);
     }
  
     @Override
     public void setDefaultRenderKitId(String renderKitId)
     {
        application.setDefaultRenderKitId(renderKitId);
     }
  
     @Override
     public void setMessageBundle(String bundle)
     {
        application.setMessageBundle(bundle);
     }
  
     @Override
     public void setNavigationHandler(NavigationHandler handler)
     {
        application.setNavigationHandler(handler);
     }
  
     @Override
     public void setPropertyResolver(PropertyResolver resolver)
     {
        application.setPropertyResolver(resolver);
     }
  
     @Override
     public void setStateManager(StateManager manager)
     {
        application.setStateManager(manager);
     }
  
     @Override
     public void setSupportedLocales(Collection locales)
     {
        application.setSupportedLocales(locales);
     }
  
     @Override
     public void setVariableResolver(VariableResolver resolver)
     {
        application.setVariableResolver(resolver);
     }
  
     @Override
     public void setViewHandler(ViewHandler handler)
     {
        application.setViewHandler(handler);
     }
  
  }