You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by vg...@apache.org on 2007/03/13 21:09:39 UTC
svn commit: r517843 - in
/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/formmodel:
ActionDefinitionBuilder.java FieldDefinition.java
FieldDefinitionBuilder.java SubmitDefinition.java
SubmitDefinitionBuilder.java
Author: vgritsenko
Date: Tue Mar 13 13:09:32 2007
New Revision: 517843
URL: http://svn.apache.org/viewvc?view=rev&rev=517843
Log:
submit widget was not inheriting validate attribute from the library widget
Modified:
cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/formmodel/ActionDefinitionBuilder.java
cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/formmodel/FieldDefinition.java
cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/formmodel/FieldDefinitionBuilder.java
cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/formmodel/SubmitDefinition.java
cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/formmodel/SubmitDefinitionBuilder.java
Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/formmodel/ActionDefinitionBuilder.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/formmodel/ActionDefinitionBuilder.java?view=diff&rev=517843&r1=517842&r2=517843
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/formmodel/ActionDefinitionBuilder.java (original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/formmodel/ActionDefinitionBuilder.java Tue Mar 13 13:09:32 2007
@@ -5,9 +5,9 @@
* The ASF licenses this file to You 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.
@@ -25,7 +25,7 @@
/**
* Builds {@link ActionDefinition}s.
- *
+ *
* @version $Id$
*/
public class ActionDefinitionBuilder extends AbstractWidgetDefinitionBuilder {
@@ -36,7 +36,7 @@
definition.makeImmutable();
return definition;
}
-
+
protected void setupDefinition(Element widgetElement, ActionDefinition definition) throws Exception {
super.setupDefinition(widgetElement, definition);
@@ -44,21 +44,21 @@
// Get the "command" optional attribute
String actionCommand = DomHelper.getAttribute(widgetElement, "command", null);
-
+
// If unspecified, check the deprecated "action-command" deprecated attribute
if (actionCommand == null) {
actionCommand = DomHelper.getAttribute(widgetElement, "action-command", null);
if (actionCommand != null) {
Deprecation.logger.info("The 'action-command' attribute is deprecated and replaced by 'command', at " +
- DomHelper.getLocation(widgetElement));
+ DomHelper.getLocation(widgetElement));
}
}
-
+
definition.setActionCommand(actionCommand);
- Iterator iter = buildEventListeners(widgetElement, "on-action", ActionListener.class).iterator();
- while (iter.hasNext()) {
- definition.addActionListener((ActionListener)iter.next());
+ Iterator i = buildEventListeners(widgetElement, "on-action", ActionListener.class).iterator();
+ while (i.hasNext()) {
+ definition.addActionListener((ActionListener) i.next());
}
}
}
Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/formmodel/FieldDefinition.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/formmodel/FieldDefinition.java?view=diff&rev=517843&r1=517842&r2=517843
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/formmodel/FieldDefinition.java (original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/formmodel/FieldDefinition.java Tue Mar 13 13:09:32 2007
@@ -46,7 +46,7 @@
getLocation());
}
- FieldDefinition other = (FieldDefinition)definition;
+ FieldDefinition other = (FieldDefinition) definition;
this.required = other.required;
this.whitespaceTrim = other.whitespaceTrim;
Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/formmodel/FieldDefinitionBuilder.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/formmodel/FieldDefinitionBuilder.java?view=diff&rev=517843&r1=517842&r2=517843
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/formmodel/FieldDefinitionBuilder.java (original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/formmodel/FieldDefinitionBuilder.java Tue Mar 13 13:09:32 2007
@@ -22,7 +22,7 @@
import org.w3c.dom.Element;
/**
- * Builds {FieldDefinition}s.
+ * Builds {@link FieldDefinition}s.
*
* @version $Id$
*/
@@ -39,14 +39,15 @@
super.setupDefinition(widgetElement, definition);
// parse "@required"
- if(widgetElement.hasAttribute("required"))
+ if (widgetElement.hasAttribute("required")) {
definition.setRequired(DomHelper.getAttributeAsBoolean(widgetElement, "required", false));
+ }
// parse "@whitespace"
Whitespace whitespace = Whitespace.getEnum(DomHelper.getAttribute(widgetElement, "whitespace", "trim"));
- if(whitespace == null) {
+ if (whitespace == null) {
throw new FormsException("Unknown value for 'whitespace' attribute; valid values are 'trim', 'trim-start', 'trim-end', and 'preserve'.",
- DomHelper.getLocationObject(widgetElement));
+ DomHelper.getLocationObject(widgetElement));
}
definition.setWhitespaceTrim(whitespace);
Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/formmodel/SubmitDefinition.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/formmodel/SubmitDefinition.java?view=diff&rev=517843&r1=517842&r2=517843
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/formmodel/SubmitDefinition.java (original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/formmodel/SubmitDefinition.java Tue Mar 13 13:09:32 2007
@@ -28,6 +28,11 @@
private boolean validateForm;
+
+ public SubmitDefinition() {
+ validateForm = true;
+ }
+
/**
* initialize this definition with the other, sort of like a copy constructor
*/
Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/formmodel/SubmitDefinitionBuilder.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/formmodel/SubmitDefinitionBuilder.java?view=diff&rev=517843&r1=517842&r2=517843
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/formmodel/SubmitDefinitionBuilder.java (original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/formmodel/SubmitDefinitionBuilder.java Tue Mar 13 13:09:32 2007
@@ -27,8 +27,9 @@
*
* <p>The syntax is as follows:
* <pre>
- * <wd:submit id="sub-id" command="cmd" validate="false">
+ * <wd:submit id="sub-id" command="cmd" validate="false"/>
* </pre>
+ *
* The "validate" attribute can have the value <code>true</code> or
* <code>false</code> and determines if the form is to be validated
* (defaults to true).</p>
@@ -40,8 +41,14 @@
public WidgetDefinition buildWidgetDefinition(Element widgetElement) throws Exception {
SubmitDefinition definition = new SubmitDefinition();
super.setupDefinition(widgetElement, definition);
- definition.setValidateForm(DomHelper.getAttributeAsBoolean(widgetElement, "validate", true));
+
+ // parse "@validate"
+ if (widgetElement.hasAttribute("validate")) {
+ definition.setValidateForm(DomHelper.getAttributeAsBoolean(widgetElement, "validate", true));
+ }
+
definition.makeImmutable();
+
return definition;
- }
+ }
}