Author: ivaynberg
Date: Sat Nov 18 13:16:17 2006
New Revision: 476607
URL: http://svn.apache.org/viewvc?view=rev&rev=476607
Log:
optimized markup id generation
fixed bug in diffutil
Modified:
incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/Component.java
incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/util/diff/DiffUtil.java
incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/ajax/markup/html/ajaxLink/AjaxLinkPageExpectedResult.html
incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/ajax/markup/html/ajaxLink/AjaxLinkWithBorderPage-1ExpectedResult.html
incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/ajax/markup/html/ajaxLink/AjaxLinkWithBorderPageExpectedResult.html
incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/ajax/markup/html/ajaxLink/AjaxPage2-1_ExpectedResult.html
incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/ajax/markup/html/ajaxLink/AjaxPage2_ExpectedResult.html
incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/ajax/markup/html/componentMap/SimpleTestPageExpectedResult-1.html
incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/ajax/markup/html/componentMap/SimpleTestPageExpectedResult.html
incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/markup/html/border/BoxBorderTestPage_ExpectedResult_3.html
incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/markup/html/form/CheckGroupDisabledTestPage_expected.html
incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/markup/html/form/CheckGroupTestPage1_expected.html
incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/markup/html/form/CheckGroupTestPage2_expected.html
incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/markup/html/form/CheckGroupTestPage3_expected.html
incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/markup/html/form/CheckGroupTestPage4_expected.html
incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/markup/html/form/RadioGroupDisabledTestPage_expected.html
incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/markup/html/form/RadioGroupTestPage1_expected.html
incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/markup/html/form/RadioGroupTestPage3_expected.html
incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/markup/html/tags/InputTagNotVisibleWebPageResult.html
incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/markup/html/tags/InputTagVisibleWebPageResult.html
Modified:
incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/Component.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/Component.java?view=diff&rev=476607&r1=476606&r2=476607
==============================================================================
---
incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/Component.java
(original)
+++
incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/Component.java
Sat Nov 18 13:16:17 2006
@@ -903,38 +903,21 @@
* locate this component in the generated markup for post-wicket
processing
* such as javascript or an xslt transform.
* <p>
- * Note: The component must have been added (directly or indirectly) to
a
- * container with an associated markup file (Page, Panel or Border).
This
- * TODO post 1.2 this restriction will be implicitly met after
implementing
- * 2.0's constructor change
- *
- * @return markup id of this component, which is the result of the call
to
- * [EMAIL PROTECTED] #getPageRelativePath()} where the ':'
character (the
- * internal path seperator of Wicket) are replaced by the '_'
- * character.
+ * Note: This method should only be called after the component or its
parent
+ * have been added to the page. This will be relaxed in 2.0 where the
page
+ * is available on construction.
+ *
+ * @return markup id of the component
*/
public String getMarkupId()
{
- /*
- * TODO Post 1.2: Restore the code below after the constructor
refactor,
- * right now its causing too much pain for components inside
listviews
- * and borders.
- *
- * CODE:
- *
- * String id = getMarkupAttributes().getString("id"); if (id ==
null) {
- * id = getPageRelativePath(); } return id;
- *
- * JAVADOC:
- *
- * If the id attribute is present in the markup attributes of
this
- * component it will be used, otherwise the page-relative path
of this
- * component will be used. <p>
- *
- *
- */
-
- return getPageRelativePath().replace(':', '_');
+ String markupId = (String)getMetaData(MARKUP_ID_KEY);
+ if (markupId == null)
+ {
+ markupId = getId() + getPage().getAutoIndex();
+ setMetaData(MARKUP_ID_KEY, markupId);
+ }
+ return markupId;
}
/**
@@ -3146,4 +3129,14 @@
{
setFlag(FLAG_HEAD_RENDERED, false);
}
+
+ /**
+ * Metadata key used to store/retrieve markup id
+ */
+ private static MetaDataKey MARKUP_ID_KEY = new MetaDataKey(String.class)
+ {
+
+ private static final long serialVersionUID = 1L;
+
+ };
}
Modified:
incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/util/diff/DiffUtil.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/util/diff/DiffUtil.java?view=diff&rev=476607&r1=476606&r2=476607
==============================================================================
---
incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/util/diff/DiffUtil.java
(original)
+++
incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/util/diff/DiffUtil.java
Sat Nov 18 13:16:17 2006
@@ -153,7 +153,7 @@
final URL url = clazz.getClassLoader().getResource(filename);
filename = url.getFile();
- filename = filename.replaceAll("/target/test-classes/",
"/src/test/");
+ filename = filename.replaceAll("/target/test-classes/",
"/src/test/java/");
PrintWriter out = new PrintWriter(new
FileOutputStream(filename));
out.print(document);
out.close();
Modified:
incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/ajax/markup/html/ajaxLink/AjaxLinkPageExpectedResult.html
URL:
http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/ajax/markup/html/ajaxLink/AjaxLinkPageExpectedResult.html?view=diff&rev=476607&r1=476606&r2=476607
==============================================================================
---
incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/ajax/markup/html/ajaxLink/AjaxLinkPageExpectedResult.html
(original)
+++
incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/ajax/markup/html/ajaxLink/AjaxLinkPageExpectedResult.html
Sat Nov 18 13:16:17 2006
@@ -7,7 +7,7 @@
<script type="text/javascript"
src="/WicketTester/WicketTester/resources/wicket.ajax.AbstractDefaultAjaxBehavior/wicket-ajax-debug-drag.js"></script>
<script type="text/javascript"
src="/WicketTester/WicketTester/resources/wicket.ajax.AbstractDefaultAjaxBehavior/wicket-ajax-debug.js"></script>
</head><body>
- <span wicket:id="ajaxLabel" id="ajaxLabel">UpdateMe</span>
- <a href="#" wicket:id="ajaxLink" onclick="var
wcall=wicketAjaxGet('/WicketTester/WicketTester?wicket:interface=:0:ajaxLink::IBehaviorListener&wicket:behaviorId=0',
function() { }, function() { });return !wcall;" id="ajaxLink">Update</a>
+ <span wicket:id="ajaxLabel" id="ajaxLabel0">UpdateMe</span>
+ <a href="#" wicket:id="ajaxLink" onclick="var
wcall=wicketAjaxGet('/WicketTester/WicketTester?wicket:interface=:0:ajaxLink::IBehaviorListener&wicket:behaviorId=0',
function() { }, function() { });return !wcall;" id="ajaxLink1">Update</a>
</body>
</html>
Modified:
incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/ajax/markup/html/ajaxLink/AjaxLinkWithBorderPage-1ExpectedResult.html
URL:
http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/ajax/markup/html/ajaxLink/AjaxLinkWithBorderPage-1ExpectedResult.html?view=diff&rev=476607&r1=476606&r2=476607
==============================================================================
---
incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/ajax/markup/html/ajaxLink/AjaxLinkWithBorderPage-1ExpectedResult.html
(original)
+++
incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/ajax/markup/html/ajaxLink/AjaxLinkWithBorderPage-1ExpectedResult.html
Sat Nov 18 13:16:17 2006
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?><ajax-response><component id="ajaxLabel"
><![CDATA[<span wicket:id="ajaxLabel"
id="ajaxLabel">Updated!</span>]]></component></ajax-response>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?><ajax-response><component
id="ajaxLabel0" ><![CDATA[<span wicket:id="ajaxLabel"
id="ajaxLabel0">Updated!</span>]]></component></ajax-response>
\ No newline at end of file
Modified:
incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/ajax/markup/html/ajaxLink/AjaxLinkWithBorderPageExpectedResult.html
URL:
http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/ajax/markup/html/ajaxLink/AjaxLinkWithBorderPageExpectedResult.html?view=diff&rev=476607&r1=476606&r2=476607
==============================================================================
---
incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/ajax/markup/html/ajaxLink/AjaxLinkWithBorderPageExpectedResult.html
(original)
+++
incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/ajax/markup/html/ajaxLink/AjaxLinkWithBorderPageExpectedResult.html
Sat Nov 18 13:16:17 2006
@@ -10,8 +10,8 @@
<span wicket:id="border"><wicket:border>
Border
<wicket:body>
- <span wicket:id="ajaxLabel" id="ajaxLabel">UpdateMe</span>
- <a href="#" wicket:id="ajaxLink" onclick="var
wcall=wicketAjaxGet('/WicketTester/WicketTester?wicket:interface=:0:ajaxLink::IBehaviorListener&wicket:behaviorId=0',
function() { }, function() { });return !wcall;" id="ajaxLink">Update</a>
+ <span wicket:id="ajaxLabel" id="ajaxLabel0">UpdateMe</span>
+ <a href="#" wicket:id="ajaxLink" onclick="var
wcall=wicketAjaxGet('/WicketTester/WicketTester?wicket:interface=:0:ajaxLink::IBehaviorListener&wicket:behaviorId=0',
function() { }, function() { });return !wcall;" id="ajaxLink1">Update</a>
</wicket:body>
Border
</wicket:border></span>
Modified:
incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/ajax/markup/html/ajaxLink/AjaxPage2-1_ExpectedResult.html
URL:
http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/ajax/markup/html/ajaxLink/AjaxPage2-1_ExpectedResult.html?view=diff&rev=476607&r1=476606&r2=476607
==============================================================================
---
incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/ajax/markup/html/ajaxLink/AjaxPage2-1_ExpectedResult.html
(original)
+++
incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/ajax/markup/html/ajaxLink/AjaxPage2-1_ExpectedResult.html
Sat Nov 18 13:16:17 2006
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?><ajax-response><component id="ajaxLabel"
><![CDATA[<span wicket:id="ajaxLabel"
id="ajaxLabel">BBBBBBB</span>]]></component></ajax-response>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?><ajax-response><component id="ajaxLabel"
><![CDATA[<span wicket:id="ajaxLabel"
id="ajaxLabel2">BBBBBBB</span>]]></component></ajax-response>
\ No newline at end of file
Modified:
incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/ajax/markup/html/ajaxLink/AjaxPage2_ExpectedResult.html
URL:
http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/ajax/markup/html/ajaxLink/AjaxPage2_ExpectedResult.html?view=diff&rev=476607&r1=476606&r2=476607
==============================================================================
---
incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/ajax/markup/html/ajaxLink/AjaxPage2_ExpectedResult.html
(original)
+++
incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/ajax/markup/html/ajaxLink/AjaxPage2_ExpectedResult.html
Sat Nov 18 13:16:17 2006
@@ -15,8 +15,8 @@
<tr>
<td width = "100%">
<wicket:body>
- <span wicket:id="ajaxLabel" id="ajaxLabel">AAAAAAA</span>
- <a href="#" wicket:id="ajaxLink" onclick="var
wcall=wicketAjaxGet('/WicketTester/WicketTester?wicket:interface=:0:ajaxLink::IBehaviorListener&wicket:behaviorId=0',
function() { }, function() { });return !wcall;" id="ajaxLink">Update</a>
+ <span wicket:id="ajaxLabel" id="ajaxLabel0">AAAAAAA</span>
+ <a href="#" wicket:id="ajaxLink" onclick="var
wcall=wicketAjaxGet('/WicketTester/WicketTester?wicket:interface=:0:ajaxLink::IBehaviorListener&wicket:behaviorId=0',
function() { }, function() { });return !wcall;" id="ajaxLink1">Update</a>
</wicket:body>
</td>
</tr>
Modified:
incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/ajax/markup/html/componentMap/SimpleTestPageExpectedResult-1.html
URL:
http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/ajax/markup/html/componentMap/SimpleTestPageExpectedResult-1.html?view=diff&rev=476607&r1=476606&r2=476607
==============================================================================
---
incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/ajax/markup/html/componentMap/SimpleTestPageExpectedResult-1.html
(original)
+++
incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/ajax/markup/html/componentMap/SimpleTestPageExpectedResult-1.html
Sat Nov 18 13:16:17 2006
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?><ajax-response><component
id="testPanel_baseSpan_linja1" ><![CDATA[<span wicket:id="linja1"
id="testPanel_baseSpan_linja1">1</span>]]></component><evaluate><![CDATA[setTimeout(function()
{ var
wcall=wicketAjaxGet('/WicketTester/WicketTester?wicket:interface=:0:testPanel:baseSpan:linja1:-1:IUnversionedBehaviorListener&wicket:behaviorId=0&wicket:ignoreIfNotActive=true',
function() { }, function() { }); }, 2000);]]></evaluate></ajax-response>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?><ajax-response><component id="linja10"
><![CDATA[<span wicket:id="linja1"
id="linja10">1</span>]]></component><evaluate><![CDATA[setTimeout(function() {
var
wcall=wicketAjaxGet('/WicketTester/WicketTester?wicket:interface=:0:testPanel:baseSpan:linja1:-1:IUnversionedBehaviorListener&wicket:behaviorId=0&wicket:ignoreIfNotActive=true',
function() { }, function() { }); }, 2000);]]></evaluate></ajax-response>
\ No newline at end of file
Modified:
incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/ajax/markup/html/componentMap/SimpleTestPageExpectedResult.html
URL:
http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/ajax/markup/html/componentMap/SimpleTestPageExpectedResult.html?view=diff&rev=476607&r1=476606&r2=476607
==============================================================================
---
incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/ajax/markup/html/componentMap/SimpleTestPageExpectedResult.html
(original)
+++
incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/ajax/markup/html/componentMap/SimpleTestPageExpectedResult.html
Sat Nov 18 13:16:17 2006
@@ -13,7 +13,7 @@
<span wicket:id="testPanel"><wicket:panel>
<span wicket:id="baseSpan">
<wicket:child><wicket:extend>
- this counter should update every 2 seconds: <span wicket:id="linja1"
id="testPanel_baseSpan_linja1">0</span>
+ this counter should update every 2 seconds: <span wicket:id="linja1"
id="linja10">0</span>
</wicket:extend></wicket:child>
</span>
</wicket:panel></span>
Modified:
incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/markup/html/border/BoxBorderTestPage_ExpectedResult_3.html
URL:
http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/markup/html/border/BoxBorderTestPage_ExpectedResult_3.html?view=diff&rev=476607&r1=476606&r2=476607
==============================================================================
---
incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/markup/html/border/BoxBorderTestPage_ExpectedResult_3.html
(original)
+++
incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/markup/html/border/BoxBorderTestPage_ExpectedResult_3.html
Sat Nov 18 13:16:17 2006
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml";>
<body>
<span wicket:id="border"><wicket:border>
- <form
action="/WicketTester/WicketTester?wicket:interface=:0:border:myForm::IFormSubmitListener"
wicket:id="myForm" method="post" id="border_myForm"><div
style="display:none"><input type="hidden" name="border_myForm_hf_0"
id="border_myForm_hf_0" /></div>
+ <form
action="/WicketTester/WicketTester?wicket:interface=:0:border:myForm::IFormSubmitListener"
wicket:id="myForm" method="post" id="myForm0"><div style="display:none"><input
type="hidden" name="myForm0_hf_0" id="myForm0_hf_0" /></div>
<wicket:body>
<input value="" type="text" wicket:id="name" name="border:name"/>
</wicket:body>
Modified:
incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/markup/html/form/CheckGroupDisabledTestPage_expected.html
URL:
http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/markup/html/form/CheckGroupDisabledTestPage_expected.html?view=diff&rev=476607&r1=476606&r2=476607
==============================================================================
---
incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/markup/html/form/CheckGroupDisabledTestPage_expected.html
(original)
+++
incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/markup/html/form/CheckGroupDisabledTestPage_expected.html
Sat Nov 18 13:16:17 2006
@@ -2,11 +2,11 @@
<head><title>CheckGroupTestPage1</title></head>
<body>
<!-- In addition test that chars are not converted from upper to lower
and vice versa -->
- <FORM
action="/WicketTester/WicketTester?wicket:interface=:0:form::IFormSubmitListener"
wicket:id="form" method="post" id="form"><div style="display:none"><input
type="hidden" name="form_hf_0" id="form_hf_0" /></div>
+ <FORM
action="/WicketTester/WicketTester?wicket:interface=:0:form::IFormSubmitListener"
wicket:id="form" method="post" id="form0"><div style="display:none"><input
type="hidden" name="form0_hf_0" id="form0_hf_0" /></div>
<span disabled="disabled" wicket:id="group" name="group">
- <Input value="check0" type="checkbox"
disabled="disabled" wicket:id="check1" checked="checked"
name="group">check1</input>
+ <Input value="check1" type="checkbox"
disabled="disabled" wicket:id="check1" checked="checked"
name="group">check1</input>
<span wicket:id="container">
- <input value="check1" type="checkbox"
disabled="disabled" wicket:id="check2" checked="checked"
name="group">check2</input>
+ <input value="check2" type="checkbox"
disabled="disabled" wicket:id="check2" checked="checked"
name="group">check2</input>
</span>
</span>
</FORM>
Modified:
incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/markup/html/form/CheckGroupTestPage1_expected.html
URL:
http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/markup/html/form/CheckGroupTestPage1_expected.html?view=diff&rev=476607&r1=476606&r2=476607
==============================================================================
---
incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/markup/html/form/CheckGroupTestPage1_expected.html
(original)
+++
incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/markup/html/form/CheckGroupTestPage1_expected.html
Sat Nov 18 13:16:17 2006
@@ -2,11 +2,11 @@
<head><title>CheckGroupTestPage1</title></head>
<body>
<!-- In addition test that chars are not converted from upper to lower
and vice versa -->
- <FORM
action="/WicketTester/WicketTester?wicket:interface=:0:form::IFormSubmitListener"
wicket:id="form" method="post" id="form"><div style="display:none"><input
type="hidden" name="form_hf_0" id="form_hf_0" /></div>
+ <FORM
action="/WicketTester/WicketTester?wicket:interface=:0:form::IFormSubmitListener"
wicket:id="form" method="post" id="form0"><div style="display:none"><input
type="hidden" name="form0_hf_0" id="form0_hf_0" /></div>
- <Input value="check0" type="checkbox"
wicket:id="check1" name="group">check1</input>
+ <Input value="check1" type="checkbox"
wicket:id="check1" name="group">check1</input>
<span wicket:id="container">
- <input value="check1" type="checkbox"
wicket:id="check2" name="group">check2</input>
+ <input value="check2" type="checkbox"
wicket:id="check2" name="group">check2</input>
</span>
</FORM>
Modified:
incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/markup/html/form/CheckGroupTestPage2_expected.html
URL:
http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/markup/html/form/CheckGroupTestPage2_expected.html?view=diff&rev=476607&r1=476606&r2=476607
==============================================================================
---
incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/markup/html/form/CheckGroupTestPage2_expected.html
(original)
+++
incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/markup/html/form/CheckGroupTestPage2_expected.html
Sat Nov 18 13:16:17 2006
@@ -1,11 +1,11 @@
<html>
<head><title>CheckGroupTestPage2</title></head>
<body>
- <form
action="/WicketTester/WicketTester?wicket:interface=:1:form::IFormSubmitListener"
wicket:id="form" method="post" id="form"><div style="display:none"><input
type="hidden" name="form_hf_0" id="form_hf_0" /></div>
+ <form
action="/WicketTester/WicketTester?wicket:interface=:1:form::IFormSubmitListener"
wicket:id="form" method="post" id="form0"><div style="display:none"><input
type="hidden" name="form0_hf_0" id="form0_hf_0" /></div>
- <input value="check0" type="checkbox"
wicket:id="check1" checked="checked" name="group">check1</input>
+ <input value="check1" type="checkbox"
wicket:id="check1" checked="checked" name="group">check1</input>
<span wicket:id="container">
- <input value="check1" type="checkbox"
wicket:id="check2" name="group">check2</input>
+ <input value="check2" type="checkbox"
wicket:id="check2" name="group">check2</input>
</span>
</form>
Modified:
incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/markup/html/form/CheckGroupTestPage3_expected.html
URL:
http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/markup/html/form/CheckGroupTestPage3_expected.html?view=diff&rev=476607&r1=476606&r2=476607
==============================================================================
---
incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/markup/html/form/CheckGroupTestPage3_expected.html
(original)
+++
incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/markup/html/form/CheckGroupTestPage3_expected.html
Sat Nov 18 13:16:17 2006
@@ -1,11 +1,11 @@
<html>
<head><title>CheckGroupTestPage3</title></head>
<body>
- <form
action="/WicketTester/WicketTester?wicket:interface=:2:form::IFormSubmitListener"
wicket:id="form" method="post" id="form"><div style="display:none"><input
type="hidden" name="form_hf_0" id="form_hf_0" /></div>
+ <form
action="/WicketTester/WicketTester?wicket:interface=:2:form::IFormSubmitListener"
wicket:id="form" method="post" id="form0"><div style="display:none"><input
type="hidden" name="form0_hf_0" id="form0_hf_0" /></div>
- <input value="check0" type="checkbox"
wicket:id="check1" name="group">check1</input>
+ <input value="check1" type="checkbox"
wicket:id="check1" name="group">check1</input>
<span wicket:id="container">
- <input value="check1" type="checkbox"
wicket:id="check2" checked="checked" name="group">check2</input>
+ <input value="check2" type="checkbox"
wicket:id="check2" checked="checked" name="group">check2</input>
</span>
</form>
Modified:
incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/markup/html/form/CheckGroupTestPage4_expected.html
URL:
http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/markup/html/form/CheckGroupTestPage4_expected.html?view=diff&rev=476607&r1=476606&r2=476607
==============================================================================
---
incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/markup/html/form/CheckGroupTestPage4_expected.html
(original)
+++
incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/markup/html/form/CheckGroupTestPage4_expected.html
Sat Nov 18 13:16:17 2006
@@ -1,11 +1,11 @@
<html>
<head><title>CheckGroupTestPage4</title></head>
<body>
- <form
action="/WicketTester/WicketTester?wicket:interface=:3:form::IFormSubmitListener"
wicket:id="form" method="post" id="form"><div style="display:none"><input
type="hidden" name="form_hf_0" id="form_hf_0" /></div>
+ <form
action="/WicketTester/WicketTester?wicket:interface=:3:form::IFormSubmitListener"
wicket:id="form" method="post" id="form0"><div style="display:none"><input
type="hidden" name="form0_hf_0" id="form0_hf_0" /></div>
- <input value="check0" type="checkbox"
wicket:id="check1" checked="checked" name="group">check1</input>
+ <input value="check1" type="checkbox"
wicket:id="check1" checked="checked" name="group">check1</input>
<span wicket:id="container">
- <input value="check1" type="checkbox"
wicket:id="check2" checked="checked" name="group">check2</input>
+ <input value="check2" type="checkbox"
wicket:id="check2" checked="checked" name="group">check2</input>
</span>
</form>
Modified:
incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/markup/html/form/RadioGroupDisabledTestPage_expected.html
URL:
http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/markup/html/form/RadioGroupDisabledTestPage_expected.html?view=diff&rev=476607&r1=476606&r2=476607
==============================================================================
---
incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/markup/html/form/RadioGroupDisabledTestPage_expected.html
(original)
+++
incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/markup/html/form/RadioGroupDisabledTestPage_expected.html
Sat Nov 18 13:16:17 2006
@@ -1,11 +1,11 @@
<html>
<head><title>RadioGroupTestPage1</title></head>
<body>
- <form
action="/WicketTester/WicketTester?wicket:interface=:0:form::IFormSubmitListener"
wicket:id="form" method="post" id="form"><div style="display:none"><input
type="hidden" name="form_hf_0" id="form_hf_0" /></div>
+ <form
action="/WicketTester/WicketTester?wicket:interface=:0:form::IFormSubmitListener"
wicket:id="form" method="post" id="form0"><div style="display:none"><input
type="hidden" name="form0_hf_0" id="form0_hf_0" /></div>
<span disabled="disabled" wicket:id="group" name="group">
- <input value="radio0" type="radio" disabled="disabled"
wicket:id="radio1" name="group">radio1</input>
+ <input value="radio1" type="radio" disabled="disabled"
wicket:id="radio1" name="group">radio1</input>
<span wicket:id="container">
- <input value="radio1" type="radio"
disabled="disabled" wicket:id="radio2" checked="checked"
name="group">radio2</input>
+ <input value="radio2" type="radio"
disabled="disabled" wicket:id="radio2" checked="checked"
name="group">radio2</input>
</span>
</span>
</form>
Modified:
incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/markup/html/form/RadioGroupTestPage1_expected.html
URL:
http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/markup/html/form/RadioGroupTestPage1_expected.html?view=diff&rev=476607&r1=476606&r2=476607
==============================================================================
---
incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/markup/html/form/RadioGroupTestPage1_expected.html
(original)
+++
incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/markup/html/form/RadioGroupTestPage1_expected.html
Sat Nov 18 13:16:17 2006
@@ -1,11 +1,11 @@
<html>
<head><title>RadioGroupTestPage1</title></head>
<body>
- <form
action="/WicketTester/WicketTester?wicket:interface=:0:form::IFormSubmitListener"
wicket:id="form" method="post" id="form"><div style="display:none"><input
type="hidden" name="form_hf_0" id="form_hf_0" /></div>
+ <form
action="/WicketTester/WicketTester?wicket:interface=:0:form::IFormSubmitListener"
wicket:id="form" method="post" id="form0"><div style="display:none"><input
type="hidden" name="form0_hf_0" id="form0_hf_0" /></div>
- <input value="radio0" type="radio" wicket:id="radio1"
name="group">radio1</input>
+ <input value="radio1" type="radio" wicket:id="radio1"
name="group">radio1</input>
<span wicket:id="container">
- <input value="radio1" type="radio"
wicket:id="radio2" checked="checked" name="group">radio2</input>
+ <input value="radio2" type="radio"
wicket:id="radio2" checked="checked" name="group">radio2</input>
</span>
</form>
Modified:
incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/markup/html/form/RadioGroupTestPage3_expected.html
URL:
http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/markup/html/form/RadioGroupTestPage3_expected.html?view=diff&rev=476607&r1=476606&r2=476607
==============================================================================
---
incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/markup/html/form/RadioGroupTestPage3_expected.html
(original)
+++
incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/markup/html/form/RadioGroupTestPage3_expected.html
Sat Nov 18 13:16:17 2006
@@ -1,9 +1,9 @@
<html>
<body>
-<form
action="/WicketTester/WicketTester?wicket:interface=:0:form::IFormSubmitListener"
wicket:id="form" method="post" id="form"><div style="display:none"><input
type="hidden" name="form_hf_0" id="form_hf_0" /></div>
+<form
action="/WicketTester/WicketTester?wicket:interface=:0:form::IFormSubmitListener"
wicket:id="form" method="post" id="form0"><div style="display:none"><input
type="hidden" name="form0_hf_0" id="form0_hf_0" /></div>
- <input value="radio0" type="radio" wicket:id="check1"
checked="checked" name="radio">Yes
- <input value="radio1" type="radio" wicket:id="check2"
checked="checked" name="radio">No
+ <input value="radio1" type="radio" wicket:id="check1"
checked="checked" name="radio">Yes
+ <input value="radio2" type="radio" wicket:id="check2"
checked="checked" name="radio">No
</form>
</body>
Modified:
incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/markup/html/tags/InputTagNotVisibleWebPageResult.html
URL:
http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/markup/html/tags/InputTagNotVisibleWebPageResult.html?view=diff&rev=476607&r1=476606&r2=476607
==============================================================================
---
incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/markup/html/tags/InputTagNotVisibleWebPageResult.html
(original)
+++
incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/markup/html/tags/InputTagNotVisibleWebPageResult.html
Sat Nov 18 13:16:17 2006
@@ -1,6 +1,6 @@
<html>
<body>
-<form
action="/WicketTester/WicketTester?wicket:interface=:0:form::IFormSubmitListener"
wicket:id="form" method="post" id="form"><div style="display:none"><input
type="hidden" name="form_hf_0" id="form_hf_0" /></div>
+<form
action="/WicketTester/WicketTester?wicket:interface=:0:form::IFormSubmitListener"
wicket:id="form" method="post" id="form0"><div style="display:none"><input
type="hidden" name="form0_hf_0" id="form0_hf_0" /></div>
</form>
</body>
Modified:
incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/markup/html/tags/InputTagVisibleWebPageResult.html
URL:
http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/markup/html/tags/InputTagVisibleWebPageResult.html?view=diff&rev=476607&r1=476606&r2=476607
==============================================================================
---
incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/markup/html/tags/InputTagVisibleWebPageResult.html
(original)
+++
incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/markup/html/tags/InputTagVisibleWebPageResult.html
Sat Nov 18 13:16:17 2006
@@ -1,6 +1,6 @@
<html>
<body>
-<form
action="/WicketTester/WicketTester?wicket:interface=:0:form::IFormSubmitListener"
wicket:id="form" method="post" id="form"><div style="display:none"><input
type="hidden" name="form_hf_0" id="form_hf_0" /></div>
+<form
action="/WicketTester/WicketTester?wicket:interface=:0:form::IFormSubmitListener"
wicket:id="form" method="post" id="form0"><div style="display:none"><input
type="hidden" name="form0_hf_0" id="form0_hf_0" /></div>
<input value="" type="text" wicket:id="input" name="input">
</form>
</body>
