Return-Path: Delivered-To: apmail-cocoon-cvs-archive@www.apache.org Received: (qmail 47093 invoked from network); 17 Sep 2006 03:38:12 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 17 Sep 2006 03:38:12 -0000 Received: (qmail 34772 invoked by uid 500); 17 Sep 2006 03:38:12 -0000 Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org Received: (qmail 34716 invoked by uid 500); 17 Sep 2006 03:38:12 -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 34704 invoked by uid 99); 17 Sep 2006 03:38:12 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 16 Sep 2006 20:38:12 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 16 Sep 2006 20:38:11 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 0BB061A981A; Sat, 16 Sep 2006 20:37:51 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r447009 - in /cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/formmodel: ./ algorithms/ Date: Sun, 17 Sep 2006 03:37:50 -0000 To: cvs@cocoon.apache.org From: vgritsenko@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20060917033751.0BB061A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: vgritsenko Date: Sat Sep 16 20:37:50 2006 New Revision: 447009 URL: http://svn.apache.org/viewvc?view=rev&rev=447009 Log: tabs, props Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/formmodel/ImageMapDefinition.java cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/formmodel/algorithms/AbstractBaseAlgorithm.java (props changed) cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/formmodel/algorithms/AbstractBaseAlgorithmBuilder.java (props changed) cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/formmodel/algorithms/JavaAlgorithmBuilder.java (contents, props changed) cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/formmodel/algorithms/JavaScript.java (props changed) cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/formmodel/algorithms/JavaScriptBuilder.java (contents, props changed) cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/formmodel/algorithms/RepeatedFormula.java (props changed) cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/formmodel/algorithms/RepeatedFormulaBuilder.java (props changed) cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/formmodel/algorithms/SimpleFormula.java (props changed) cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/formmodel/algorithms/SimpleFormulaBuilder.java (props changed) Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/formmodel/ImageMapDefinition.java URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/formmodel/ImageMapDefinition.java?view=diff&rev=447009&r1=447008&r2=447009 ============================================================================== --- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/formmodel/ImageMapDefinition.java (original) +++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/formmodel/ImageMapDefinition.java Sat Sep 16 20:37:50 2006 @@ -1,12 +1,12 @@ /* * Copyright 1999-2004 The Apache Software Foundation. - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -20,14 +20,14 @@ import org.apache.cocoon.forms.event.WidgetEventMulticaster; /** - * The {@link WidgetDefinition} part of an ImageMap widget, see {@link ImageMap} + * The {@link WidgetDefinition} part of an ImageMap widget, see {@link ImageMap} * for more information. - * + * * @version $Id$ * @since 2.1.8 */ public class ImageMapDefinition extends AbstractWidgetDefinition { - + private String actionCommand; private String imgURI; // URI of widget's image private ActionListener listener; @@ -48,7 +48,7 @@ checkMutable(); this.listener = WidgetEventMulticaster.add(this.listener, listener); } - + public void fireActionEvent(ActionEvent event) { if (this.listener != null) { this.listener.actionPerformed(event); @@ -65,6 +65,6 @@ } public void setImageURI(String newImgURI) { - this.imgURI= newImgURI; + this.imgURI= newImgURI; } } Propchange: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/formmodel/algorithms/AbstractBaseAlgorithm.java ------------------------------------------------------------------------------ svn:keywords = Id Propchange: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/formmodel/algorithms/AbstractBaseAlgorithmBuilder.java ------------------------------------------------------------------------------ svn:keywords = Id Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/formmodel/algorithms/JavaAlgorithmBuilder.java URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/formmodel/algorithms/JavaAlgorithmBuilder.java?view=diff&rev=447009&r1=447008&r2=447009 ============================================================================== --- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/formmodel/algorithms/JavaAlgorithmBuilder.java (original) +++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/formmodel/algorithms/JavaAlgorithmBuilder.java Sat Sep 16 20:37:50 2006 @@ -25,7 +25,7 @@ * If the specified class is a {@link org.apache.cocoon.forms.formmodel.algorithms.AbstractBaseAlgorithm} * subclass, the build process will be delegated to * {@link org.apache.cocoon.forms.formmodel.algorithms.AbstractBaseAlgorithmBuilder}. - * + * * @version $Id$ */ public class JavaAlgorithmBuilder extends AbstractBaseAlgorithmBuilder { @@ -34,13 +34,13 @@ String clazzname = DomHelper.getAttribute(algorithmElement, "class"); Class clazz = Class.forName(clazzname); if (AbstractBaseAlgorithm.class.isAssignableFrom(clazz)) { - AbstractBaseAlgorithm algorithm = (AbstractBaseAlgorithm) clazz.newInstance(); - super.setup(algorithmElement, algorithm); - return algorithm; + AbstractBaseAlgorithm algorithm = (AbstractBaseAlgorithm) clazz.newInstance(); + super.setup(algorithmElement, algorithm); + return algorithm; } else { - CalculatedFieldAlgorithm algorithm = (CalculatedFieldAlgorithm) clazz.newInstance(); - super.setupComponent(algorithm); - return algorithm; + CalculatedFieldAlgorithm algorithm = (CalculatedFieldAlgorithm) clazz.newInstance(); + super.setupComponent(algorithm); + return algorithm; } } Propchange: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/formmodel/algorithms/JavaAlgorithmBuilder.java ------------------------------------------------------------------------------ svn:keywords = Id Propchange: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/formmodel/algorithms/JavaScript.java ------------------------------------------------------------------------------ svn:keywords = Id Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/formmodel/algorithms/JavaScriptBuilder.java URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/formmodel/algorithms/JavaScriptBuilder.java?view=diff&rev=447009&r1=447008&r2=447009 ============================================================================== --- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/formmodel/algorithms/JavaScriptBuilder.java (original) +++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/formmodel/algorithms/JavaScriptBuilder.java Sat Sep 16 20:37:50 2006 @@ -26,29 +26,26 @@ /** * Javascript based calculated field algorithm builder. - * - *

- * With this algorithm the user can implement it's own algorithm directly in javascript and directly inside - * the form definition. - *

- * - *

- * The syntax is as follows : - * + * + *

With this algorithm the user can implement it's own algorithm directly in + * javascript and directly inside the form definition.

+ * + *

The syntax is as follows: + * 

  *   <fd:value type="javascript" triggers="items,price,discount">
- *         var price = parent.lookupWidget('price').getValue();
- *         var items = parent.lookupWidget('items').getValue();
- *         var discount = parent.lookupWidget('discount').getValue();
- * 
- *         if (discount == 'completelyfree') return 0;
- *         var total = price * items;
- *         if (discount == 'halfprice') return total / 2;
- * 		    return total;
+ *     var price = parent.lookupWidget('price').getValue();
+ *     var items = parent.lookupWidget('items').getValue();
+ *     var discount = parent.lookupWidget('discount').getValue();
+ *
+ *     if (discount == 'completelyfree') return 0;
+ *     var total = price * items;
+ *     if (discount == 'halfprice') return total / 2;
+ *       return total;
  *   </fd:value>
- * 
+ *
*

- *

- * From inside the javascript function the following objects are accessible : + * + *

From inside the javascript function the following objects are accessible: *

*
form
*
The form object.
@@ -58,27 +55,27 @@ *
This are accessible only when flowscript is in use (see bug COCOON-1804)
*
*

- *

- * As you can see, the function must return the calculated value, and not set this directly in the widget. This - * way the value can be converted correctly if needed. - *

+ * + *

As you can see, the function must return the calculated value, and not set this + * directly in the widget. This way the value can be converted correctly if needed.

+ * * @version $Id$ */ public class JavaScriptBuilder implements CalculatedFieldAlgorithmBuilder { public CalculatedFieldAlgorithm build(Element algorithmElement) throws Exception { JavaScript ret = new JavaScript(); - + String fields = DomHelper.getAttribute(algorithmElement, "triggers"); StringTokenizer stok = new StringTokenizer(fields, ", "); while (stok.hasMoreTokens()) { String fname = stok.nextToken(); ret.addTriggerWidget(fname); } - + Function func = JavaScriptHelper.buildFunction(algorithmElement, "calculate", new String[]{"form", "parent"}); ret.setJsfunction(func); - + return ret; } Propchange: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/formmodel/algorithms/JavaScriptBuilder.java ------------------------------------------------------------------------------ svn:keywords = Id Propchange: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/formmodel/algorithms/RepeatedFormula.java ------------------------------------------------------------------------------ svn:keywords = Id Propchange: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/formmodel/algorithms/RepeatedFormulaBuilder.java ------------------------------------------------------------------------------ svn:keywords = Id Propchange: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/formmodel/algorithms/SimpleFormula.java ------------------------------------------------------------------------------ svn:keywords = Id Propchange: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/formmodel/algorithms/SimpleFormulaBuilder.java ------------------------------------------------------------------------------ svn:keywords = Id