You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by ts...@apache.org on 2004/02/26 17:11:20 UTC
cvs commit: jakarta-tapestry/framework/src/org/apache/tapestry IForm.java
tsvetelin 2004/02/26 08:11:20
Modified: framework/src/org/apache/tapestry/form Hidden.java
Hidden.jwc Form.java
framework/src/org/apache/tapestry IForm.java
Log:
implementation of "id" parameter in Hidden component
Revision Changes Path
1.10 +23 -2 jakarta-tapestry/framework/src/org/apache/tapestry/form/Hidden.java
Index: Hidden.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/org/apache/tapestry/form/Hidden.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Hidden.java 19 Feb 2004 17:37:37 -0000 1.9
+++ Hidden.java 26 Feb 2004 16:11:20 -0000 1.10
@@ -72,7 +72,18 @@
else
externalValue = (String) getValueBinding().getObject("value", String.class);
- form.addHiddenValue(name, externalValue);
+ String id = getElementId();
+ //if we would like to test the IForm.addHiddenValue(name, externalValue) method with
+ //Hidden JUnit test the following code must be default. But from the performance issue
+ //I don't use the id parameter clauses.
+/* if(id == null || id.length() == 0){
+ form.addHiddenValue(name, externalValue);
+ }else{
+ form.addHiddenValue(name, id, externalValue);
+ }
+*/
+ form.addHiddenValue(name, id, externalValue);
+
return;
}
@@ -105,6 +116,15 @@
listener.actionTriggered(this, cycle);
}
+ public String getElementId(){
+ String value = null;
+ IBinding idBinding = getIdBinding();
+ if(idBinding != null){
+ value = idBinding.getString();
+ }
+ return value;
+ }
+
/** @since 2.2 **/
private DataSqueezer getDataSqueezer()
@@ -115,6 +135,7 @@
public abstract IActionListener getListener();
public abstract IBinding getValueBinding();
+ public abstract IBinding getIdBinding();
/**
*
1.4 +10 -1 jakarta-tapestry/framework/src/org/apache/tapestry/form/Hidden.jwc
Index: Hidden.jwc
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/org/apache/tapestry/form/Hidden.jwc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Hidden.jwc 1 Jun 2003 05:05:02 -0000 1.3
+++ Hidden.jwc 26 Feb 2004 16:11:20 -0000 1.4
@@ -29,6 +29,15 @@
</description>
</parameter>
+ <parameter name="id"
+ required="no"
+ type="java.lang.String"
+ direction="custom">
+ <description>
+ ID parameter of HTML hidden object.
+ </description>
+ </parameter>
+
<parameter name="encode" type="boolean" direction="in"/>
<property-specification name="name" type="java.lang.String"/>
1.17 +38 -12 jakarta-tapestry/framework/src/org/apache/tapestry/form/Form.java
Index: Form.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/org/apache/tapestry/form/Form.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- Form.java 19 Feb 2004 17:37:37 -0000 1.16
+++ Form.java 26 Feb 2004 16:11:20 -0000 1.17
@@ -70,12 +70,19 @@
{
String _name;
String _value;
+ String _id;
private HiddenValue(String name, String value)
{
- _name = name;
- _value = value;
+ this(name, null, value);
}
+
+ private HiddenValue(String name, String id, String value)
+ {
+ _name = name;
+ _id = id;
+ _value = value;
+ }
}
private boolean _rewinding;
@@ -625,13 +632,22 @@
protected void writeHiddenField(IMarkupWriter writer, String name, String value)
{
- writer.beginEmpty("input");
- writer.attribute("type", "hidden");
- writer.attribute("name", name);
- writer.attribute("value", value);
- writer.println();
+ writeHiddenField(writer, name, null, value);
}
+ protected void writeHiddenField(IMarkupWriter writer, String name, String id, String value)
+ {
+ writer.beginEmpty("input");
+ writer.attribute("type", "hidden");
+ writer.attribute("name", name);
+
+ if(id != null && id.length() != 0)
+ writer.attribute("id", id);
+
+ writer.attribute("value", value);
+ writer.println();
+ }
+
/**
* @since 2.2
*
@@ -775,12 +791,22 @@
public void addHiddenValue(String name, String value)
{
- if (_hiddenValues == null)
- _hiddenValues = new ArrayList();
+ if (_hiddenValues == null)
+ _hiddenValues = new ArrayList();
- _hiddenValues.add(new HiddenValue(name, value));
+ _hiddenValues.add(new HiddenValue(name, value));
}
+ /** @since 3.0 */
+
+ public void addHiddenValue(String name, String id, String value)
+ {
+ if (_hiddenValues == null)
+ _hiddenValues = new ArrayList();
+
+ _hiddenValues.add(new HiddenValue(name, id, value));
+ }
+
/**
* Writes hidden values accumulated during the render
* (by components invoking {@link #addHiddenValue(String, String)}.
@@ -796,7 +822,7 @@
{
HiddenValue hv = (HiddenValue) _hiddenValues.get(i);
- writeHiddenField(writer, hv._name, hv._value);
+ writeHiddenField(writer, hv._name, hv._id, hv._value);
}
}
}
1.9 +16 -1 jakarta-tapestry/framework/src/org/apache/tapestry/IForm.java
Index: IForm.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/org/apache/tapestry/IForm.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- IForm.java 19 Feb 2004 17:37:36 -0000 1.8
+++ IForm.java 26 Feb 2004 16:11:20 -0000 1.9
@@ -156,4 +156,19 @@
*/
public void addHiddenValue(String name, String value);
+
+ /**
+ * Adds a hidden field value to be stored in the form. This ensures that all
+ * of the <input type="hidden"> (or equivalent) are grouped together,
+ * which ensures that the output HTML is valid (ie. doesn't
+ * have <input> improperly nested with <tr>, etc.).
+ *
+ * <p>
+ * It is acceptible to add multiple hidden fields with the same name.
+ * They will be written in the order they are received.
+ *
+ * @since 3.0
+ */
+
+ public void addHiddenValue(String name, String id, String value);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tapestry-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tapestry-dev-help@jakarta.apache.org