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

[Gavin King]

  User: gavin   
  Date: 07/03/03 13:22:41

  Modified:    src/main/org/jboss/seam/jsf  SeamApplication11.java
  Log:
  JBSEAM-980, @Converter, @Validator
  
  Revision  Changes    Path
  1.6       +27 -0     jboss-seam/src/main/org/jboss/seam/jsf/SeamApplication11.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: SeamApplication11.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/jsf/SeamApplication11.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -b -r1.5 -r1.6
  --- SeamApplication11.java	17 Feb 2007 17:27:31 -0000	1.5
  +++ SeamApplication11.java	3 Mar 2007 18:22:40 -0000	1.6
  @@ -20,7 +20,10 @@
   import javax.faces.event.ActionListener;
   import javax.faces.validator.Validator;
   
  +import org.jboss.seam.Component;
   import org.jboss.seam.actionparam.ActionParamMethodBinding;
  +import org.jboss.seam.contexts.Contexts;
  +import org.jboss.seam.core.Init;
   
   public class SeamApplication11 extends Application
   {
  @@ -78,12 +81,28 @@
      @Override
      public Converter createConverter(String converterId)
      {
  +      if ( Contexts.isApplicationContextActive() )
  +      {
  +         String name = Init.instance().getConverters().get(converterId);
  +         if (name!=null)
  +         {
  +            return (Converter) Component.getInstance(name);
  +         }
  +      }
         return application.createConverter(converterId);
      }
   
      @Override
      public Converter createConverter(Class targetClass)
      {
  +      if ( Contexts.isApplicationContextActive() )
  +      {
  +         String name = Init.instance().getConvertersByClass().get(targetClass);
  +         if (name!=null)
  +         {
  +            return (Converter) Component.getInstance(name);
  +         }
  +      }
         return application.createConverter(targetClass);
      }
   
  @@ -106,6 +125,14 @@
      @Override
      public Validator createValidator(String validatorId) throws FacesException
      {
  +      if ( Contexts.isApplicationContextActive() )
  +      {
  +         String name = Init.instance().getValidators().get(validatorId);
  +         if (name!=null)
  +         {
  +            return (Validator) Component.getInstance(name);
  +         }
  +      }
         return application.createValidator(validatorId);
      }