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

[Gavin King]

  User: gavin   
  Date: 07/03/18 09:46:04

  Modified:    src/main/org/jboss/seam/core    LocaleSelector.java
                        ResourceBundle.java Validators.java
  Log:
  JBSEAM-1069
  
  Revision  Changes    Path
  1.20      +1 -1      jboss-seam/src/main/org/jboss/seam/core/LocaleSelector.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: LocaleSelector.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/LocaleSelector.java,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -b -r1.19 -r1.20
  --- LocaleSelector.java	28 Feb 2007 06:19:01 -0000	1.19
  +++ LocaleSelector.java	18 Mar 2007 13:46:04 -0000	1.20
  @@ -86,7 +86,7 @@
      {
         if ( !Strings.isEmpty(variant) )
         {
  -         return new java.util.Locale(language, country, variant );
  +         return new java.util.Locale(language, country, variant);
         }
         else if ( !Strings.isEmpty(country) )
         {
  
  
  
  1.28      +2 -1      jboss-seam/src/main/org/jboss/seam/core/ResourceBundle.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ResourceBundle.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/ResourceBundle.java,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -b -r1.27 -r1.28
  --- ResourceBundle.java	12 Mar 2007 06:12:22 -0000	1.27
  +++ ResourceBundle.java	18 Mar 2007 13:46:04 -0000	1.28
  @@ -31,7 +31,8 @@
   @Intercept(NEVER)
   @Name("org.jboss.seam.core.resourceBundle")
   @Install(precedence=BUILT_IN)
  -public class ResourceBundle implements Serializable {
  +public class ResourceBundle implements Serializable 
  +{
      private static final long serialVersionUID = -3236251335438092538L;
      private static final LogProvider log = Logging.getLogProvider(ResourceBundle.class);
   
  
  
  
  1.4       +28 -3     jboss-seam/src/main/org/jboss/seam/core/Validators.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Validators.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Validators.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- Validators.java	7 Mar 2007 23:53:57 -0000	1.3
  +++ Validators.java	18 Mar 2007 13:46:04 -0000	1.4
  @@ -32,7 +32,31 @@
   public class Validators
   {
   
  -   private Map<Class, ClassValidator> classValidators = Collections.synchronizedMap( new HashMap<Class, ClassValidator>() ); 
  +   class Key
  +   {
  +      private Class validatableClass;
  +      private java.util.Locale locale;
  +      public Key(Class validatableClass, java.util.Locale locale)
  +      {
  +         this.validatableClass = validatableClass;
  +         this.locale = locale;
  +      }
  +      @Override
  +      public boolean equals(Object other)
  +      {
  +         Key key = (Key) other;
  +         return key.validatableClass.equals(validatableClass)
  +               && key.locale.equals(locale);
  +      }
  +      @Override
  +      public int hashCode()
  +      {
  +         return validatableClass.hashCode() + locale.hashCode();
  +      }
  +   }
  +
  +   //TODO: should use weak references here...
  +   private Map<Key, ClassValidator> classValidators = Collections.synchronizedMap( new HashMap<Key, ClassValidator>() ); 
      
      /**
       * Get the cached ClassValidator instance.
  @@ -42,11 +66,12 @@
       */
      public ClassValidator getValidator(Class modelClass, String name)
      {
  -      ClassValidator result = classValidators.get(modelClass);
  +      Key key = new Key(modelClass, Locale.instance());
  +      ClassValidator result = classValidators.get(key);
         if (result==null)
         {
            result = createValidator(modelClass, name);
  -         classValidators.put(modelClass, result);
  +         classValidators.put(key, result);
         }
         return result;
      }