Return-Path: 
 <cvs-return-23282-apmail-cocoon-cvs-archive=cocoon.apache.org@cocoon.apache.org>
Delivered-To: apmail-cocoon-cvs-archive@www.apache.org
Received: (qmail 17974 invoked from network); 18 May 2005 13:42:20 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 18 May 2005 13:42:20 -0000
Received: (qmail 41161 invoked by uid 500); 18 May 2005 13:35:05 -0000
Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org
Received: (qmail 41045 invoked by uid 500); 18 May 2005 13:35:03 -0000
Mailing-List: contact cvs-help@cocoon.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@cocoon.apache.org
list-help: <mailto:cvs-help@cocoon.apache.org>
list-unsubscribe: <mailto:cvs-unsubscribe@cocoon.apache.org>
List-Post: <mailto:cvs@cocoon.apache.org>
List-Id: <cvs.cocoon.apache.org>
Delivered-To: mailing list cvs@cocoon.apache.org
Received: (qmail 40918 invoked by uid 99); 18 May 2005 13:35:02 -0000
X-ASF-Spam-Status: No, hits=-9.8 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from minotaur.apache.org (HELO minotaur.apache.org)
 (209.237.227.194)
  by apache.org (qpsmtpd/0.28) with SMTP; Wed, 18 May 2005 06:35:00 -0700
Received: (qmail 14615 invoked by uid 65534); 18 May 2005 13:34:42 -0000
Message-ID: <20050518133442.14614.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Subject: svn commit: r170749 - in
 /cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/generation:
 JXMacrosHelper.java jx-macros.xml
Date: Wed, 18 May 2005 13:34:42 -0000
To: cvs@cocoon.apache.org
From: reinhard@apache.org
X-Mailer: svnmailer-1.0.0-dev
X-Virus-Checked: Checked
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: reinhard
Date: Wed May 18 06:34:41 2005
New Revision: 170749

URL: http://svn.apache.org/viewcvs?rev=3D170749&view=3Drev
Log:
make use of jxt possible in non flowscript scenarios - sync with trunk; unf=
ortunatly it doesn't work, maybe because of a problem with the old JXTempla=
teGenerator. I don't have time to investigate further on this

Modified:
    cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/fo=
rms/generation/JXMacrosHelper.java
    cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/fo=
rms/generation/jx-macros.xml

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/coc=
oon/forms/generation/JXMacrosHelper.java
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/=
forms/java/org/apache/cocoon/forms/generation/JXMacrosHelper.java?rev=3D170=
749&r1=3D170748&r2=3D170749&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/fo=
rms/generation/JXMacrosHelper.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/fo=
rms/generation/JXMacrosHelper.java Wed May 18 06:34:41 2005
@@ -21,6 +21,7 @@
 import java.util.Locale;
 import java.util.Map;
=20
+import org.apache.cocoon.environment.Request;
 import org.apache.cocoon.forms.Constants;
 import org.apache.cocoon.forms.formmodel.Form;
 import org.apache.cocoon.forms.formmodel.Repeater;
@@ -42,6 +43,7 @@
 public class JXMacrosHelper {
=20
     private XMLConsumer cocoonConsumer;
+    private Request request;   =20
     private ArrayStack stack =3D new ArrayStack();
     private Map classes; // lazily created
=20
@@ -51,14 +53,28 @@
      * @param consumer the generator's consumer
      * @return a helper object
      */
-    public static JXMacrosHelper createHelper(XMLConsumer consumer) {
-        return new JXMacrosHelper(consumer);
+    public static JXMacrosHelper createHelper(XMLConsumer consumer, Reques=
t request) {
+        System.out.println("bla");
+        return new JXMacrosHelper(consumer, request);
     }
=20
-    public JXMacrosHelper(XMLConsumer consumer) {
+    public JXMacrosHelper(XMLConsumer consumer, Request request) {
         this.cocoonConsumer =3D consumer;
+        this.request =3D request;
     }
+   =20
=20
+    public Form getForm(Form form, String attributeName) {
+        Form returnForm =3D form;
+        // if there hasn't been passed a form object, try to find it in th=
e request
+        if(returnForm =3D=3D null) {
+            returnForm =3D (Form) this.request.getAttribute(attributeName);
+        }
+        if(returnForm !=3D null) {
+            return returnForm;
+        }
+        throw new NullPointerException("There hasn't been passed a form ob=
ject to the template!");
+    }
     public void startForm(Form form, Map attributes) throws SAXException {
         // build attributes
         AttributesImpl attrs =3D new AttributesImpl();

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/coc=
oon/forms/generation/jx-macros.xml
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/=
forms/java/org/apache/cocoon/forms/generation/jx-macros.xml?rev=3D170749&r1=
=3D170748&r2=3D170749&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/fo=
rms/generation/jx-macros.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/fo=
rms/generation/jx-macros.xml Wed May 18 06:34:41 2005
@@ -23,8 +23,8 @@
         ft:form-template
     -->
     <jx:macro name=3D"form-template" targetNamespace=3D"http://apache.org/=
cocoon/forms/1.0#template">
-      <jx:set var=3D"cformsHelper" value=3D"#{org.apache.cocoon.forms.gene=
ration.JXMacrosHelper.createHelper($cocoon/consumer)}"/>
-      <jx:set var=3D"form" value=3D"${CocoonFormsInstance}"/>
+      <jx:set var=3D"cformsHelper" value=3D"#{org.apache.cocoon.forms.gene=
ration.JXMacrosHelper.createHelper($cocoon/consumer,$cocoon/request)}"/>
+      <jx:set var=3D"form" value=3D"${cformsHelper.getForm(CocoonFormsInst=
ance, cocoon.parameters['attribute-name'])}"/>
       <jx:if test=3D"${cformsHelper.isVisible(form)}">
         <jx:set var=3D"cformsDummy" value=3D"${cformsHelper.startForm(form=
, macro.arguments)}"/>
         <!-- the form is also the current widget -->