[displaytag-cvs] displaytag/src/main/java/org/displaytag/properties TableProperties.java,1.39,1.40

[fabrizio g. <fg...@us...>]

Update of /cvsroot/displaytag/displaytag/src/main/java/org/displaytag/properties
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30468/src/main/java/org/displaytag/properties

Modified Files:
	TableProperties.java 
Log Message:
DISPL-231 Property files are read for every table generated

Index: TableProperties.java
===================================================================
RCS file: /cvsroot/displaytag/displaytag/src/main/java/org/displaytag/properties/TableProperties.java,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** TableProperties.java	16 Oct 2005 20:34:39 -0000	1.39
--- TableProperties.java	29 Oct 2005 14:38:34 -0000	1.40
***************
*** 464,494 ****
      public static LocaleResolver getLocaleResolverInstance() throws TablePropertiesLoadException
      {
-         // special handling, table properties is not yet instantiated
-         String className = null;
- 
-         ResourceBundle defaultUserProperties = loadUserProperties(Locale.getDefault());
  
!         // if available, user properties have higher precedence
!         if (defaultUserProperties != null)
          {
!             try
              {
!                 className = defaultUserProperties.getString(PROPERTY_CLASS_LOCALERESOLVER);
              }
!             catch (MissingResourceException e)
              {
!                 // no problem
              }
-         }
- 
-         // still null? load defaults
-         if (className == null)
-         {
-             Properties defaults = loadBuiltInProperties();
-             className = defaults.getProperty(PROPERTY_CLASS_LOCALERESOLVER);
-         }
  
-         if (localeResolver == null)
-         {
              if (className != null)
              {
--- 464,496 ----
      public static LocaleResolver getLocaleResolverInstance() throws TablePropertiesLoadException
      {
  
!         if (localeResolver == null)
          {
! 
!             // special handling, table properties is not yet instantiated
!             String className = null;
! 
!             ResourceBundle defaultUserProperties = loadUserProperties(Locale.getDefault());
! 
!             // if available, user properties have higher precedence
!             if (defaultUserProperties != null)
              {
!                 try
!                 {
!                     className = defaultUserProperties.getString(PROPERTY_CLASS_LOCALERESOLVER);
!                 }
!                 catch (MissingResourceException e)
!                 {
!                     // no problem
!                 }
              }
! 
!             // still null? load defaults
!             if (className == null)
              {
!                 Properties defaults = loadBuiltInProperties();
!                 className = defaults.getProperty(PROPERTY_CLASS_LOCALERESOLVER);
              }
  
              if (className != null)
              {