cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sylv...@apache.org
Subject svn commit: r291476 - in /cocoon/blocks/forms/trunk: java/org/apache/cocoon/forms/formmodel/Form.java java/org/apache/cocoon/forms/generation/JXMacrosHelper.java samples/forms/tasktree_template.xml
Date Sun, 25 Sep 2005 21:27:18 GMT
Author: sylvain
Date: Sun Sep 25 14:27:10 2005
New Revision: 291476

URL: http://svn.apache.org/viewcvs?rev=291476&view=rev
Log:
Fix bug #36808, reported by Jason Johnston <cocoon@lojjic.net>

Modified:
    cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/formmodel/Form.java
    cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/generation/JXMacrosHelper.java
    cocoon/blocks/forms/trunk/samples/forms/tasktree_template.xml

Modified: cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/formmodel/Form.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/formmodel/Form.java?rev=291476&r1=291475&r2=291476&view=diff
==============================================================================
--- cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/formmodel/Form.java (original)
+++ cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/formmodel/Form.java Sun Sep 25
14:27:10 2005
@@ -129,7 +129,7 @@
                 Widget parent = widget.getParent();
                 addParents: while (parent != this && parent != null) {
                     if (this.childUpdatedWidgets.add(parent.getRequestParameterName())) {
-                        parent = getParent();
+                        parent = parent.getParent();
                     } else {
                         // Parent already there, and therefore its own parents.
                         break addParents;

Modified: cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/generation/JXMacrosHelper.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/generation/JXMacrosHelper.java?rev=291476&r1=291475&r2=291476&view=diff
==============================================================================
--- cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/generation/JXMacrosHelper.java
(original)
+++ cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/generation/JXMacrosHelper.java
Sun Sep 25 14:27:10 2005
@@ -235,9 +235,8 @@
 
     public boolean pushRepeater(String path) throws SAXException {
         boolean result = pushWidget(path, true);
-        Widget w = peekWidget();
-        if (!(w instanceof Repeater)) {
-            throw new FormsRuntimeException(w + " is not a repeater", w.getLocation());
+        if (result && !(peekWidget() instanceof Repeater)) {
+            throw new IllegalArgumentException("Widget " + peekWidget() + " is not a repeater");
         }
         return result;
     }
@@ -399,6 +398,7 @@
                 this.rootLoc = loc;
                 this.rootRaw = raw;
             }
+
             depth++;
             super.startElement(uri, loc, raw, a);
         }

Modified: cocoon/blocks/forms/trunk/samples/forms/tasktree_template.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/forms/trunk/samples/forms/tasktree_template.xml?rev=291476&r1=291475&r2=291476&view=diff
==============================================================================
--- cocoon/blocks/forms/trunk/samples/forms/tasktree_template.xml (original)
+++ cocoon/blocks/forms/trunk/samples/forms/tasktree_template.xml Sun Sep 25 14:27:10 2005
@@ -65,7 +65,7 @@
     
   </style>
   <content>
-    <ft:form-template action="#{$cocoon/continuation/id}.continue" method="POST" ajax="false">
+    <ft:form-template action="#{$cocoon/continuation/id}.continue" method="POST" ajax="true">
     
       <ft:class id="task-class">
         <div class="section">



Mime
View raw message