cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From t..@apache.org
Subject svn commit: r151169 - in cocoon/trunk/src/blocks/forms: java/org/apache/cocoon/forms/binding/ java/org/apache/cocoon/forms/flow/javascript/ java/org/apache/cocoon/forms/flow/javascript/v3/ java/org/apache/cocoon/forms/formmodel/ java/org/apache/cocoon/forms/util/ samples/
Date Thu, 03 Feb 2005 16:03:53 GMT
Author: tim
Date: Thu Feb  3 08:03:51 2005
New Revision: 151169

URL: http://svn.apache.org/viewcvs?view=rev&rev=151169
Log:
Minor merges with 2_1_X branch and Id fixes.

Modified:
    cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/binding/InsertBeanJXPathBindingBuilder.java
    cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/binding/JXPathBindingBuilderBase.java
    cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/binding/StructJXPathBinding.java
    cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/flow/javascript/Form.js
    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/BooleanField.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/Form.java
    cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/util/DomHelper.java
    cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/util/XMLAdapter.java
    cocoon/trunk/src/blocks/forms/samples/welcome.xml

Modified: cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/binding/InsertBeanJXPathBindingBuilder.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/binding/InsertBeanJXPathBindingBuilder.java?view=diff&r1=151168&r2=151169
==============================================================================
--- cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/binding/InsertBeanJXPathBindingBuilder.java
(original)
+++ cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/binding/InsertBeanJXPathBindingBuilder.java
Thu Feb  3 08:03:51 2005
@@ -32,7 +32,7 @@
  * <fb:insert-bean addmethod="..method-to-add.."/>
  * </code></pre>
  *
- * @version CVS $Id$
+ * @version $Id$
  */
 public class InsertBeanJXPathBindingBuilder extends JXPathBindingBuilderBase {
 

Modified: cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/binding/JXPathBindingBuilderBase.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/binding/JXPathBindingBuilderBase.java?view=diff&r1=151168&r2=151169
==============================================================================
--- cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/binding/JXPathBindingBuilderBase.java
(original)
+++ cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/binding/JXPathBindingBuilderBase.java
Thu Feb  3 08:03:51 2005
@@ -138,6 +138,10 @@
          * Flag which controls whether a binding is active during saving.
          */
         final boolean saveEnabled;
+        /**
+         * Flag which controls whether the jxpath context used by this binding 
+         * should be operating in lenient mode or not 
+         */
         final Boolean leniency;
 
         final static CommonAttributes DEFAULT = new CommonAttributes("location unknown",
true, true, null);

Modified: cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/binding/StructJXPathBinding.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/binding/StructJXPathBinding.java?view=diff&r1=151168&r2=151169
==============================================================================
--- cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/binding/StructJXPathBinding.java
(original)
+++ cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/binding/StructJXPathBinding.java
Thu Feb  3 08:03:51 2005
@@ -28,7 +28,7 @@
  * that contains other widgets.</li>
  * </ol>
  *
- * @version CVS $Id$
+ * @version $Id$
  */
 public class StructJXPathBinding extends ComposedJXPathBindingBase {
 

Modified: cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/flow/javascript/Form.js
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/flow/javascript/Form.js?view=diff&r1=151168&r2=151169
==============================================================================
--- cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/flow/javascript/Form.js (original)
+++ cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/flow/javascript/Form.js Thu
Feb  3 08:03:51 2005
@@ -18,7 +18,7 @@
  * Implementation of the Cocoon Forms/FlowScript integration.
  *
  * @author <a href="http://www.apache.org/~sylvain/">Sylvain Wallez</a>
- * @version CVS $Id$
+ * @version $Id$
  */
 
 // Revisit this class, so it gives access to more than the value.

Modified: cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/flow/javascript/v3/ScriptableWidget.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/flow/javascript/v3/ScriptableWidget.java?view=diff&r1=151168&r2=151169
==============================================================================
--- 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
Thu Feb  3 08:03:51 2005
@@ -15,9 +15,21 @@
  */
 
 package org.apache.cocoon.forms.flow.javascript.v3;
+import java.math.BigDecimal;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+
 import org.apache.cocoon.forms.datatype.Datatype;
 import org.apache.cocoon.forms.datatype.SelectionList;
-import org.apache.cocoon.forms.event.*;
+import org.apache.cocoon.forms.event.ActionEvent;
+import org.apache.cocoon.forms.event.ActionListener;
+import org.apache.cocoon.forms.event.ActionListenerEnabled;
+import org.apache.cocoon.forms.event.ValueChangedEvent;
+import org.apache.cocoon.forms.event.ValueChangedListener;
+import org.apache.cocoon.forms.event.ValueChangedListenerEnabled;
 import org.apache.cocoon.forms.formmodel.Action;
 import org.apache.cocoon.forms.formmodel.AggregateField;
 import org.apache.cocoon.forms.formmodel.BooleanField;
@@ -37,19 +49,13 @@
 import org.apache.cocoon.forms.validation.ValidationErrorAware;
 import org.apache.cocoon.forms.validation.WidgetValidator;
 import org.mozilla.javascript.Context;
+import org.mozilla.javascript.Function;
 import org.mozilla.javascript.JavaScriptException;
 import org.mozilla.javascript.NativeArray;
-import org.mozilla.javascript.Function;
 import org.mozilla.javascript.Scriptable;
 import org.mozilla.javascript.ScriptableObject;
 import org.mozilla.javascript.Undefined;
 import org.mozilla.javascript.Wrapper;
-import java.math.BigDecimal;
-import java.util.List;
-import java.util.LinkedList;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.HashMap;
 
 /**
  * @version $Id$

Modified: cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/BooleanField.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/BooleanField.java?view=diff&r1=151168&r2=151169
==============================================================================
--- 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
Thu Feb  3 08:03:51 2005
@@ -63,9 +63,9 @@
     }
 
     public void readFromRequest(FormContext formContext) {
-        if (!getCombinedState().isAcceptingInputs())
+        if (!getCombinedState().isAcceptingInputs()) {
             return;
-
+        }
         validationError = null;
         Object oldValue = value;
         String param = formContext.getRequest().getParameter(getRequestParameterName());
@@ -141,11 +141,11 @@
         if (object == null) {
             object = Boolean.FALSE;
         }
-        
+
         if (!(object instanceof Boolean)) {
             throw new RuntimeException("Cannot set value of boolean field \"" + getRequestParameterName()
+ "\" to a non-Boolean value.");
         }
-        
+
         Object oldValue = value;
         value = (Boolean)object;
         if (value != oldValue) {

Modified: cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/Field.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/Field.java?view=diff&r1=151168&r2=151169
==============================================================================
--- 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 Thu Feb
 3 08:03:51 2005
@@ -375,7 +375,7 @@
         if (locale == null) {
             locale = getForm().getLocale();
         }
-        
+
         if (enteredValue != null || value != null) {
             contentHandler.startElement(Constants.INSTANCE_NS, VALUE_EL, Constants.INSTANCE_PREFIX_COLON
+ VALUE_EL, XMLUtils.EMPTY_ATTRIBUTES);
             String stringValue;

Modified: cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/Form.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/Form.java?view=diff&r1=151168&r2=151169
==============================================================================
--- cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/Form.java (original)
+++ cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/Form.java Thu Feb
 3 08:03:51 2005
@@ -33,7 +33,7 @@
  *
  * @author Bruno Dumon
  * @author <a href="http://www.apache.org/~sylvain/">Sylvain Wallez</a>
- * @version CVS $Id$
+ * @version $Id$
  */
 public class Form extends AbstractContainerWidget {
 

Modified: cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/util/DomHelper.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/util/DomHelper.java?view=diff&r1=151168&r2=151169
==============================================================================
--- cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/util/DomHelper.java (original)
+++ cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/util/DomHelper.java Thu Feb
 3 08:03:51 2005
@@ -54,7 +54,7 @@
  * able to provide information about the location of elements in their source
  * XML file. See the {@link #getLocation(Element)} method.
  * 
- * @version CVS $Id$
+ * @version $Id$
  */
 public class DomHelper {
 

Modified: cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/util/XMLAdapter.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/util/XMLAdapter.java?view=diff&r1=151168&r2=151169
==============================================================================
--- cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/util/XMLAdapter.java (original)
+++ cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/util/XMLAdapter.java Thu Feb
 3 08:03:51 2005
@@ -305,9 +305,10 @@
                 data(datatype.convertToString(widget.getValue(), this.locale));
         } else if (widget instanceof BooleanField) {
             // FIXME: BooleanField should implement DataWidget, which
-            // would make this case unnesecary
-            if (widget.getValue() != null)
+            // would make this case unnecessary
+            if (widget.getValue() != null) {
                 data((Boolean)widget.getValue() == Boolean.TRUE ? "true" : "false");
+            }
         } else if (widget instanceof MultiValueField) {
             Datatype datatype = ((MultiValueField)widget).getDatatype();
             Object[] values = (Object[])widget.getValue();

Modified: cocoon/trunk/src/blocks/forms/samples/welcome.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/forms/samples/welcome.xml?view=diff&r1=151168&r2=151169
==============================================================================
--- cocoon/trunk/src/blocks/forms/samples/welcome.xml (original)
+++ cocoon/trunk/src/blocks/forms/samples/welcome.xml Thu Feb  3 08:03:51 2005
@@ -14,7 +14,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<!-- $Id$-->
+<!--
+  @version $Id$
+-->
 <samples name="CForms Block Samples" xmlns:xlink="http://www.w3.org/1999/xlink">
  <group name="Back">
   <sample name="Back" href="../..">to Cocoon Samples main page</sample>
@@ -40,7 +42,7 @@
   <sample name="Form Model GUI" href="form_model_gui.flow">Illustrates the use of Class,
New, Struct, and Union.</sample>
   <sample name="HTMLArea" href="htmlarea">A simple form using the HTML editor widget.</sample>
   <sample name="Aggregate" href="aggregate/example">Aggregate field examples</sample>
-  <sample name="Multipage wizard" href="do-multipage.flow">A multipage wizard, using
widget states and actions to go throgh pages.</sample>
+  <sample name="Multipage wizard" href="do-multipage.flow">A multipage wizard, using
widget states and actions to move between pages.</sample>
  </group>
 
  <group name="Binding Samples">



Mime
View raw message