[Wonder-cvs] CVS: Wonder/Common/Frameworks/ERExtensions/Sources/er/extensions ERXJSPopUpRelationPicker.java, 1.24, 1.25

[Anjo K. <an...@us...>]

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

Modified Files:
	ERXJSPopUpRelationPicker.java 
Log Message:
Now each child appears only once.

Index: ERXJSPopUpRelationPicker.java
===================================================================
RCS file: /cvsroot/wonder/Wonder/Common/Frameworks/ERExtensions/Sources/er/extensions/ERXJSPopUpRelationPicker.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** ERXJSPopUpRelationPicker.java	25 Jun 2006 05:31:39 -0000	1.24
--- ERXJSPopUpRelationPicker.java	26 Jun 2006 12:38:06 -0000	1.25
***************
*** 265,269 ****
          + (childPopUpStringForAll() != null ? "\"" + childPopUpStringForAll() + "\"" : "null")
          +");\n"
! 		+pickerName + ".parentChanged();"					
          +"\n</script>");
          log.debug(returnString);
--- 265,269 ----
          + (childPopUpStringForAll() != null ? "\"" + childPopUpStringForAll() + "\"" : "null")
          +");\n"
! 		// +pickerName + ".parentChanged();"					
          +"\n</script>");
          log.debug(returnString);
***************
*** 379,382 ****
--- 379,383 ----
              returnString.append(" \"" + NSKeyValueCodingAdditions.Utility.valueForKeyPath(aParent, parentDisplayValueName()) + "\",");
              returnString.append(" \"" + idForParent(aParent) + "\",");
+             returnString.append(" \"" + System.identityHashCode(aParent) + "\",");
  
              // now do all the possible children of the parent. Each child should look like 'new Entity("poodle","4",null,false)'
***************
*** 393,396 ****
--- 394,398 ----
                  returnString.append(" \"" + NSKeyValueCodingAdditions.Utility.valueForKeyPath(aChild, childDisplayValueName()) + "\","); // visible text of pop-up
                  returnString.append(" \"" + idForChild(aParent, aChild) + "\","); // value text of pop-up
+                 returnString.append(" \"" + System.identityHashCode(aChild) + "\",");
                  returnString.append(" null,");
                  if (isSelectedChild(aChild)) {