Return-Path: 
 <cocoon-cvs-return-11319-apmail-xml-cocoon-cvs-archive=xml.apache.org@xml.apache.org>
Delivered-To: apmail-xml-cocoon-cvs-archive@xml.apache.org
Received: (qmail 61994 invoked by uid 500); 22 Mar 2003 22:51:36 -0000
Mailing-List: contact cocoon-cvs-help@xml.apache.org; run by ezmlm
Precedence: bulk
Reply-To: cocoon-dev@xml.apache.org
list-help: <mailto:cocoon-cvs-help@xml.apache.org>
list-unsubscribe: <mailto:cocoon-cvs-unsubscribe@xml.apache.org>
list-post: <mailto:cocoon-cvs@xml.apache.org>
Delivered-To: mailing list cocoon-cvs@xml.apache.org
Received: (qmail 61981 invoked by uid 500); 22 Mar 2003 22:51:36 -0000
Delivered-To: apmail-cocoon-2.1-cvs@apache.org
Received: (qmail 61978 invoked from network); 22 Mar 2003 22:51:36 -0000
Received: from icarus.apache.org (208.185.179.13)
  by daedalus.apache.org with SMTP; 22 Mar 2003 22:51:36 -0000
Received: (qmail 27893 invoked by uid 1544); 22 Mar 2003 22:51:35 -0000
Date: 22 Mar 2003 22:51:35 -0000
Message-ID: <20030322225135.27892.qmail@icarus.apache.org>
From: coliver@apache.org
To: cocoon-2.1-cvs@apache.org
Subject: cvs commit:
 cocoon-2.1/src/java/org/apache/cocoon/components/flow/javascript xmlForm.js
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N

coliver     2003/03/22 14:51:35

  Modified:    src/java/org/apache/cocoon/components/flow/javascript
                        xmlForm.js
  Log:
  removed xmlForm() dependency on parameters when invoking a continuation and added hasViolation() method to XForm
  
  Revision  Changes    Path
  1.5       +34 -23    cocoon-2.1/src/java/org/apache/cocoon/components/flow/javascript/xmlForm.js
  
  Index: xmlForm.js
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/flow/javascript/xmlForm.js,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- xmlForm.js	20 Mar 2003 02:46:32 -0000	1.4
  +++ xmlForm.js	22 Mar 2003 22:51:35 -0000	1.5
  @@ -4,6 +4,7 @@
   // XMLForm Support
   //
   
  +
   /**
    * Creates a new JavaScript wrapper of a Form object
    * see org.apache.cocoon.components.xmlform.Form
  @@ -15,7 +16,7 @@
   
   function XForm(id, validatorNS, validatorDoc, scope) {
       if (scope != "request") {
  -	cocoon.createSession();
  +        cocoon.createSession();
       }
       this.id = id;
       this.lastContinuation = null;
  @@ -90,6 +91,15 @@
   }
   
   /**
  + * Does this form have violations?
  + * @return [Boolean] true if violations have been added to this form
  + */
  +XForm.prototype.hasViolations = function() {
  +    var set = this.form.violationsAsSortedSet;
  +    return set != null && set.size() > 0;
  +}
  +
  +/**
    * Computes the value of an xpath expression against the model of this form
    * @param expr [String] xpath expression
    * @return [Object] result of computing <code>expr</code>
  @@ -115,6 +125,7 @@
     if (bizData == undefined) {
         bizData = null;
     }
  +
     cocoon.forwardTo("cocoon://" + cocoon.environment.getURIPrefix() + uri,
                      bizData, kont);
     this.lastContinuation = kont;
  @@ -174,8 +185,7 @@
               validator(this);
           }
           this.form.validate(phase);
  -        if (this.form.violationsAsSortedSet == null ||
  -            this.form.violationsAsSortedSet.size() == 0) {
  +        if (!this.hasViolations()) {
               break;
           }
       }
  @@ -257,28 +267,29 @@
       }
       var command = getCommand();
       if (command != undefined) {
  -        var xform = XForm.forms[id];
  -        if (xform != undefined) {
  -            // invoke a continuation 
  -            var continuationsMgr =
  -                cocoon.componentManager.lookup(Packages.org.apache.cocoon.components.flow.ContinuationsManager.ROLE);
  -            var wk = continuationsMgr.lookupWebContinuation(command);
  -            cocoon.componentManager.release(continuationsMgr);
  -            if (wk != null) {
  -                var jswk = wk.userObject;
  -                xform.form.clearViolations();
  -                jswk.continuation(jswk);
  -            }
  +        // invoke a continuation 
  +        var continuationsMgr =
  +            cocoon.componentManager.lookup(Packages.org.apache.cocoon.components.flow.ContinuationsManager.ROLE);
  +        var wk = continuationsMgr.lookupWebContinuation(command);
  +        cocoon.componentManager.release(continuationsMgr);
  +        if (wk != null) {
  +            var jswk = wk.userObject;
  +            jswk.continuation(jswk);
  +            // note: not reached
           }
           handleInvalidContinuation(command);
           return;
       } 
  -    // Just start a new instance of the application
  -    cocoon.session.removeAttribute(id);
  -    var args = new Array(arguments.length - 5 + 1);
  -    args[0] = new XForm(id, validator_ns, validator_doc, scope);
  -    for (var i = 5; i < arguments.length; i++) {
  -	args[i-4] = arguments[i];
  +    if (id != null) {
  +        // Just start a new instance of the application
  +        var args = new Array(arguments.length - 5 + 1);
  +        args[0] = new XForm(id, validator_ns, validator_doc, scope);
  +        for (var i = 5; i < arguments.length; i++) {
  +            args[i-4] = arguments[i];
  +        }
  +        this[application].apply(this, args);
  +    } else {
  +        handleInvalidContinuation(command);
       }
  -    this[application].apply(this, args);
   }
  +