Author: antonio Date: Fri Dec 31 03:44:38 2004 New Revision: 123785 URL: http://svn.apache.org/viewcvs?view=rev&rev=123785 Log: Don't create new Booleans Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/faces/java/org/apache/cocoon/faces/samples/components/taglib/MapTag.java cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/JXPathBindingBuilderBase.java cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/flow/javascript/v2/ScriptableWidget.java cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/Form.java cocoon/branches/BRANCH_2_1_X/src/blocks/petstore/java/org/apache/cocoon/components/flow/javascript/ScriptableResult.java cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/acting/PropagatorAction.java cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/generation/CalendarGenerator.java
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/faces/java/org/apache/cocoon/faces/samples/components/taglib/MapTag.java Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/faces/java/org/apache/cocoon/faces/samples/components/taglib/MapTag.java?view=diff&rev=123785&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/faces/java/org/apache/cocoon/faces/samples/components/taglib/MapTag.java&r1=123784&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/faces/java/org/apache/cocoon/faces/samples/components/taglib/MapTag.java&r2=123785 ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/blocks/faces/java/org/apache/cocoon/faces/samples/components/taglib/MapTag.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/blocks/faces/java/org/apache/cocoon/faces/samples/components/taglib/MapTag.java Fri Dec 31 03:44:38 2004 @@ -43,6 +43,7 @@ import org.apache.cocoon.faces.taglib.UIComponentTag; import org.apache.cocoon.faces.samples.components.components.MapComponent; import org.apache.cocoon.faces.samples.components.renderkit.Util; +import org.apache.commons.lang.BooleanUtils; import javax.faces.component.UIComponent; import javax.faces.context.FacesContext; @@ -165,8 +166,7 @@ createValueBinding(immediate); map.setValueBinding("immediate", vb); } else { - boolean _immediate = new Boolean(immediate).booleanValue(); - map.setImmediate(_immediate); + map.setImmediate(BooleanUtils.toBoolean(immediate)); } } Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/JXPathBindingBuilderBase.java Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/JXPathBindingBuilderBase.java?view=diff&rev=123785&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/JXPathBindingBuilderBase.java&r1=123784&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/JXPathBindingBuilderBase.java&r2=123785 ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/JXPathBindingBuilderBase.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/JXPathBindingBuilderBase.java Fri Dec 31 03:44:38 2004 @@ -20,6 +20,7 @@ import org.apache.avalon.framework.logger.LogEnabled; import org.apache.avalon.framework.logger.Logger; import org.apache.cocoon.forms.util.DomHelper; +import org.apache.commons.lang.BooleanUtils; import org.w3c.dom.Element; /** @@ -194,13 +195,10 @@ * Interpretes the value of the lenient attribute into a Boolean object * allowing three-state logic (true/false/unset) * @param leniency value of the @lenient attribute - * @return null if the leniency parameter is String, otherwise the + * @return null if the leniency parameter is null or a String otherwise the allowed values */ private static Boolean decideLeniency(String leniency) { - if (leniency == null) { - return null; - } - return new Boolean(leniency); + return BooleanUtils.toBooleanObject(leniency); } } } Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/flow/javascript/v2/ScriptableWidget.java Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/flow/javascript/v2/ScriptableWidget.java?view=diff&rev=123785&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/flow/javascript/v2/ScriptableWidget.java&r1=123784&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/flow/javascript/v2/ScriptableWidget.java&r2=123785 ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/flow/javascript/v2/ScriptableWidget.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/flow/javascript/v2/ScriptableWidget.java Fri Dec 31 03:44:38 2004 @@ -38,6 +38,7 @@ import org.apache.cocoon.forms.formmodel.WidgetState; import org.apache.cocoon.forms.validation.ValidationError; import org.apache.cocoon.forms.validation.ValidationErrorAware; +import org.apache.commons.lang.BooleanUtils; import org.mozilla.javascript.Context; import org.mozilla.javascript.JavaScriptException; import org.mozilla.javascript.NativeArray; @@ -393,7 +394,7 @@ delegate.setValue(value); } else if (delegate instanceof BooleanField) { BooleanField field = (BooleanField)delegate; - field.setValue(new Boolean(Context.toBoolean(value))); + field.setValue(BooleanUtils.toBooleanObject(Context.toBoolean(value))); } else if (delegate instanceof Repeater) { Repeater repeater = (Repeater)delegate; if (value instanceof NativeArray) { Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/Form.java Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/Form.java?view=diff&rev=123785&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/Form.java&r1=123784&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/Form.java&r2=123785 ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/Form.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/Form.java Fri Dec 31 03:44:38 2004 @@ -26,6 +26,7 @@ import org.apache.cocoon.forms.event.WidgetEvent; import org.apache.cocoon.forms.event.WidgetEventMulticaster; import org.apache.commons.collections.list.CursorableLinkedList; +import org.apache.commons.lang.BooleanUtils; /** * A widget that serves as a container for other widgets, the top-level widget in @@ -248,7 +249,7 @@ * @param redisplayForm indicates if the form should be redisplayed to the user. */ public void endProcessing(boolean redisplayForm) { - this.endProcessing = new Boolean(!redisplayForm); + this.endProcessing = BooleanUtils.toBooleanObject(!redisplayForm); } /** Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/petstore/java/org/apache/cocoon/components/flow/javascript/ScriptableResult.java Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/petstore/java/org/apache/cocoon/components/flow/javascript/ScriptableResult.java?view=diff&rev=123785&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/petstore/java/org/apache/cocoon/components/flow/javascript/ScriptableResult.java&r1=123784&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/petstore/java/org/apache/cocoon/components/flow/javascript/ScriptableResult.java&r2=123785 ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/blocks/petstore/java/org/apache/cocoon/components/flow/javascript/ScriptableResult.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/blocks/petstore/java/org/apache/cocoon/components/flow/javascript/ScriptableResult.java Fri Dec 31 03:44:38 2004 @@ -19,6 +19,7 @@ import java.sql.ResultSetMetaData; import java.sql.SQLException; +import org.apache.commons.lang.BooleanUtils; import org.mozilla.javascript.Context; import org.mozilla.javascript.JavaScriptException; import org.mozilla.javascript.NotAFunctionException; @@ -28,7 +29,7 @@ /** * - * @version CVS $Id: ScriptableResult.java,v 1.4 2004/03/05 13:02:03 bdelacretaz Exp $ + * @version CVS $Id$ */ public class ScriptableResult extends ScriptableObject { @@ -114,7 +115,7 @@ index++; } put("rowCount", this, new Integer(index)); - put("isLimitedByMaxRows", this, new Boolean(isLimited)); + put("isLimitedByMaxRows", this, BooleanUtils.toBooleanObject(isLimited)); } } Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/acting/PropagatorAction.java Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/acting/PropagatorAction.java?view=diff&rev=123785&p1=cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/acting/PropagatorAction.java&r1=123784&p2=cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/acting/PropagatorAction.java&r2=123785 ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/acting/PropagatorAction.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/acting/PropagatorAction.java Fri Dec 31 03:44:38 2004 @@ -25,6 +25,7 @@ import org.apache.cocoon.components.modules.output.OutputModule; import org.apache.cocoon.environment.Redirector; import org.apache.cocoon.environment.SourceResolver; +import org.apache.commons.lang.BooleanUtils; import java.util.ArrayList; import java.util.Collections; @@ -111,7 +112,7 @@ * * @author <a href="mailto:[EMAIL PROTECTED]">Christian Haul</a> * @author <a href="mailto:[EMAIL PROTECTED]">Martin Man</a> - * @version CVS $Id: PropagatorAction.java,v 1.3 2004/03/05 13:02:43 bdelacretaz Exp $ + * @version CVS $Id$ */ public class PropagatorAction extends ServiceableAction @@ -195,10 +196,9 @@ String outputName = param.getParameter(ACTION_PREFIX + CONFIG_OUTPUT_MODULE, null); Boolean storeEmpty = - new Boolean( + BooleanUtils.toBooleanObject( param.getParameterAsBoolean( - ACTION_PREFIX + CONFIG_STORE_EMPTY, - this.storeEmpty)); + ACTION_PREFIX + CONFIG_STORE_EMPTY, this.storeEmpty)); param.removeParameter(ACTION_PREFIX + CONFIG_OUTPUT_MODULE); param.removeParameter(ACTION_PREFIX + CONFIG_STORE_EMPTY); return new Object[] { outputName, storeEmpty }; Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/generation/CalendarGenerator.java Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/generation/CalendarGenerator.java?view=diff&rev=123785&p1=cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/generation/CalendarGenerator.java&r1=123784&p2=cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/generation/CalendarGenerator.java&r2=123785 ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/generation/CalendarGenerator.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/generation/CalendarGenerator.java Fri Dec 31 03:44:38 2004 @@ -31,6 +31,7 @@ import org.apache.cocoon.ProcessingException; import org.apache.cocoon.caching.CacheableProcessingComponent; import org.apache.cocoon.environment.SourceResolver; +import org.apache.commons.lang.BooleanUtils; import org.apache.excalibur.source.SourceValidity; import org.apache.excalibur.source.impl.validity.NOPValidity; import org.xml.sax.SAXException; @@ -182,7 +183,7 @@ this.dateFormatter = DateFormat.getDateInstance(DateFormat.LONG, locale); } this.padWeeks = par.getParameterAsBoolean("padWeeks", false); - this.cacheKeyParList.add(new Boolean(this.padWeeks)); + this.cacheKeyParList.add(BooleanUtils.toBooleanObject(this.padWeeks)); this.monthFormatter = new SimpleDateFormat("MMMM", locale); this.attributes = new AttributesImpl(); }
