Return-Path: Delivered-To: apmail-cocoon-cvs-archive@www.apache.org Received: (qmail 8113 invoked from network); 24 Oct 2005 19:23:25 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 24 Oct 2005 19:23:25 -0000 Received: (qmail 75431 invoked by uid 500); 24 Oct 2005 19:23:23 -0000 Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org Received: (qmail 75287 invoked by uid 500); 24 Oct 2005 19:23:22 -0000 Mailing-List: contact cvs-help@cocoon.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@cocoon.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list cvs@cocoon.apache.org Received: (qmail 75267 invoked by uid 99); 24 Oct 2005 19:23:22 -0000 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Mon, 24 Oct 2005 12:23:22 -0700 Received: (qmail 7698 invoked by uid 65534); 24 Oct 2005 19:23:02 -0000 Message-ID: <20051024192302.7697.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r328140 - in /cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/formmodel: BooleanField.java Field.java Output.java Upload.java Date: Mon, 24 Oct 2005 19:23:01 -0000 To: cvs@cocoon.apache.org From: sylvain@apache.org X-Mailer: svnmailer-1.0.5 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: sylvain Date: Mon Oct 24 12:22:55 2005 New Revision: 328140 URL: http://svn.apache.org/viewcvs?rev=328140&view=rev Log: Bugfix: don't count the FormHandler as an event listener, otherwise all fields are auto-submitted when there is one Modified: cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/formmodel/BooleanField.java cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/formmodel/Field.java cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/formmodel/Output.java cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/formmodel/Upload.java Modified: cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/formmodel/BooleanField.java URL: http://svn.apache.org/viewcvs/cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/formmodel/BooleanField.java?rev=328140&r1=328139&r2=328140&view=diff ============================================================================== --- cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/formmodel/BooleanField.java (original) +++ cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/formmodel/BooleanField.java Mon Oct 24 12:22:55 2005 @@ -161,7 +161,7 @@ value = (Boolean)object; if (!value.equals(oldValue)) { Form form = getForm(); - if (hasValueChangedListeners()) { + if (hasValueChangedListeners() || this.getForm().hasFormHandler()) { form.addWidgetEvent(new ValueChangedEvent(this, oldValue, value)); } form.addWidgetUpdate(this); @@ -182,7 +182,7 @@ } public boolean hasValueChangedListeners() { - return this.listener != null || this.getForm().hasFormHandler(); + return this.listener != null; } public void broadcastEvent(WidgetEvent event) { Modified: cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/formmodel/Field.java URL: http://svn.apache.org/viewcvs/cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/formmodel/Field.java?rev=328140&r1=328139&r2=328140&view=diff ============================================================================== --- cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/formmodel/Field.java (original) +++ cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/formmodel/Field.java Mon Oct 24 12:22:55 2005 @@ -191,7 +191,7 @@ // (null allows to reset validation error) if (changed || newValue == null) { // Do we need to call listeners? If yes, keep (and parse if needed) old value. - boolean callListeners = changed && hasValueChangedListeners(); + boolean callListeners = changed && (hasValueChangedListeners() || this.getForm().hasFormHandler()); Object oldValue = callListeners ? getValue() : null; this.value = newValue; @@ -251,7 +251,7 @@ // If we have some value-changed listeners, we must make sure the current value has been // parsed, to fill the event. Otherwise, we don't need to spend that extra CPU time. - boolean hasListeners = hasValueChangedListeners(); + boolean hasListeners = hasValueChangedListeners() || this.getForm().hasFormHandler(); Object oldValue = hasListeners ? getValue() : null; enteredValue = newEnteredValue; @@ -526,7 +526,7 @@ } public boolean hasValueChangedListeners() { - return this.listener != null || this.getForm().hasFormHandler(); + return this.listener != null; } public void broadcastEvent(WidgetEvent event) { Modified: cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/formmodel/Output.java URL: http://svn.apache.org/viewcvs/cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/formmodel/Output.java?rev=328140&r1=328139&r2=328140&view=diff ============================================================================== --- cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/formmodel/Output.java (original) +++ cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/formmodel/Output.java Mon Oct 24 12:22:55 2005 @@ -118,7 +118,7 @@ if (!ObjectUtils.equals(value, object)) { Object oldValue = value; value = object; - if (this.hasValueChangedListeners()) { + if (this.hasValueChangedListeners() || this.getForm().hasFormHandler()) { getForm().addWidgetEvent(new ValueChangedEvent(this, oldValue, value)); } getForm().addWidgetUpdate(this); @@ -134,7 +134,7 @@ } public boolean hasValueChangedListeners() { - return this.listener != null || this.getForm().hasFormHandler(); + return this.listener != null; } public void broadcastEvent(WidgetEvent event) { Modified: cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/formmodel/Upload.java URL: http://svn.apache.org/viewcvs/cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/formmodel/Upload.java?rev=328140&r1=328139&r2=328140&view=diff ============================================================================== --- cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/formmodel/Upload.java (original) +++ cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/formmodel/Upload.java Mon Oct 24 12:22:55 2005 @@ -136,7 +136,7 @@ } private void changed() { - if (this.hasValueChangedListeners()) { + if (this.hasValueChangedListeners() || this.getForm().hasFormHandler()) { this.getForm().addWidgetEvent(new ValueChangedEvent(this, null, this.part)); } getForm().addWidgetUpdate(this); @@ -235,7 +235,7 @@ } public boolean hasValueChangedListeners() { - return this.listener != null || this.getForm().hasFormHandler(); + return this.listener != null; } public void broadcastEvent(WidgetEvent event) {