Author: jkuhnert
Date: Sat Oct 21 13:14:25 2006
New Revision: 466443
URL: http://svn.apache.org/viewvc?view=rev&rev=466443
Log:
Made clientId / name parameters and getters more deterministic wrt
IComponent.getClientId(). Updated all affected
components appropriately.
Id now support using id binding informal parameters (to some degree) .
Added:
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/TestHidden.java
Modified:
tapestry/tapestry4/trunk/tapestry-contrib/src/java/org/apache/tapestry/contrib/palette/Palette.java
tapestry/tapestry4/trunk/tapestry-contrib/src/java/org/apache/tapestry/contrib/palette/Palette.jwc
tapestry/tapestry4/trunk/tapestry-examples/TimeTracker/src/context/WEB-INF/log4j.properties
tapestry/tapestry4/trunk/tapestry-examples/TimeTracker/src/java/org/apache/tapestry/timetracker/page/TaskEntryPage.java
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/AbstractComponent.java
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/TapestryUtils.java
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/components/ForBean.java
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/AbstractFormComponent.java
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/Button.java
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/Form.java
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/FormSupportImpl.java
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/Hidden.java
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/Hidden.jwc
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/ListEdit.java
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/html/Rollover.java
tapestry/tapestry4/trunk/tapestry-framework/src/scripts/TestHidden.xml
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/dojo/form/TestAutocompleter.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/dojo/form/TestDropdownTimePicker.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/FormSupportTest.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/LinkSubmitTest.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/TestButton.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/TestCheckbox.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/TestSubmit.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/TestTextArea.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/TestTextField.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/valid/TestValidField.java
Modified:
tapestry/tapestry4/trunk/tapestry-contrib/src/java/org/apache/tapestry/contrib/palette/Palette.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-contrib/src/java/org/apache/tapestry/contrib/palette/Palette.java?view=diff&rev=466443&r1=466442&r2=466443
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-contrib/src/java/org/apache/tapestry/contrib/palette/Palette.java
(original)
+++
tapestry/tapestry4/trunk/tapestry-contrib/src/java/org/apache/tapestry/contrib/palette/Palette.java
Sat Oct 21 13:14:25 2006
@@ -229,14 +229,6 @@
/** @since 4.0 */
public abstract void setRequiredMessage(String message);
- /** @since 4.0 */
-
- public abstract String getIdParameter();
-
- /** @since 4.0 */
-
- public abstract void setClientId(String clientId);
-
protected void renderComponent(IMarkupWriter writer, IRequestCycle cycle)
{
// Next few lines of code is similar to AbstractFormComponent (which,
alas, extends from
@@ -277,11 +269,6 @@
protected void renderFormComponent(IMarkupWriter writer, IRequestCycle
cycle)
{
- String clientId = cycle.getUniqueId(TapestryUtils
- .convertTapestryIdToNMToken(getIdParameter()));
-
- setClientId(clientId);
-
_symbols = new HashMap(MAP_SIZE);
runScript(cycle);
Modified:
tapestry/tapestry4/trunk/tapestry-contrib/src/java/org/apache/tapestry/contrib/palette/Palette.jwc
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-contrib/src/java/org/apache/tapestry/contrib/palette/Palette.jwc?view=diff&rev=466443&r1=466442&r2=466443
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-contrib/src/java/org/apache/tapestry/contrib/palette/Palette.jwc
(original)
+++
tapestry/tapestry4/trunk/tapestry-contrib/src/java/org/apache/tapestry/contrib/palette/Palette.jwc
Sat Oct 21 13:14:25 2006
@@ -75,7 +75,7 @@
default-value="asset:DownDisabled"/>
<parameter name="displayName"/>
- <parameter name="id" property="idParameter" default-value="id"/>
+ <parameter name="id" />
<parameter name="validators"/>
<asset name="Select" path="select_right.gif"/>
Modified:
tapestry/tapestry4/trunk/tapestry-examples/TimeTracker/src/context/WEB-INF/log4j.properties
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-examples/TimeTracker/src/context/WEB-INF/log4j.properties?view=diff&rev=466443&r1=466442&r2=466443
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-examples/TimeTracker/src/context/WEB-INF/log4j.properties
(original)
+++
tapestry/tapestry4/trunk/tapestry-examples/TimeTracker/src/context/WEB-INF/log4j.properties
Sat Oct 21 13:14:25 2006
@@ -30,3 +30,4 @@
log4j.logger.org.apache.tapestry.timetracker=DEBUG
log4j.logger.org.apache.tapestry.form=DEBUG
+log4j.logger.org.apache.tapestry.form.FormSupportImpl=DEBUG
Modified:
tapestry/tapestry4/trunk/tapestry-examples/TimeTracker/src/java/org/apache/tapestry/timetracker/page/TaskEntryPage.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-examples/TimeTracker/src/java/org/apache/tapestry/timetracker/page/TaskEntryPage.java?view=diff&rev=466443&r1=466442&r2=466443
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-examples/TimeTracker/src/java/org/apache/tapestry/timetracker/page/TaskEntryPage.java
(original)
+++
tapestry/tapestry4/trunk/tapestry-examples/TimeTracker/src/java/org/apache/tapestry/timetracker/page/TaskEntryPage.java
Sat Oct 21 13:14:25 2006
@@ -46,7 +46,7 @@
private static final Logger _log = Logger.getLogger(TaskEntryPage.class);
@Component(id = "projectChoose", bindings = { "model=projectModel",
"value=selectedProject",
- "displayName=message:choose.project", "filterOnChange=true",
+ "displayName=message:choose.project",
"validators=validators:required"})
public abstract Autocompleter getProjectChoose();
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/AbstractComponent.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/AbstractComponent.java?view=diff&rev=466443&r1=466442&r2=466443
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/AbstractComponent.java
(original)
+++
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/AbstractComponent.java
Sat Oct 21 13:14:25 2006
@@ -306,9 +306,11 @@
if (_clientId == null) {
String id = getBoundId();
- if (id == null) id = getId();
+ if (id == null)
+ id = getId();
- _clientId =
cycle.getUniqueId(TapestryUtils.convertTapestryIdToNMToken(id));
+ if (id != null)
+ _clientId =
cycle.getUniqueId(TapestryUtils.convertTapestryIdToNMToken(id));
}
String id = getClientId();
@@ -438,7 +440,6 @@
}
/**
- *
* [EMAIL PROTECTED]
* @since 4.1
*/
@@ -448,6 +449,7 @@
return _clientId;
String boundId = getBoundId();
+
if (boundId == null)
return getId();
@@ -459,13 +461,14 @@
_clientId = id;
}
- String getBoundId()
+ protected String getBoundId()
{
if (_bindings == null)
return null;
IBinding id = (IBinding)_bindings.get("id");
- if (id == null)
+
+ if (id == null || id.getObject() == null)
return null;
return id.getObject().toString();
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/TapestryUtils.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/TapestryUtils.java?view=diff&rev=466443&r1=466442&r2=466443
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/TapestryUtils.java
(original)
+++
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/TapestryUtils.java
Sat Oct 21 13:14:25 2006
@@ -279,7 +279,7 @@
public static String convertTapestryIdToNMToken(String baseId)
{
String result = baseId.replace('$', '_');
-
+
while (result.startsWith("_"))
result = result.substring(1);
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/components/ForBean.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/components/ForBean.java?view=diff&rev=466443&r1=466442&r2=466443
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/components/ForBean.java
(original)
+++
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/components/ForBean.java
Sat Oct 21 13:14:25 2006
@@ -679,11 +679,6 @@
return false;
}
- public String getClientId()
- {
- return null;
- }
-
public String getDisplayName()
{
return null;
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/AbstractFormComponent.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/AbstractFormComponent.java?view=diff&rev=466443&r1=466442&r2=466443
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/AbstractFormComponent.java
(original)
+++
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/AbstractFormComponent.java
Sat Oct 21 13:14:25 2006
@@ -33,6 +33,7 @@
*/
public abstract class AbstractFormComponent extends AbstractComponent
implements IFormComponent
{
+
public abstract IForm getForm();
public abstract void setForm(IForm form);
@@ -58,32 +59,7 @@
*/
public abstract String getIdParameter();
-
- /**
- * Invoked from [EMAIL PROTECTED] #renderFormComponent(IMarkupWriter,
IRequestCycle)} (that is, an
- * implementation in a subclass), to obtain an id and render an id
attribute. Reads
- * [EMAIL PROTECTED] #getIdParameter()}.
- */
-
- protected void renderIdAttribute(IMarkupWriter writer, IRequestCycle cycle)
- {
- // If the user explicitly sets the id parameter to null, then
- // we honor that!
-
- String rawId = getIdParameter();
-
- if (rawId == null)
- return;
-
- String id =
cycle.getUniqueId(TapestryUtils.convertTapestryIdToNMToken(rawId));
-
- // Store for later access by the FieldLabel (or JavaScript).
-
- setClientId(id);
-
- writer.attribute("id", id);
- }
-
+
/**
* Invoked by [EMAIL PROTECTED] AbstractComponent#render(IMarkupWriter,
IRequestCycle)} to actually
* render the component (with any parameter values already set).
@@ -175,8 +151,10 @@
protected void setName(IForm form)
{
form.getElementId(this);
+
+ setClientId(getName());
}
-
+
/**
* Returns false. Subclasses that might be required must override this
method. Typically, this
* involves checking against the component's validators.
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/Button.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/Button.java?view=diff&rev=466443&r1=466442&r2=466443
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/Button.java
(original)
+++
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/Button.java
Sat Oct 21 13:14:25 2006
@@ -66,15 +66,7 @@
{
// Do nothing
}
-
- /**
- * @see org.apache.tapestry.form.IFormComponent#getClientId()
- */
- public String getClientId()
- {
- return null;
- }
-
+
/**
* @see org.apache.tapestry.form.IFormComponent#getDisplayName()
*/
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/Form.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/Form.java?view=diff&rev=466443&r1=466442&r2=466443
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/Form.java
(original)
+++
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/Form.java
Sat Oct 21 13:14:25 2006
@@ -127,7 +127,7 @@
public String getElementId(IFormComponent component)
{
- return _formSupport.getElementId(component, component.getId());
+ return _formSupport.getElementId(component, component.getClientId());
}
/**
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/FormSupportImpl.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/FormSupportImpl.java?view=diff&rev=466443&r1=466442&r2=466443
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/FormSupportImpl.java
(original)
+++
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/FormSupportImpl.java
Sat Oct 21 13:14:25 2006
@@ -375,7 +375,7 @@
public String getElementId(IFormComponent component)
{
- return getElementId(component, component.getId());
+ return getElementId(component, component.getClientId());
}
/**
@@ -394,7 +394,7 @@
String filteredId = TapestryUtils.convertTapestryIdToNMToken(baseId);
String result = _elementIdAllocator.allocateId(filteredId);
-
+
if (_rewinding)
{
if (_allocatedIdIndex >= _allocatedIds.size())
@@ -421,7 +421,7 @@
_allocatedIdIndex++;
component.setName(result);
-
+
return result;
}
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/Hidden.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/Hidden.java?view=diff&rev=466443&r1=466442&r2=466443
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/Hidden.java
(original)
+++
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/Hidden.java
Sat Oct 21 13:14:25 2006
@@ -64,9 +64,9 @@
}
else
externalValue = (String)
getBinding("value").getObject(String.class);
-
+
String id = getClientId();
-
+
form.addHiddenValue(getName(), id, externalValue);
}
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/Hidden.jwc
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/Hidden.jwc?view=diff&rev=466443&r1=466442&r2=466443
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/Hidden.jwc
(original)
+++
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/Hidden.jwc
Sat Oct 21 13:14:25 2006
@@ -39,7 +39,7 @@
</description>
</parameter>
- <parameter name="id" property="clientId">
+ <parameter name="id" >
<description>
ID parameter of HTML hidden object.
</description>
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/ListEdit.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/ListEdit.java?view=diff&rev=466443&r1=466442&r2=466443
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/ListEdit.java
(original)
+++
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/ListEdit.java
Sat Oct 21 13:14:25 2006
@@ -189,13 +189,7 @@
{
return false;
}
-
- public String getClientId()
- {
- // TODO Auto-generated method stub
- return null;
- }
-
+
public String getDisplayName()
{
// TODO Auto-generated method stub
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/html/Rollover.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/html/Rollover.java?view=diff&rev=466443&r1=466442&r2=466443
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/html/Rollover.java
(original)
+++
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/html/Rollover.java
Sat Oct 21 13:14:25 2006
@@ -61,7 +61,8 @@
// on
// accessors).
- if (cycle.isRewinding()) return;
+ if (cycle.isRewinding())
+ return;
String imageURL = null;
String mouseOverURL = null;
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/scripts/TestHidden.xml
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/scripts/TestHidden.xml?view=diff&rev=466443&r1=466442&r2=466443
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/scripts/TestHidden.xml
(original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/scripts/TestHidden.xml Sat
Oct 21 13:14:25 2006
@@ -30,19 +30,19 @@
<assert-output name="Hidden">
<![CDATA[
-<input type="hidden" name="hidden" value="1234567890"/>
+<input type="hidden" name="hidden" id="hidden" value="1234567890"/>
]]>
</assert-output>
<assert-output name="HiddenWithID">
<![CDATA[
-<input type="hidden" name="hiddenWithID" id="0987654321"
value="1234567890-with id"/>
+<input type="hidden" name="0987654321" id="0987654321" value="1234567890-with
id"/>
]]>
</assert-output>
<assert-output name="HiddenWithEncoding">
<![CDATA[
-<input type="hidden" name="hiddenWithEncoding" value="S1234567890-with
encoding"/>
+<input type="hidden" name="hiddenWithEncoding" id="hiddenWithEncoding"
value="S1234567890-with encoding"/>
]]>
</assert-output>
@@ -53,10 +53,10 @@
<parameter name="page" value="Home"/>
<parameter name="component" value="$Form"/>
<parameter name="hidden" value="updated-1234567890"/>
- <parameter name="hiddenWithID" value="updated-1234567890-with
id"/>
+ <parameter name="0987654321" value="updated-1234567890-with
id"/>
<parameter name="hiddenWithEncoding"
value="Supdated-1234567890-with encoding"/>
<parameter name="hiddenBoolean" value="T"/>
- <parameter name="formids"
value="hidden,hiddenWithID,hiddenWithEncoding,hiddenBoolean"/>
+ <parameter name="formids"
value="hidden,0987654321,hiddenWithEncoding,hiddenBoolean"/>
<assert-output name="Page Title">
<![CDATA[
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/dojo/form/TestAutocompleter.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/dojo/form/TestAutocompleter.java?view=diff&rev=466443&r1=466442&r2=466443
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/dojo/form/TestAutocompleter.java
(original)
+++
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/dojo/form/TestAutocompleter.java
Sat Oct 21 13:14:25 2006
@@ -225,7 +225,7 @@
verify();
- assertBuffer("<span class=\"prefix\"><select name=\"fred\"
autocomplete=\"off\" class=\"validation-delegate\"></select></span>");
+ assertBuffer("<span class=\"prefix\"><select name=\"fred\"
autocomplete=\"off\" id=\"fred\"
class=\"validation-delegate\"></select></span>");
}
public void test_Render_JSON()
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/dojo/form/TestDropdownTimePicker.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/dojo/form/TestDropdownTimePicker.java?view=diff&rev=466443&r1=466442&r2=466443
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/dojo/form/TestDropdownTimePicker.java
(original)
+++
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/dojo/form/TestDropdownTimePicker.java
Sat Oct 21 13:14:25 2006
@@ -110,7 +110,7 @@
verify();
- assertBuffer("<span class=\"prefix\"><div
class=\"validation-delegate\"></div></span>");
+ assertBuffer("<span class=\"prefix\"><div id=\"fred\"
class=\"validation-delegate\"></div></span>");
}
public void test_Json_Time()
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/FormSupportTest.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/FormSupportTest.java?view=diff&rev=466443&r1=466442&r2=466443
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/FormSupportTest.java
(original)
+++
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/FormSupportTest.java
Sat Oct 21 13:14:25 2006
@@ -91,7 +91,7 @@
IFormComponent component = newMock(IFormComponent.class);
checkOrder(component, false);
- trainGetId(component, id);
+ expect(component.getClientId()).andReturn(id);
component.setName(name);
@@ -102,7 +102,8 @@
{
IFormComponent component = newMock(IFormComponent.class);
- trainGetId(component, id);
+ expect(component.getClientId()).andReturn(id);
+
trainGetExtendedId(component, extendedId);
trainGetLocation(component, location);
@@ -864,11 +865,11 @@
// but is now false on the rewind.
trainCycleForRewind(cycle, "barney,wilma,pebbles,barney_0", null);
-
+
final IFormComponent barney1 = newFormComponent("barney", "barney");
final IFormComponent wilma = newFormComponent("wilma", "wilma");
final IFormComponent barney2 = newFormComponent("barney",
"SomePage/barney", l);
-
+
IRender body = newComponentsRenderBody(fs, new IFormComponent[]
{ barney1, wilma, barney2 }, writer);
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/LinkSubmitTest.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/LinkSubmitTest.java?view=diff&rev=466443&r1=466442&r2=466443
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/LinkSubmitTest.java
(original)
+++
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/LinkSubmitTest.java
Sat Oct 21 13:14:25 2006
@@ -83,7 +83,7 @@
LinkSubmit linkSubmit = newInstance(LinkSubmit.class, new Object[]
{ "form", form, "name", "fred_1", "script", script,
- "idParameter", "fred_id", "submitType", "submit" });
+ "id", "fred_id", "submitType", "submit" });
linkSubmit.addBody(newBody());
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/TestButton.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/TestButton.java?view=diff&rev=466443&r1=466442&r2=466443
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/TestButton.java
(original)
+++
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/TestButton.java
Sat Oct 21 13:14:25 2006
@@ -82,18 +82,18 @@
public void testRenderWithId()
{
Button b = newInstance(Button.class, new Object[]
- { "idParameter", "foo", "name", "assignedName" });
-
+ { "id", "assignedId", "name", "assignedName"});
+
IMarkupWriter writer = newBufferWriter();
- IRequestCycle cycle = newCycleGetUniqueId("foo", "foo$unique");
-
+ IRequestCycle cycle = newCycleGetUniqueId("assignedId",
"assignedId$unique");
+
replay();
b.renderFormComponent(writer, cycle);
verify();
- assertBuffer("<button type=\"button\" name=\"assignedName\"
id=\"foo$unique\"></button>");
+ assertBuffer("<button type=\"button\" name=\"assignedName\"
id=\"assignedId$unique\"></button>");
}
public void testSubmit()
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/TestCheckbox.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/TestCheckbox.java?view=diff&rev=466443&r1=466442&r2=466443
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/TestCheckbox.java
(original)
+++
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/TestCheckbox.java
Sat Oct 21 13:14:25 2006
@@ -88,7 +88,7 @@
verify();
- assertBuffer("<input type=\"checkbox\" name=\"barney\"
checked=\"checked\"/>");
+ assertBuffer("<input type=\"checkbox\" name=\"barney\"
checked=\"checked\" id=\"barney\"/>");
}
public void testRenderDisabled()
@@ -164,7 +164,7 @@
ValidatableFieldSupport vfs = newMock(ValidatableFieldSupport.class);
Checkbox cb = newInstance(Checkbox.class, new Object[]
- { "idParameter", "foo", "name", "assignedName", "value", Boolean.TRUE,
+ { "id", "foo", "name", "assignedName", "value", Boolean.TRUE,
"form", form, "validatableFieldSupport", vfs});
IMarkupWriter writer = newBufferWriter();
@@ -190,7 +190,7 @@
cb.renderFormComponent(writer, cycle);
verify();
-
+
assertBuffer("<input type=\"checkbox\" name=\"assignedName\"
checked=\"checked\" id=\"foo$unique\"/>");
}
Added:
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/TestHidden.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/TestHidden.java?view=auto&rev=466443
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/TestHidden.java
(added)
+++
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/TestHidden.java
Sat Oct 21 13:14:25 2006
@@ -0,0 +1,74 @@
+// Copyright Oct 21, 2006 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.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+package org.apache.tapestry.form;
+
+import static org.easymock.EasyMock.*;
+
+import org.apache.tapestry.IForm;
+import org.apache.tapestry.IMarkupWriter;
+import org.apache.tapestry.IRequestCycle;
+import org.apache.tapestry.services.DataSqueezer;
+import org.testng.annotations.Test;
+
+
+/**
+ * Tests functionality of [EMAIL PROTECTED] Hidden}.
+ */
[EMAIL PROTECTED]
+public class TestHidden extends BaseFormComponentTestCase
+{
+
+ public void test_Render()
+ {
+ IRequestCycle cycle = newCycle();
+ IForm form = newMock(IForm.class);
+ DataSqueezer squeezer = newMock(DataSqueezer.class);
+
+ IMarkupWriter writer = newMarkupWriter();
+
+ MockDelegate delegate = new MockDelegate();
+
+ Hidden component = newInstance(Hidden.class, new Object[]
+ { "name", "fred", "value", new Integer(10),
+ "encode", Boolean.TRUE, "dataSqueezer", squeezer });
+
+ expect(cycle.renderStackPush(component)).andReturn(component);
+
+ trainGetForm(cycle, form);
+ trainWasPrerendered(form, writer, component, false);
+ trainGetDelegate(form, delegate);
+
+ delegate.setFormComponent(component);
+
+ trainGetElementId(form, component, "fred");
+ trainIsRewinding(form, false);
+ trainIsRewinding(cycle, false);
+
+ form.setFormFieldUpdating(true);
+
+ expect(squeezer.squeeze(10)).andReturn("i10");
+
+ delegate.setFormComponent(component);
+
+ form.addHiddenValue("fred", "fred", "i10");
+
+ expect(cycle.renderStackPop()).andReturn(component);
+
+ replay();
+
+ component.render(writer, cycle);
+
+ verify();
+ }
+}
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/TestSubmit.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/TestSubmit.java?view=diff&rev=466443&r1=466442&r2=466443
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/TestSubmit.java
(original)
+++
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/TestSubmit.java
Sat Oct 21 13:14:25 2006
@@ -100,6 +100,7 @@
writer.beginEmpty("input");
writer.attribute("type", "submit");
writer.attribute("name", "fred");
+ writer.attribute("id", "fred");
writer.closeTag();
trainIsInError(delegate, false);
@@ -144,6 +145,7 @@
writer.attribute("type", "submit");
writer.attribute("name", "fred");
writer.attribute("disabled", "disabled");
+ writer.attribute("id", "fred");
writer.closeTag();
replay();
@@ -184,6 +186,7 @@
writer.attribute("type", "submit");
writer.attribute("name", "fred");
writer.attribute("value", "flintstone");
+ writer.attribute("id", "fred");
writer.closeTag();
trainIsInError(delegate, false);
@@ -227,6 +230,7 @@
writer.beginEmpty("input");
writer.attribute("type", "submit");
writer.attribute("name", "fred");
+ writer.attribute("id", "fred");
expect(form.getClientId()).andReturn("formtest");
@@ -276,7 +280,7 @@
writer.attribute("type", "submit");
writer.attribute("name", "fred");
writer.attribute("disabled", "disabled");
-
+ writer.attribute("id", "fred");
writer.closeTag();
replay();
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/TestTextArea.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/TestTextArea.java?view=diff&rev=466443&r1=466442&r2=466443
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/TestTextArea.java
(original)
+++
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/TestTextArea.java
Sat Oct 21 13:14:25 2006
@@ -332,7 +332,7 @@
verify();
- assertBuffer("<span class=\"prefix\"><textarea name=\"fred\"
class=\"validation-delegate\">text area value</textarea></span>");
+ assertBuffer("<span class=\"prefix\"><textarea name=\"fred\"
id=\"fred\" class=\"validation-delegate\">text area value</textarea></span>");
}
public void testRenderDisabled()
@@ -386,7 +386,7 @@
verify();
- assertBuffer("<span class=\"prefix\"><textarea name=\"fred\"
disabled=\"disabled\" class=\"validation-delegate\">text area
value</textarea></span>");
+ assertBuffer("<span class=\"prefix\"><textarea name=\"fred\"
disabled=\"disabled\" id=\"fred\" class=\"validation-delegate\">text area
value</textarea></span>");
}
public void testRenderWithInformalParameters()
@@ -437,7 +437,7 @@
verify();
- assertBuffer("<span class=\"prefix\"><textarea name=\"fred\"
class=\"validation-delegate\" informal=\"informal-value\">text area
value</textarea></span>");
+ assertBuffer("<span class=\"prefix\"><textarea name=\"fred\"
id=\"fred\" class=\"validation-delegate\" informal=\"informal-value\">text area
value</textarea></span>");
}
public void testRenderNullValue()
@@ -491,6 +491,6 @@
verify();
- assertBuffer("<span class=\"prefix\"><textarea name=\"fred\"
class=\"validation-delegate\"></textarea></span>");
+ assertBuffer("<span class=\"prefix\"><textarea name=\"fred\"
id=\"fred\" class=\"validation-delegate\"></textarea></span>");
}
}
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/TestTextField.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/TestTextField.java?view=diff&rev=466443&r1=466442&r2=466443
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/TestTextField.java
(original)
+++
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/TestTextField.java
Sat Oct 21 13:14:25 2006
@@ -307,7 +307,7 @@
MockDelegate delegate = new MockDelegate();
TextField component = newInstance(TextField.class, new Object[]
- { "name", "fred", "translatedFieldSupport", tfs,
"validatableFieldSupport", vfs, "value", new Integer(10) });
+ { "id", "fred", "translatedFieldSupport", tfs,
"validatableFieldSupport", vfs, "value", new Integer(10) });
expect(cycle.renderStackPush(component)).andReturn(component);
@@ -345,7 +345,7 @@
verify();
- assertBuffer("<span class=\"prefix\"><input type=\"text\"
name=\"fred\" value=\"10\" class=\"validation-delegate\"/></span>");
+ assertBuffer("<span class=\"prefix\"><input type=\"text\"
name=\"fred\" value=\"10\" id=\"fred\" class=\"validation-delegate\"/></span>");
}
public void testRenderHidden()
@@ -402,7 +402,7 @@
verify();
- assertBuffer("<span class=\"prefix\"><input type=\"password\"
name=\"fred\" value=\"10\" class=\"validation-delegate\"/></span>");
+ assertBuffer("<span class=\"prefix\"><input type=\"password\"
name=\"fred\" value=\"10\" id=\"fred\" class=\"validation-delegate\"/></span>");
}
public void testRenderDisabled()
@@ -459,7 +459,7 @@
verify();
- assertBuffer("<span class=\"prefix\"><input type=\"text\"
name=\"fred\" disabled=\"disabled\" value=\"10\"
class=\"validation-delegate\"/></span>");
+ assertBuffer("<span class=\"prefix\"><input type=\"text\"
name=\"fred\" disabled=\"disabled\" value=\"10\" id=\"fred\"
class=\"validation-delegate\"/></span>");
}
public void testRenderWithInformalParameters()
@@ -509,7 +509,7 @@
verify();
- assertBuffer("<span class=\"prefix\"><input type=\"text\"
name=\"fred\" value=\"10\" class=\"validation-delegate\"
informal=\"informal-value\"/></span>");
+ assertBuffer("<span class=\"prefix\"><input type=\"text\"
name=\"fred\" value=\"10\" id=\"fred\" class=\"validation-delegate\"
informal=\"informal-value\"/></span>");
}
public void testRenderNullValue()
@@ -564,7 +564,7 @@
verify();
- assertBuffer("<span class=\"prefix\"><input type=\"text\"
name=\"fred\" value=\"\" class=\"validation-delegate\"/></span>");
+ assertBuffer("<span class=\"prefix\"><input type=\"text\"
name=\"fred\" value=\"\" id=\"fred\" class=\"validation-delegate\"/></span>");
}
public void testIsRequired()
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/valid/TestValidField.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/valid/TestValidField.java?view=diff&rev=466443&r1=466442&r2=466443
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/valid/TestValidField.java
(original)
+++
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/valid/TestValidField.java
Sat Oct 21 13:14:25 2006
@@ -253,7 +253,7 @@
verify();
assertSame(component, delegate.getFormComponent());
- assertBuffer("<span class=\"prefix\"><input type=\"text\"
name=\"fred\" value=\"fred value\" class=\"validation-delegate\"/></span>");
+ assertBuffer("<span class=\"prefix\"><input type=\"text\"
name=\"fred\" value=\"fred value\" id=\"fred\"
class=\"validation-delegate\"/></span>");
}
private void trainToString(IValidator validator,
@@ -313,7 +313,7 @@
verify();
assertSame(component, delegate.getFormComponent());
- assertBuffer("<span class=\"prefix\"><input type=\"text\"
name=\"fred\" class=\"validation-delegate\"/></span>");
+ assertBuffer("<span class=\"prefix\"><input type=\"text\"
name=\"fred\" id=\"fred\" class=\"validation-delegate\"/></span>");
}
public void testRenderWithError()
@@ -361,6 +361,6 @@
verify();
assertSame(component, delegate.getFormComponent());
- assertBuffer("<span class=\"prefix\"><input type=\"text\"
name=\"fred\" value=\"recorded field value\"
class=\"validation-delegate\"/></span>");
+ assertBuffer("<span class=\"prefix\"><input type=\"text\"
name=\"fred\" value=\"recorded field value\" id=\"fred\"
class=\"validation-delegate\"/></span>");
}
}
