cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From t..@apache.org
Subject svn commit: rev 56394 - in cocoon/trunk/src/blocks/forms: java/org/apache/cocoon/forms/binding java/org/apache/cocoon/forms/flow/javascript/v2 java/org/apache/cocoon/forms/flow/javascript/v3 java/org/apache/cocoon/forms/formmodel java/org/apache/cocoon/forms/generation samples samples/forms samples/resources samples/v2
Date Tue, 02 Nov 2004 17:45:11 GMT
Author: tim
Date: Tue Nov  2 09:45:11 2004
New Revision: 56394

Modified:
   cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/binding/JavaScriptJXPathBindingBuilder.java
   cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/flow/javascript/v2/ScriptableWidget.java
   cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/flow/javascript/v3/ScriptableWidget.java
   cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/AbstractDatatypeWidgetDefinition.java
   cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/AbstractWidgetDefinitionBuilder.java
   cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/BooleanField.java
   cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/DeleteRowsActionDefinition.java
   cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/Field.java
   cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/MultiValueField.java
   cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/Repeater.java
   cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/SelectableWidget.java
   cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/generation/jx-macros.xml
   cocoon/trunk/src/blocks/forms/samples/forms/htmlarea_template.xml
   cocoon/trunk/src/blocks/forms/samples/resources/forms-lib.js
   cocoon/trunk/src/blocks/forms/samples/sitemap.xmap
   cocoon/trunk/src/blocks/forms/samples/v2/sitemap.xmap
Log:
Whitespace and a quote character

Modified: cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/binding/JavaScriptJXPathBindingBuilder.java
==============================================================================
--- cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/binding/JavaScriptJXPathBindingBuilder.java
(original)
+++ cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/binding/JavaScriptJXPathBindingBuilder.java
Tue Nov  2 09:45:11 2004
@@ -65,7 +65,7 @@
  * </ul>
  *
  * @author <a href="http://www.apache.org/~sylvain/">Sylvain Wallez</a>
- * @version CVS $Id: JavaScriptJXPathBindingBuilder.java,v 1.4 2004/06/24 11:32:47 cziegeler
Exp $
+ * @version CVS $Id$
  */
 public class JavaScriptJXPathBindingBuilder extends JXPathBindingBuilderBase implements Contextualizable
{
 
@@ -75,7 +75,7 @@
 		this.avalonContext = context;
 	}
 
-	public JXPathBindingBase buildBinding(Element element, Assistant assistant) throws BindingException
{
+    public JXPathBindingBase buildBinding(Element element, Assistant assistant) throws BindingException
{
         try {
             CommonAttributes commonAtts = JXPathBindingBuilderBase.getCommonAttributes(element);
 
@@ -103,7 +103,7 @@
                 }
                 saveScript = JavaScriptHelper.buildFunction(saveElem, JavaScriptJXPathBinding.SAVE_PARAMS);
             }
-            
+
             // Build child bindings
             Map childBindings;
             Element[] children = DomHelper.getChildElements(element, BindingManager.NAMESPACE,
"child-binding");
@@ -113,7 +113,7 @@
             		childBindings = new HashMap();
             		for (int i = 0; i < children.length; i++) {
             			Element child = children[i];
-            			
+
             			// Get the binding name and check its uniqueness
             			String name = DomHelper.getAttribute(child, "name");
             			if (childBindings.containsKey(name)) {

Modified: cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/flow/javascript/v2/ScriptableWidget.java
==============================================================================
--- cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/flow/javascript/v2/ScriptableWidget.java
(original)
+++ cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/flow/javascript/v2/ScriptableWidget.java
Tue Nov  2 09:45:11 2004
@@ -659,7 +659,7 @@
             }
         }
     }
-    
+
     public void jsFunction_removeSelectionList() {
     	if (delegate instanceof SelectableWidget) {
     		((SelectableWidget)delegate).removeSelectionList();

Modified: cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/flow/javascript/v3/ScriptableWidget.java
==============================================================================
--- cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/flow/javascript/v3/ScriptableWidget.java
(original)
+++ cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/flow/javascript/v3/ScriptableWidget.java
Tue Nov  2 09:45:11 2004
@@ -725,7 +725,7 @@
             }
         }
     }
-    
+
     public void jsFunction_removeSelectionList() {
     	if (delegate instanceof SelectableWidget) {
     		((SelectableWidget)delegate).removeSelectionList();

Modified: cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/AbstractDatatypeWidgetDefinition.java
==============================================================================
--- cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/AbstractDatatypeWidgetDefinition.java
(original)
+++ cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/AbstractDatatypeWidgetDefinition.java
Tue Nov  2 09:45:11 2004
@@ -98,7 +98,7 @@
     public boolean hasValueChangedListeners() {
         return this.listener != null;
     }
-    
+
     public ValueChangedListener getValueChangedListener() {
         return this.listener;
     }

Modified: cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/AbstractWidgetDefinitionBuilder.java
==============================================================================
--- cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/AbstractWidgetDefinitionBuilder.java
(original)
+++ cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/AbstractWidgetDefinitionBuilder.java
Tue Nov  2 09:45:11 2004
@@ -67,7 +67,7 @@
     protected void setCommonProperties(Element widgetElement, AbstractWidgetDefinition widgetDefinition)
throws Exception {
         // location
         widgetDefinition.setLocation(DomHelper.getLocation(widgetElement));
-        
+
         // id
         if (widgetDefinition instanceof FormDefinition) {
             // FormDefinition is the *only* kind of widget that has an optional id
@@ -80,7 +80,7 @@
             }
             widgetDefinition.setId(id);
         }
-        
+
         // attributes
         Element attrContainer = DomHelper.getChildElement(widgetElement, Constants.DEFINITION_NS,
"attributes", false);
         if (attrContainer != null) {

Modified: cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/BooleanField.java
==============================================================================
--- cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/BooleanField.java
(original)
+++ cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/BooleanField.java
Tue Nov  2 09:45:11 2004
@@ -70,7 +70,7 @@
                 value = Boolean.TRUE;
             else
                 value = Boolean.FALSE;
-            
+
             if (value != oldValue) {
                 getForm().addWidgetEvent(new ValueChangedEvent(this, oldValue, value));
             }

Modified: cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/DeleteRowsActionDefinition.java
==============================================================================
--- cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/DeleteRowsActionDefinition.java
(original)
+++ cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/DeleteRowsActionDefinition.java
Tue Nov  2 09:45:11 2004
@@ -22,28 +22,28 @@
  * <p>
  * The action listeners attached to this action, if any, are called <em>before</em>
the rows
  * are actually removed
- * 
+ *
  * @author <a href="http://www.apache.org/~sylvain/">Sylvain Wallez</a>
  * @version CVS $Id$
  */
 public class DeleteRowsActionDefinition extends RepeaterActionDefinition {
-    
+
     private String selectName;
-    
+
     public DeleteRowsActionDefinition(String repeaterName, String selectName) {
         super(repeaterName);
         this.selectName = selectName;
     }
-    
+
     public boolean hasActionListeners() {
         // we always want to be notified
         return true;
     }
-        
+
     public void fireActionEvent(ActionEvent event) {
         // Call action listeners, if any
         super.fireActionEvent(event);
-        
+
         // and actually delete the rows
         Repeater repeater = ((RepeaterAction)event.getSource()).getRepeater();
         for (int i = repeater.getSize() - 1; i >= 0; i--) {

Modified: cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/Field.java
==============================================================================
--- cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/Field.java	(original)
+++ cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/Field.java	Tue Nov
 2 09:45:11 2004
@@ -412,7 +412,7 @@
     public void setSelectionList(Object model, String valuePath, String labelPath) {
         setSelectionList(getFieldDefinition().buildSelectionListFromModel(model, valuePath,
labelPath));
     }
-    
+
     /**
      * Delete this field's selection list.
      */

Modified: cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/MultiValueField.java
==============================================================================
--- cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/MultiValueField.java
(original)
+++ cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/MultiValueField.java
Tue Nov  2 09:45:11 2004
@@ -76,7 +76,7 @@
             enteredValues = formContext.getRequest().getParameterValues(getRequestParameterName());
             validationError = null;
             values = null;
- 
+
             boolean conversionFailed = false;
             if (enteredValues != null) {
                 // Normally, for MultiValueFields, the user selects the values from
@@ -96,7 +96,7 @@
                         break;
                     }
                 }
- 
+
                 if (!conversionFailed)
                     values = tempValues;
                 else
@@ -207,7 +207,7 @@
     public void setSelectionList(String uri) {
         setSelectionList(this.definition.buildSelectionList(uri));
     }
-    
+
     /**
      * Delete this field's selection list.
      */

Modified: cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/Repeater.java
==============================================================================
--- cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/Repeater.java	(original)
+++ cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/Repeater.java	Tue
Nov  2 09:45:11 2004
@@ -191,12 +191,12 @@
                 } catch (NumberFormatException exc) {
                     // do nothing
                 }
- 
+
                 // some protection against people who might try to exhaust the server by
supplying very large
                 // size parameters
                 if (size > 500)
                     throw new RuntimeException("Client is not allowed to specify a repeater
size larger than 500.");
- 
+
                 int currentSize = getSize();
                 if (currentSize < size) {
                     for (int i = currentSize; i < size; i++) {
@@ -209,7 +209,7 @@
                 }
             }
         }
- 
+
         if(getProcessChildRequests() == true) {
             // let the rows read their data from the request
             Iterator rowIt = rows.iterator();
@@ -328,7 +328,7 @@
         public Widget getParent() {
             return Repeater.this;
         }
-        
+
         public Form getForm() {
             return Repeater.this.getForm();
         }

Modified: cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/SelectableWidget.java
==============================================================================
--- cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/SelectableWidget.java
(original)
+++ cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/SelectableWidget.java
Tue Nov  2 09:45:11 2004
@@ -28,6 +28,6 @@
     public void setSelectionList(String uri);
 
     public void setSelectionList(Object model, String valuePath, String labelPath);
-    
+
     public void removeSelectionList();
 }

Modified: cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/generation/jx-macros.xml
==============================================================================
--- cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/generation/jx-macros.xml	(original)
+++ cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/generation/jx-macros.xml	Tue
Nov  2 09:45:11 2004
@@ -7,7 +7,7 @@
     -->
 	<jx:macro name="form-template" targetNamespace="http://apache.org/cocoon/forms/1.0#template">
 	  <jx:set var="cformsHelper" value="${Packages.org.apache.cocoon.forms.generation.JXMacrosHelper.createHelper(cocoon.consumer)}"/>
-	  <jx:set var="cformsDummy" value="${cformsHelper.startForm(macro.arguments)}"/>
+      <jx:set var="cformsDummy" value="${cformsHelper.startForm(macro.arguments)}"/>
         <jx:set var="form" value="${CocoonFormsInstance}"/>
         <!-- the form is also the current widget -->
         <jx:set var="widget" value="${form}"/>
@@ -21,9 +21,9 @@
 	<jx:macro name="widget" targetNamespace="http://apache.org/cocoon/forms/1.0#template">
 	  <jx:parameter name="id"/>
       
-	  <jx:set var="widget" value="${cformsHelper.getWidget(widget, id)}"/>
+      <jx:set var="widget" value="${cformsHelper.getWidget(widget, id)}"/>
       <jx:set var="cformsDummy" value="${cformsHelper.generateWidget(widget, locale)}"/>
-	  <jx:evalBody/>
+      <jx:evalBody/>
       <jx:set var="cformsDummy" value="${cformsHelper.flushRoot(widget)}"/>
     </jx:macro>
 	
@@ -61,11 +61,11 @@
 	<jx:macro name="repeater-widget" targetNamespace="http://apache.org/cocoon/forms/1.0#template">
 	  <jx:parameter name="id"/>
 	
-	  <jx:set var="repeater" value="${cformsHelper.getRepeater(widget, id)}"/>
-	  <jx:forEach varStatus="repeaterLoop" begin="0" end="${repeater.getSize() - 1}">
-		  <jx:set var="widget" value="${repeater.getRow(repeaterLoop.index)}"/> 
-		  <jx:evalBody/>
-	  </jx:forEach>
+      <jx:set var="repeater" value="${cformsHelper.getRepeater(widget, id)}"/>
+      <jx:forEach varStatus="repeaterLoop" begin="0" end="${repeater.getSize() - 1}">
+          <jx:set var="widget" value="${repeater.getRow(repeaterLoop.index)}"/> 
+          <jx:evalBody/>
+      </jx:forEach>
 	</jx:macro>
 	
     <!--

Modified: cocoon/trunk/src/blocks/forms/samples/forms/htmlarea_template.xml
==============================================================================
--- cocoon/trunk/src/blocks/forms/samples/forms/htmlarea_template.xml	(original)
+++ cocoon/trunk/src/blocks/forms/samples/forms/htmlarea_template.xml	Tue Nov  2 09:45:11
2004
@@ -23,7 +23,7 @@
         <ft:widget-label id="data"/><br/>
         <ft:widget id="data">
           <fi:styling type="htmlarea" style="width: 100%;" rows="20" cols="80"/>
-        </ft:widget>      
+        </ft:widget>
         <br/>
         <input type="submit"/>
       </div>

Modified: cocoon/trunk/src/blocks/forms/samples/resources/forms-lib.js
==============================================================================
--- cocoon/trunk/src/blocks/forms/samples/resources/forms-lib.js	(original)
+++ cocoon/trunk/src/blocks/forms/samples/resources/forms-lib.js	Tue Nov  2 09:45:11 2004
@@ -192,4 +192,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: cocoon/trunk/src/blocks/forms/samples/sitemap.xmap
==============================================================================
--- cocoon/trunk/src/blocks/forms/samples/sitemap.xmap	(original)
+++ cocoon/trunk/src/blocks/forms/samples/sitemap.xmap	Tue Nov  2 09:45:11 2004
@@ -354,7 +354,7 @@
        </map:transform>
        <map:serialize type="xml"/>
      </map:match>
-     
+
      <map:match pattern="xhr_cars/*/*">
        <map:generate src="forms/car-db.xml"/>
        <map:transform src="xsl/xhr_carfilter.xsl">

Modified: cocoon/trunk/src/blocks/forms/samples/v2/sitemap.xmap
==============================================================================
--- cocoon/trunk/src/blocks/forms/samples/v2/sitemap.xmap	(original)
+++ cocoon/trunk/src/blocks/forms/samples/v2/sitemap.xmap	Tue Nov  2 09:45:11 2004
@@ -16,7 +16,7 @@
 -->
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
   <map:components>
-    <map:transformers default="xslt>
+    <map:transformers default="xslt">
       <map:transformer name="i18n" src="org.apache.cocoon.transformation.I18nTransformer">
         <catalogues default="other">
           <catalogue id="other" name="OtherMessages" location="../messages"/>

Mime
View raw message