Okay that should work, sorry, I only read the commit message but didn't go and look at the code.
I think ideally the context setting would be null always unless an override should take place and in when it is set then the widget.properties setting should be ignored. But the situation you've described will cover the most common override scenario so it sounds good to me. Thanks Scott p.s. the other thread was regarding the BigDecimal/double fix: r960502 I should clarify that you replied initially but not when the discussion continued On 8/07/2010, at 10:34 PM, Hans Bakker wrote: > perhaps some more qualification: The context does override but only in > the case when the properties file is false. > > On Thu, 2010-07-08 at 17:13 +0700, Hans Bakker wrote: >> I agree with what the description of the code says at the top. >> >> your setting makes that the widget.verbose by default is false and the >> messages are not shown. >> >> Regards, >> Hans >> >> P.S. i missed the last comments, which one? >> >> On Thu, 2010-07-08 at 21:54 +1200, Scott Gray wrote: >>> The context setting should override the widget.properties setting, that is >>> the only reason why we have a context version of the setting. >>> >>> Please respond to this one, you haven't responded to the discussion >>> regarding your last commit yet. >>> >>> Regards >>> Scott >>> >>> HotWax Media >>> http://www.hotwaxmedia.com >>> >>> On 8/07/2010, at 9:49 PM, hans...@apache.org wrote: >>> >>>> Author: hansbak >>>> Date: Thu Jul 8 09:49:57 2010 >>>> New Revision: 961684 >>>> >>>> URL: http://svn.apache.org/viewvc?rev=961684&view=rev >>>> Log: >>>> make widgetBoundaryCommentsEnabled work as the descriptions states: Widget >>>> boundary comments are enabled by setting widgetVerbose true in the context >>>> Map, OR by setting widget.verbose=true in widget.properties. And not let >>>> the context override the widget.properties setting >>>> >>>> Modified: >>>> ofbiz/trunk/framework/widget/src/org/ofbiz/widget/ModelWidget.java >>>> >>>> Modified: >>>> ofbiz/trunk/framework/widget/src/org/ofbiz/widget/ModelWidget.java >>>> URL: >>>> http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/ModelWidget.java?rev=961684&r1=961683&r2=961684&view=diff >>>> ============================================================================== >>>> --- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/ModelWidget.java >>>> (original) >>>> +++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/ModelWidget.java Thu >>>> Jul 8 09:49:57 2010 >>>> @@ -21,6 +21,7 @@ package org.ofbiz.widget; >>>> import java.io.Serializable; >>>> import java.util.Map; >>>> import org.w3c.dom.Element; >>>> +import org.ofbiz.base.util.Debug; >>>> import org.ofbiz.base.util.UtilGenerics; >>>> import org.ofbiz.base.util.UtilProperties; >>>> >>>> @@ -110,7 +111,7 @@ public class ModelWidget implements Seri >>>> */ >>>> public static boolean widgetBoundaryCommentsEnabled(Map<String, ? >>>> extends Object> context) { >>>> boolean result = >>>> "true".equals(UtilProperties.getPropertyValue("widget", "widget.verbose")); >>>> - if (context != null) { >>>> + if (result == false && context != null) { >>>> String str = (String) context.get(enableBoundaryCommentsParam); >>>> if (str != null) { >>>> result = "true".equals(str); >>>> >>>> >>> >> > > -- > Ofbiz on twitter: http://twitter.com/apache_ofbiz > Myself on twitter: http://twitter.com/hansbak > Antwebsystems.com: Quality services for competitive rates. >
smime.p7s
Description: S/MIME cryptographic signature
