[cvs] expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj DBObject.java

[JCorporate Ltd]

Update of /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj
In directory jcorp2.servlets.net:/tmp/cvs-serv9954/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj

Modified Files:
	DBObject.java 
Log Message:
getValuesDefault() now caches with key that reflects param values


Index: DBObject.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/DBObject.java,v
retrieving revision 1.203
retrieving revision 1.204
diff -C2 -d -r1.203 -r1.204
*** DBObject.java	31 Aug 2004 22:28:15 -0000	1.203
--- DBObject.java	1 Sep 2004 18:41:36 -0000	1.204
***************
*** 4403,4407 ****
              }
  
!             String cacheName = myClassName + ".validValues";
              CacheManager.getInstance();
              CacheSystem cs = CacheManager.getCacheSystem(getDataContext());
--- 4403,4407 ----
              }
  
!             String cacheName = myClassName + ".valueField:" + valueField + "|descrip:" + descripField + "|where:" + whereClause + "|sort:" + sortKeyString;
              CacheManager.getInstance();
              CacheSystem cs = CacheManager.getCacheSystem(getDataContext());
***************
*** 4616,4638 ****
              }
  
!             Locale oneLocale;
!             // if ( this instanceof SecuredDBObject) {
!             // 	// FIXME: This is horrible hack for i18n
!             // 	// support. Why is the locale attribute in the
!             // 	// secured db object? Is there any good reason for
!             // 	// this design? Peter Pilgrim Sat Dec 27 16:27:26 GMT 2002
!             // 	oneLocale = ((SecuredDBObject)this).getLocale();
!             // } else {
!             // 	// Assume the default locale
!             // 	oneLocale = Locale.getDefault();
!             // }
!             oneLocale = Locale.getDefault();
  
!             // Create the cache name key with the specified
!             // locale. That is we are making caches of valid values
!             // for different languages. For example:
!             // ``com.acme.test.Fruits.en_UK.validValues'#
!             // *PP* 27/12/2002
!             String cacheName = myClassName + "." + oneLocale.toString() + ".validValues";
              CacheManager.getInstance();
              CacheSystem cs = CacheManager.getCacheSystem(getDataContext());
--- 4616,4622 ----
              }
  
!             Locale oneLocale = Locale.getDefault();
  
!             String cacheName = myClassName + "." + oneLocale.toString() +  ".valueField:" + valueField + "|descrip:" + descripField + "|where:" + whereClause + "|sort:" + sortKeyString;
              CacheManager.getInstance();
              CacheSystem cs = CacheManager.getCacheSystem(getDataContext());