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);
> 
> 

Attachment: smime.p7s
Description: S/MIME cryptographic signature

Reply via email to