From: Anjo K. <an...@us...> - 2005-08-26 12:04:09
|
Update of /cvsroot/wonder/Wonder/Common/Frameworks/ERExtensions/Sources/er/extensions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20439/Sources/er/extensions Modified Files: ERXWORepetition.java Log Message: bits of cleanup Index: ERXWORepetition.java =================================================================== RCS file: /cvsroot/wonder/Wonder/Common/Frameworks/ERExtensions/Sources/er/extensions/ERXWORepetition.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** ERXWORepetition.java 26 Aug 2005 09:51:04 -0000 1.5 --- ERXWORepetition.java 26 Aug 2005 12:03:52 -0000 1.6 *************** *** 158,162 **** private int hashCodeForObject(Object object) { ! return (object == null /*|| !(object instanceof EOEnterpriseObject) */? 0 : Math.abs(System.identityHashCode(object))); } --- 158,163 ---- private int hashCodeForObject(Object object) { ! return (object == null ? 0 : Math.abs(System.identityHashCode(object))); ! // return (object == null ? 0 : Math.abs(object.hashCode())); } *************** *** 182,186 **** } String elementID = index + "-" + hashCode; ! // log.info("prepare " + elementID + "->" + object); wocontext.appendElementIDComponent(elementID); didAppend = true; --- 183,189 ---- } String elementID = index + "-" + hashCode; ! if(log.isDebugEnabled()) { ! log.debug("prepare " + elementID + "->" + object); ! } wocontext.appendElementIDComponent(elementID); didAppend = true; *************** *** 261,265 **** int count = _count(context, wocomponent); boolean checkHashCodes = checkHashCodes(wocomponent, wocontext); ! // log.info("takeValuesFromRequest: " + wocontext.elementID() + " - " + wocontext.request().formValueKeys()); for (int index = 0; index < count; index++) { _prepareForIterationWithIndex(context, index, wocontext, wocomponent, checkHashCodes); --- 264,270 ---- int count = _count(context, wocomponent); boolean checkHashCodes = checkHashCodes(wocomponent, wocontext); ! if(log.isDebugEnabled()) { ! log.debug("takeValuesFromRequest: " + wocontext.elementID() + " - " + wocontext.request().formValueKeys()); ! } for (int index = 0; index < count; index++) { _prepareForIterationWithIndex(context, index, wocontext, wocomponent, checkHashCodes); *************** *** 271,289 **** } - public void takeChildrenValuesFromRequest(WORequest worequest, WOContext wocontext) { - if(hasChildrenElements()) { - int i = _children.count(); - wocontext.appendZeroElementIDComponent(); - for(int j = 0; j < i; j++) { - WOElement woelement = (WOElement)_children.objectAtIndex(j); - // log.info("takeChildrenValuesFromRequest: " + wocontext.elementID()); - woelement.takeValuesFromRequest(worequest, wocontext); - wocontext.incrementLastElementIDComponent(); - } - - wocontext.deleteLastElementIDComponent(); - } - } - public WOActionResults invokeAction(WORequest worequest, WOContext wocontext) { WOComponent wocomponent = wocontext.component(); --- 276,279 ---- *************** *** 347,351 **** } wocontext.appendElementIDComponent(indexString); ! // log.info("invokeAction:" + wocontext.elementID()); woactionresults = super.invokeAction(worequest, wocontext); wocontext.deleteLastElementIDComponent(); --- 337,343 ---- } wocontext.appendElementIDComponent(indexString); ! if(log.isDebugEnabled()) { ! log.debug("invokeAction:" + wocontext.elementID()); ! } woactionresults = super.invokeAction(worequest, wocontext); wocontext.deleteLastElementIDComponent(); *************** *** 369,373 **** return _checkHashCodes.booleanValueInComponent(wocomponent); } ! return _checkHashCodesDefault|| true; } --- 361,365 ---- return _checkHashCodes.booleanValueInComponent(wocomponent); } ! return _checkHashCodesDefault; } *************** *** 383,390 **** Context context = createContext(wocomponent); - // log.info("appendToResponse:" + wocontext.elementID()); int count = _count(context,wocomponent); boolean checkHashCodes = checkHashCodes(wocomponent, wocontext); ! for (int index = 0; index < count; index++) { _prepareForIterationWithIndex(context, index, wocontext, wocomponent, checkHashCodes); --- 375,384 ---- Context context = createContext(wocomponent); int count = _count(context,wocomponent); boolean checkHashCodes = checkHashCodes(wocomponent, wocontext); ! if(log.isDebugEnabled()) { ! log.debug("appendToResponse:" + wocontext.elementID()); ! } ! for (int index = 0; index < count; index++) { _prepareForIterationWithIndex(context, index, wocontext, wocomponent, checkHashCodes); |