[Wonder-cvs] CVS: Wonder/Common/Frameworks/ERExtensions/Sources/er/extensions ERXSimpleTemplateParser.java, 1.29, 1.30

[Denis F. <df...@us...>]

Update of /cvsroot/wonder/Wonder/Common/Frameworks/ERExtensions/Sources/er/extensions
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv10158/Sources/er/extensions

Modified Files:
	ERXSimpleTemplateParser.java 
Log Message:
not using empty string when object is NSDictionary

Index: ERXSimpleTemplateParser.java
===================================================================
RCS file: /cvsroot/wonder/Wonder/Common/Frameworks/ERExtensions/Sources/er/extensions/ERXSimpleTemplateParser.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** ERXSimpleTemplateParser.java	14 Nov 2007 14:57:47 -0000	1.29
--- ERXSimpleTemplateParser.java	4 Dec 2007 12:00:21 -0000	1.30
***************
*** 12,15 ****
--- 12,16 ----
  
  import com.webobjects.foundation.NSArray;
+ import com.webobjects.foundation.NSDictionary;
  import com.webobjects.foundation.NSForwardException;
  import com.webobjects.foundation.NSKeyValueCoding;
***************
*** 245,249 ****
                              result = doGetValue(element, o);
                              if(result == null) {
!                                 result = "";
                              }
                          } catch (NSKeyValueCoding.UnknownKeyException t) {
--- 246,257 ----
                              result = doGetValue(element, o);
                              if(result == null) {
!                             	if (o instanceof NSDictionary) {
!                             		// NSDictionary doesn't throw UnknownKeyException
! 									result = _undefinedKeyLabel;
! 								} else {
! 									// Key path value of e.g. eo can be null and
! 									// empty string seems to be more reasonable in this case
! 									result = "";
! 								}
                              }
                          } catch (NSKeyValueCoding.UnknownKeyException t) {