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

[Gavin King]

  User: gavin   
  Date: 07/06/25 20:59:34

  Modified:    src/main/org/jboss/seam    Entity.java Model.java Seam.java
  Log:
  get rid of non-dynamic-locale aware validator
  
  Revision  Changes    Path
  1.8       +2 -0      jboss-seam/src/main/org/jboss/seam/Entity.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Entity.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/Entity.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -b -r1.7 -r1.8
  --- Entity.java	18 Jun 2007 05:57:35 -0000	1.7
  +++ Entity.java	26 Jun 2007 00:59:33 -0000	1.8
  @@ -183,6 +183,8 @@
            throw new IllegalStateException("No application context active");
         }
         
  +      clazz = Seam.getEntityClass(clazz);
  +      
         String name = getModelName(clazz);
         Model model = (Model) Contexts.getApplicationContext().get(name);
         if ( model==null || !(model instanceof Entity) )
  
  
  
  1.6       +0 -23     jboss-seam/src/main/org/jboss/seam/Model.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Model.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/Model.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -b -r1.5 -r1.6
  --- Model.java	19 Jun 2007 19:41:43 -0000	1.5
  +++ Model.java	26 Jun 2007 00:59:33 -0000	1.6
  @@ -1,11 +1,6 @@
   package org.jboss.seam;
   
  -import java.util.Hashtable;
  -import java.util.Locale;
  -
  -import org.hibernate.validator.ClassValidator;
   import org.jboss.seam.contexts.Contexts;
  -import org.jboss.seam.core.ResourceBundle;
   
   /**
    * Base class of metamodels. For a class which
  @@ -20,7 +15,6 @@
   public class Model
   {
      private Class<?> beanClass;
  -   private Hashtable<Locale, ClassValidator> validators = new Hashtable<Locale, ClassValidator>();
   
      public Model(Class<?> beanClass)
      {
  @@ -32,23 +26,6 @@
         return beanClass;
      }
   
  -   public ClassValidator getValidator()
  -   {
  -      java.util.ResourceBundle bundle = Contexts.isApplicationContextActive() ? //yew, just for testing!
  -            ResourceBundle.instance() : null;
  -      Locale locale = bundle==null ?
  -            new Locale("DUMMY") : bundle.getLocale();
  -      ClassValidator validator = validators.get(locale);
  -      if (validator==null)
  -      {
  -         validator = bundle==null ?
  -               new ClassValidator(beanClass) :
  -               new ClassValidator(beanClass, bundle);
  -         validators.put(locale, validator);
  -      }
  -      return validator;
  -   }
  -   
      public static Model forClass(Class clazz)
      {
         if ( !Contexts.isApplicationContextActive() )
  
  
  
  1.38      +2 -10     jboss-seam/src/main/org/jboss/seam/Seam.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Seam.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/Seam.java,v
  retrieving revision 1.37
  retrieving revision 1.38
  diff -u -b -r1.37 -r1.38
  --- Seam.java	23 Jun 2007 20:04:10 -0000	1.37
  +++ Seam.java	26 Jun 2007 00:59:33 -0000	1.38
  @@ -1,4 +1,4 @@
  -//$Id: Seam.java,v 1.37 2007/06/23 20:04:10 gavin Exp $
  +//$Id: Seam.java,v 1.38 2007/06/26 00:59:33 gavin Exp $
   package org.jboss.seam;
   
   import static org.jboss.seam.ComponentType.ENTITY_BEAN;
  @@ -175,15 +175,7 @@
       */
      public static boolean isEntityClass(Class<?> clazz)
      {
  -      while ( clazz!=null && !Object.class.equals(clazz) )
  -      {
  -         if ( clazz.isAnnotationPresent(Entity.class) )
  -         {
  -            return true;
  -         }
  -         clazz = clazz.getSuperclass();
  -      }
  -      return false;
  +      return getEntityClass(clazz)!=null;
      }
      
      public static String getEjbName(Class<?> clazz)