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

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

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

Modified Files:
	ERXSimpleTemplateParser.java 
Log Message:
Reverted to a version without my two previous commits since they broke key lookup with otherObject. Sorry.

Index: ERXSimpleTemplateParser.java
===================================================================
RCS file: /cvsroot/wonder/Wonder/Common/Frameworks/ERExtensions/Sources/er/extensions/ERXSimpleTemplateParser.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** ERXSimpleTemplateParser.java	4 Dec 2007 12:00:21 -0000	1.30
--- ERXSimpleTemplateParser.java	10 Jan 2008 16:26:56 -0000	1.31
***************
*** 12,16 ****
  
  import com.webobjects.foundation.NSArray;
- import com.webobjects.foundation.NSDictionary;
  import com.webobjects.foundation.NSForwardException;
  import com.webobjects.foundation.NSKeyValueCoding;
--- 12,15 ----
***************
*** 245,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) {
--- 244,251 ----
                              }
                              result = doGetValue(element, o);
+                             // For just in case the above doesn't throw an exception when the 
+                             // key is not defined. (NSDictionary doesn't seem to throw the exception.)
                              if(result == null) {
!                                 result = _undefinedKeyLabel;
                              }
                          } catch (NSKeyValueCoding.UnknownKeyException t) {