You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by jd...@apache.org on 2007/08/11 11:12:15 UTC
svn commit: r564878 - in /wicket/trunk/jdk-1.4/wicket/src:
main/java/org/apache/wicket/markup/ main/java/org/apache/wicket/markup/html/
main/java/org/apache/wicket/markup/html/internal/
main/java/org/apache/wicket/markup/parser/filter/ main/java/org/ap...
Author: jdonnerstag
Date: Sat Aug 11 02:12:13 2007
New Revision: 564878
URL: http://svn.apache.org/viewvc?view=rev&rev=564878
Log:
Remove HtmlBodyContainer (and BodyTagHandler) since this container serves no purpose anymore (used to have onLoad attr etc.)
Removed:
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/internal/HtmlBodyContainer.java
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/BodyTagHandler.java
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/header/inheritance/ConcretePage.html
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/header/inheritance/ConcretePage.java
Modified:
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/MarkupParser.java
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/WebPage.java
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/HtmlHeaderResolver.java
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/TestDetachPageAjaxResult.html
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/TestDetachPageExpectedResult.html
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage2_ajax_expected.html
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage2_expected.html
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage_ajax_expected.html
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage_expected.html
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/ajax/DomReadyOrderPage_ajax_expected.html
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/ajax/DomReadyOrderPage_expected.html
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/ajax/form/OnChangeAjaxBehaviorTestPage_expected.html
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxLinkPageExpectedResult.html
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxLinkWithBorderPage-1ExpectedResult.html
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxLinkWithBorderPageExpectedResult.html
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxPage2-1_ExpectedResult.html
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxPage2_ExpectedResult.html
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/ajax/markup/html/componentMap/SimpleTestPageExpectedResult-1.html
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/ajax/markup/html/componentMap/SimpleTestPageExpectedResult.html
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimplePage_14.java
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/border/BoxBorderTestPage_ExpectedResult_3.html
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/CheckGroupDisabledTestPage_expected.html
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTestPage1_expected.html
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTestPage2_expected.html
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTestPage3_expected.html
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTestPage4_expected.html
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/FormMethodTestPage_expected.html
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/RadioGroupDisabledTestPage_expected.html
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/RadioGroupTestPage1_expected.html
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/RadioGroupTestPage3_expected.html
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/header/inheritance/InheritanceHeadTest.java
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/tags/InputTagNotVisibleWebPageResult.html
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/tags/InputTagVisibleWebPageResult.html
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/MarkupParser.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/MarkupParser.java?view=diff&rev=564878&r1=564877&r2=564878
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/MarkupParser.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/MarkupParser.java Sat Aug 11 02:12:13 2007
@@ -27,7 +27,6 @@
import org.apache.wicket.markup.parser.IMarkupFilter;
import org.apache.wicket.markup.parser.IXmlPullParser;
import org.apache.wicket.markup.parser.XmlPullParser;
-import org.apache.wicket.markup.parser.filter.BodyTagHandler;
import org.apache.wicket.markup.parser.filter.EnclosureHandler;
import org.apache.wicket.markup.parser.filter.HeadForceTagIdHandler;
import org.apache.wicket.markup.parser.filter.HtmlHandler;
@@ -170,7 +169,6 @@
if (containerInfo != null)
{
appendMarkupFilter(new WicketMessageTagHandler());
- appendMarkupFilter(new BodyTagHandler());
// Pages require additional handlers
if (Page.class.isAssignableFrom(containerInfo.getContainerClass()))
@@ -312,7 +310,7 @@
}
// Add tag to list?
- if (add || tag.isModified())
+ if (add || tag.isModified() || (markup.size() != size))
{
// Add text from last position to the current tag position
final CharSequence text = xmlParser.getInputFromPositionMarker(tag.getPos());
@@ -335,6 +333,8 @@
markup.addMarkupElement(size, new RawMarkup(rawMarkup));
}
+ xmlParser.setPositionMarker();
+
if (add)
{
// Add to the markup unless the tag has been flagged as
@@ -348,8 +348,10 @@
{
markup.addMarkupElement(new RawMarkup(tag.toCharSequence()));
}
-
- xmlParser.setPositionMarker();
+ else
+ {
+ xmlParser.setPositionMarker(tag.getPos());
+ }
}
// always remember the latest index (size)
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/WebPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/WebPage.java?view=diff&rev=564878&r1=564877&r2=564878
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/WebPage.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/WebPage.java Sat Aug 11 02:12:13 2007
@@ -27,11 +27,6 @@
import org.apache.wicket.Response;
import org.apache.wicket.Session;
import org.apache.wicket.behavior.AbstractBehavior;
-import org.apache.wicket.markup.ComponentTag;
-import org.apache.wicket.markup.MarkupElement;
-import org.apache.wicket.markup.MarkupStream;
-import org.apache.wicket.markup.TagUtils;
-import org.apache.wicket.markup.html.internal.HtmlBodyContainer;
import org.apache.wicket.markup.html.link.BookmarkablePageLink;
import org.apache.wicket.markup.parser.filter.HtmlHeaderSectionHandler;
import org.apache.wicket.model.IModel;
@@ -174,12 +169,6 @@
private static final long serialVersionUID = 1L;
/**
- * Boolean flag that represents whether or not we have already added a
- * {@link HtmlBodyContainer} to this page or not
- */
- private boolean bodyContainerAdded = false;
-
- /**
* The url compressor that will compress the urls by collapsing the
* component path and listener interface
*/
@@ -348,45 +337,6 @@
protected final BookmarkablePageLink homePageLink(final String id)
{
return new BookmarkablePageLink(id, getApplication().getHomePage());
- }
-
- protected void onBeforeRender()
- {
- super.onBeforeRender();
-
- if (!bodyContainerAdded)
- {
- // Add a Body container if the associated markup contains a <body>
- // tag get markup stream gracefully
- MarkupStream markupStream = getAssociatedMarkupStream(false);
- if (markupStream != null)
- {
- // The default <body> container. It can be accessed, replaced
- // and attribute modifiers can be attached. <body> tags without
- // wicket:id get automatically a wicket:id="body" assigned.
- // find the body tag
- while (markupStream.hasMore())
- {
- final MarkupElement element = markupStream.next();
- if (element instanceof ComponentTag)
- {
- final ComponentTag tag = (ComponentTag)element;
- if (tag.isOpen() && TagUtils.isBodyTag(tag))
- {
- // Add a default container if the tag has the
- // default name
- if (HtmlBodyContainer.BODY_ID.equals(tag.getId()))
- {
- add(new HtmlBodyContainer(tag.getId()));
- }
- bodyContainerAdded = true;
- break;
- }
- }
- }
- }
- }
-
}
/**
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/HtmlHeaderResolver.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/HtmlHeaderResolver.java?view=diff&rev=564878&r1=564877&r2=564878
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/HtmlHeaderResolver.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/HtmlHeaderResolver.java Sat Aug 11 02:12:13 2007
@@ -57,8 +57,8 @@
* Try to resolve the tag, then create a component, add it to the container
* and render it.
*
- * @see org.apache.wicket.markup.resolver.IComponentResolver#resolve(MarkupContainer, MarkupStream,
- * ComponentTag)
+ * @see org.apache.wicket.markup.resolver.IComponentResolver#resolve(MarkupContainer,
+ * MarkupStream, ComponentTag)
*
* @param container
* The container parsing its markup
@@ -77,7 +77,7 @@
// Create a special header component which will gather additional
// input the <head> from 'contributors'.
final WebMarkupContainer header = new HtmlHeaderContainer(
- HtmlHeaderSectionHandler.HEADER_ID);
+ HtmlHeaderSectionHandler.HEADER_ID + container.getPage().getAutoIndex());
container.autoAdd(header, markupStream);
// Yes, we handled the tag
@@ -85,53 +85,55 @@
}
else if ((tag instanceof WicketTag) && ((WicketTag)tag).isHeadTag())
{
- // If we found <wicket:head> without surrounding <head> on a Page,
- // than we have to add wicket:head into a automatically generated
- // head first.
- if (container instanceof WebPage)
- {
- // Create a special header component which will gather additional
- // input the <head> from 'contributors'.
- final MarkupContainer header = new HtmlHeaderContainer(HtmlHeaderSectionHandler.HEADER_ID);
-
- // It is <wicket:head>. Because they do not provide any additional
- // functionality they are merely a means of surrounding relevant
+ // If we found <wicket:head> without surrounding <head> on a Page,
+ // than we have to add wicket:head into a automatically generated
+ // head first.
+ if (container instanceof WebPage)
+ {
+ // Create a special header component which will gather
+ // additional input the <head> from 'contributors'.
+ final MarkupContainer header = new HtmlHeaderContainer(
+ HtmlHeaderSectionHandler.HEADER_ID + container.getPage().getAutoIndex());
+
+ // It is <wicket:head>. Because they do not provide any
+ // additional functionality they are merely a means of surrounding relevant
// markup. Thus we simply create a WebMarkupContainer to handle
// the tag.
final WebMarkupContainer header2 = new WebMarkupContainer(
HtmlHeaderSectionHandler.HEADER_ID)
- {
- private static final long serialVersionUID = 1L;
+ {
+ private static final long serialVersionUID = 1L;
+
+ public boolean isTransparentResolver()
+ {
+ return true;
+ }
+ };
- public boolean isTransparentResolver()
- {
- return true;
- }
- };
header2.setRenderBodyOnly(true);
-
+
header.add(header2);
-
+
container.autoAdd(header, markupStream);
- }
- else if (container instanceof HtmlHeaderContainer)
- {
- // It is <wicket:head>. Because they do not provide any additional
- // functionality there are merely a means of surrounding relevant
- // markup. Thus we simply create a WebMarkupContainer to handle
+ }
+ else if (container instanceof HtmlHeaderContainer)
+ {
+ // It is <wicket:head>. Because they do not provide any
+ // additional functionality there are merely a means of surrounding
+ // relevant markup. Thus we simply create a WebMarkupContainer to handle
// the tag.
final WebMarkupContainer header = new WebMarkupContainer(
HtmlHeaderSectionHandler.HEADER_ID)
- {
- private static final long serialVersionUID = 1L;
-
- public boolean isTransparentResolver()
- {
- return true;
- }
- };
+ {
+ private static final long serialVersionUID = 1L;
+
+ public boolean isTransparentResolver()
+ {
+ return true;
+ }
+ };
header.setRenderBodyOnly(true);
-
+
try
{
container.autoAdd(header, markupStream);
@@ -143,13 +145,13 @@
+ "then you most likely forgot to override autoAdd() "
+ "in your bordered page component.", ex);
}
- }
- else
- {
- throw new MarkupException(
- "Mis-placed <wicket:head>. <wicket:head> must be outside of <wicket:panel> and <wicket:border>");
- }
-
+ }
+ else
+ {
+ throw new MarkupException(
+ "Mis-placed <wicket:head>. <wicket:head> must be outside of <wicket:panel> and <wicket:border>");
+ }
+
// Yes, we handled the tag
return true;
}
Modified: wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/TestDetachPageAjaxResult.html
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/TestDetachPageAjaxResult.html?view=diff&rev=564878&r1=564877&r2=564878
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/TestDetachPageAjaxResult.html (original)
+++ wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/TestDetachPageAjaxResult.html Sat Aug 11 02:12:13 2007
@@ -5,4 +5,4 @@
/*-->]^]^>*/</script>
<script type="text/javascript" src="resources/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/wicket-ajax-debug.js"></script>
-</head>]]></header-contribution><component id="comp0" ><![CDATA[<span wicket:id="comp" onclick="var wcall=wicketAjaxGet('?wicket:interface=:0:comp::IBehaviorListener:0:', function() { }.bind(this), function() { }.bind(this));" id="comp0">body</span>]]></component></ajax-response>
\ No newline at end of file
+</head>]]></header-contribution><component id="comp1" ><![CDATA[<span wicket:id="comp" onclick="var wcall=wicketAjaxGet('?wicket:interface=:0:comp::IBehaviorListener:0:', function() { }.bind(this), function() { }.bind(this));" id="comp1">body</span>]]></component></ajax-response>
\ No newline at end of file
Modified: wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/TestDetachPageExpectedResult.html
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/TestDetachPageExpectedResult.html?view=diff&rev=564878&r1=564877&r2=564878
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/TestDetachPageExpectedResult.html (original)
+++ wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/TestDetachPageExpectedResult.html Sat Aug 11 02:12:13 2007
@@ -7,6 +7,6 @@
<script type="text/javascript" src="resources/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/wicket-ajax-debug.js"></script>
</head><body>
- <span wicket:id="comp" onclick="var wcall=wicketAjaxGet('?wicket:interface=:0:comp::IBehaviorListener:0:', function() { }.bind(this), function() { }.bind(this));" id="comp0">body</span>
+ <span wicket:id="comp" onclick="var wcall=wicketAjaxGet('?wicket:interface=:0:comp::IBehaviorListener:0:', function() { }.bind(this), function() { }.bind(this));" id="comp1">body</span>
</body>
</html>
Modified: wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage2_ajax_expected.html
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage2_ajax_expected.html?view=diff&rev=564878&r1=564877&r2=564878
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage2_ajax_expected.html (original)
+++ wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage2_ajax_expected.html Sat Aug 11 02:12:13 2007
@@ -1,19 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?><ajax-response><evaluate><![CDATA[prepend();]]></evaluate><header-contribution><![CDATA[<head xmlns:wicket="http://wicket.apache.org">
<link href="../test"/>
<script type="text/javascript" src="javascripturl"></script>
-</head>]]></header-contribution><component id="test16" ><![CDATA[<span wicket:id="test1" id="test16"><wicket:panel>
+</head>]]></header-contribution><component id="test17" ><![CDATA[<span wicket:id="test1" id="test17"><wicket:panel>
test
-</wicket:panel></span>]]></component><component id="test27" ><![CDATA[<span wicket:id="test2" id="test27"><wicket:panel>
+</wicket:panel></span>]]></component><component id="test28" ><![CDATA[<span wicket:id="test2" id="test28"><wicket:panel>
test
-</wicket:panel></span>]]></component><component id="test38" ><![CDATA[<span wicket:id="test3" id="test38"><wicket:panel>
+</wicket:panel></span>]]></component><component id="test39" ><![CDATA[<span wicket:id="test3" id="test39"><wicket:panel>
test
</wicket:panel></span>]]></component><header-contribution><![CDATA[<head xmlns:wicket="http://wicket.apache.org">
<link href="../test2"/>
<script type="text/javascript" src="javascripturlB"></script>
-</head>]]></header-contribution><component id="btest19" ><![CDATA[<span wicket:id="btest1" id="btest19"><wicket:panel>
+</head>]]></header-contribution><component id="btest110" ><![CDATA[<span wicket:id="btest1" id="btest110"><wicket:panel>
test
-</wicket:panel></span>]]></component><component id="btest210" ><![CDATA[<span wicket:id="btest2" id="btest210"><wicket:panel>
+</wicket:panel></span>]]></component><component id="btest211" ><![CDATA[<span wicket:id="btest2" id="btest211"><wicket:panel>
test
-</wicket:panel></span>]]></component><component id="btest311" ><![CDATA[<span wicket:id="btest3" id="btest311"><wicket:panel>
+</wicket:panel></span>]]></component><component id="btest312" ><![CDATA[<span wicket:id="btest3" id="btest312"><wicket:panel>
test
</wicket:panel></span>]]></component><evaluate><![CDATA[domReady();]]></evaluate><evaluate><![CDATA[domReadyB();]]></evaluate><evaluate><![CDATA[append();]]></evaluate><evaluate><![CDATA[onLoad();]]></evaluate><evaluate><![CDATA[onLoadB();]]></evaluate></ajax-response>
Modified: wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage2_expected.html
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage2_expected.html?view=diff&rev=564878&r1=564877&r2=564878
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage2_expected.html (original)
+++ wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage2_expected.html Sat Aug 11 02:12:13 2007
@@ -29,24 +29,24 @@
<script type="text/javascript" src="resources/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/wicket-ajax-debug.js"></script>
</head><body>
-<span wicket:id="test1" id="test16"><wicket:panel>
+<span wicket:id="test1" id="test17"><wicket:panel>
test
</wicket:panel></span>
-<span wicket:id="test2" id="test27"><wicket:panel>
+<span wicket:id="test2" id="test28"><wicket:panel>
test
</wicket:panel></span>
-<span wicket:id="test3" id="test38"><wicket:panel>
+<span wicket:id="test3" id="test39"><wicket:panel>
test
</wicket:panel></span>
-<span wicket:id="btest1" id="btest19"><wicket:panel>
+<span wicket:id="btest1" id="btest110"><wicket:panel>
test
</wicket:panel></span>
-<span wicket:id="btest2" id="btest210"><wicket:panel>
+<span wicket:id="btest2" id="btest211"><wicket:panel>
test
</wicket:panel></span>
-<span wicket:id="btest3" id="btest311"><wicket:panel>
+<span wicket:id="btest3" id="btest312"><wicket:panel>
test
</wicket:panel></span>
-<a href="?wicket:interface=:0:link::ILinkListener::" wicket:id="link" onclick="var wcall=wicketAjaxGet('?wicket:interface=:0:link::IBehaviorListener:0:', function() { }.bind(this), function() { }.bind(this));return !wcall;" id="link12">Test</a>
+<a href="?wicket:interface=:0:link::ILinkListener::" wicket:id="link" onclick="var wcall=wicketAjaxGet('?wicket:interface=:0:link::IBehaviorListener:0:', function() { }.bind(this), function() { }.bind(this));return !wcall;" id="link13">Test</a>
</body>
</html>
Modified: wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage_ajax_expected.html
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage_ajax_expected.html?view=diff&rev=564878&r1=564877&r2=564878
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage_ajax_expected.html (original)
+++ wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage_ajax_expected.html Sat Aug 11 02:12:13 2007
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?><ajax-response><evaluate><![CDATA[prepend();]]></evaluate><header-contribution><![CDATA[<head xmlns:wicket="http://wicket.apache.org">
<link href="../test"/>
<script type="text/javascript" src="javascripturl"></script>
-</head>]]></header-contribution><component id="test13" ><![CDATA[<span wicket:id="test1" id="test13"><wicket:panel>
+</head>]]></header-contribution><component id="test14" ><![CDATA[<span wicket:id="test1" id="test14"><wicket:panel>
test
-</wicket:panel></span>]]></component><component id="test24" ><![CDATA[<span wicket:id="test2" id="test24"><wicket:panel>
+</wicket:panel></span>]]></component><component id="test25" ><![CDATA[<span wicket:id="test2" id="test25"><wicket:panel>
test
-</wicket:panel></span>]]></component><component id="test35" ><![CDATA[<span wicket:id="test3" id="test35"><wicket:panel>
+</wicket:panel></span>]]></component><component id="test36" ><![CDATA[<span wicket:id="test3" id="test36"><wicket:panel>
test
</wicket:panel></span>]]></component><evaluate><![CDATA[domReady();]]></evaluate><evaluate><![CDATA[append();]]></evaluate><evaluate><![CDATA[onLoad();]]></evaluate></ajax-response>
Modified: wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage_expected.html
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage_expected.html?view=diff&rev=564878&r1=564877&r2=564878
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage_expected.html (original)
+++ wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage_expected.html Sat Aug 11 02:12:13 2007
@@ -18,15 +18,15 @@
<script type="text/javascript" src="resources/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/wicket-ajax-debug.js"></script>
</head><body>
-<span wicket:id="test1" id="test13"><wicket:panel>
+<span wicket:id="test1" id="test14"><wicket:panel>
test
</wicket:panel></span>
-<span wicket:id="test2" id="test24"><wicket:panel>
+<span wicket:id="test2" id="test25"><wicket:panel>
test
</wicket:panel></span>
-<span wicket:id="test3" id="test35"><wicket:panel>
+<span wicket:id="test3" id="test36"><wicket:panel>
test
</wicket:panel></span>
-<a href="?wicket:interface=:0:link::ILinkListener::" wicket:id="link" onclick="var wcall=wicketAjaxGet('?wicket:interface=:0:link::IBehaviorListener:0:', function() { }.bind(this), function() { }.bind(this));return !wcall;" id="link6">Test</a>
+<a href="?wicket:interface=:0:link::ILinkListener::" wicket:id="link" onclick="var wcall=wicketAjaxGet('?wicket:interface=:0:link::IBehaviorListener:0:', function() { }.bind(this), function() { }.bind(this));return !wcall;" id="link7">Test</a>
</body>
</html>
Modified: wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/ajax/DomReadyOrderPage_ajax_expected.html
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/ajax/DomReadyOrderPage_ajax_expected.html?view=diff&rev=564878&r1=564877&r2=564878
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/ajax/DomReadyOrderPage_ajax_expected.html (original)
+++ wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/ajax/DomReadyOrderPage_ajax_expected.html Sat Aug 11 02:12:13 2007
@@ -5,4 +5,4 @@
/*-->]^]^>*/</script>
<script type="text/javascript" src="resources/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/wicket-ajax-debug.js"></script>
-</head>]]></header-contribution><component id="test0" ><![CDATA[<a href="?wicket:interface=:0:test::ILinkListener::" wicket:id="test" onclick="var wcall=wicketAjaxGet('?wicket:interface=:0:test::IBehaviorListener:0:', function() { }.bind(this), function() { }.bind(this));return !wcall;" id="test0">Test</a>]]></component><evaluate><![CDATA[test1();]]></evaluate><evaluate><![CDATA[test2();]]></evaluate></ajax-response>
\ No newline at end of file
+</head>]]></header-contribution><component id="test1" ><![CDATA[<a href="?wicket:interface=:0:test::ILinkListener::" wicket:id="test" onclick="var wcall=wicketAjaxGet('?wicket:interface=:0:test::IBehaviorListener:0:', function() { }.bind(this), function() { }.bind(this));return !wcall;" id="test1">Test</a>]]></component><evaluate><![CDATA[test1();]]></evaluate><evaluate><![CDATA[test2();]]></evaluate></ajax-response>
\ No newline at end of file
Modified: wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/ajax/DomReadyOrderPage_expected.html
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/ajax/DomReadyOrderPage_expected.html?view=diff&rev=564878&r1=564877&r2=564878
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/ajax/DomReadyOrderPage_expected.html (original)
+++ wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/ajax/DomReadyOrderPage_expected.html Sat Aug 11 02:12:13 2007
@@ -15,6 +15,6 @@
/*-->]]>*/</script>
</head><body>
-<a href="?wicket:interface=:0:test::ILinkListener::" wicket:id="test" onclick="var wcall=wicketAjaxGet('?wicket:interface=:0:test::IBehaviorListener:0:', function() { }.bind(this), function() { }.bind(this));return !wcall;" id="test0">Test</a>
+<a href="?wicket:interface=:0:test::ILinkListener::" wicket:id="test" onclick="var wcall=wicketAjaxGet('?wicket:interface=:0:test::IBehaviorListener:0:', function() { }.bind(this), function() { }.bind(this));return !wcall;" id="test1">Test</a>
</body>
</html>
Modified: wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/ajax/form/OnChangeAjaxBehaviorTestPage_expected.html
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/ajax/form/OnChangeAjaxBehaviorTestPage_expected.html?view=diff&rev=564878&r1=564877&r2=564878
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/ajax/form/OnChangeAjaxBehaviorTestPage_expected.html (original)
+++ wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/ajax/form/OnChangeAjaxBehaviorTestPage_expected.html Sat Aug 11 02:12:13 2007
@@ -7,13 +7,13 @@
<script type="text/javascript" src="resources/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/wicket-ajax-debug.js"></script>
</head><body>
- <form action="?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 onchange="var wcall=wicketAjaxPost('?wicket:interface=:0:form:field::IBehaviorListener:0:', wicketSerialize(Wicket.$('field1')), function() { }.bind(this), function() { }.bind(this));" value="" type="text" wicket:id="field" name="field" id="field1"/><script type="text/javascript"><!--/*--><![CDATA[/*><!--*/
-new Wicket.ChangeHandler('field1');
+ <form action="?wicket:interface=:0:form::IFormSubmitListener::" wicket:id="form" method="post" id="form1"><div style="display:none"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div>
+ <input value="" type="text" wicket:id="field" name="field" onchange="var wcall=wicketAjaxPost('?wicket:interface=:0:form:field::IBehaviorListener:0:', wicketSerialize(Wicket.$('field2')), function() { }.bind(this), function() { }.bind(this));" id="field2"/><script type="text/javascript"><!--/*--><![CDATA[/*><!--*/
+new Wicket.ChangeHandler('field2');
/*-->]]>*/</script>
- <select wicket:id="dropDown" name="dropDown" onchange="var wcall=wicketAjaxPost('?wicket:interface=:0:form:dropDown::IBehaviorListener:0:', wicketSerialize(Wicket.$('dropDown2')), function() { }.bind(this), function() { }.bind(this));" id="dropDown2">
+ <select wicket:id="dropDown" name="dropDown" onchange="var wcall=wicketAjaxPost('?wicket:interface=:0:form:dropDown::IBehaviorListener:0:', wicketSerialize(Wicket.$('dropDown3')), function() { }.bind(this), function() { }.bind(this));" id="dropDown3">
<option selected="selected" value="">Choose One</option>
</select>
</form>
Modified: wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxLinkPageExpectedResult.html
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxLinkPageExpectedResult.html?view=diff&rev=564878&r1=564877&r2=564878
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxLinkPageExpectedResult.html (original)
+++ wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxLinkPageExpectedResult.html Sat Aug 11 02:12:13 2007
@@ -7,7 +7,7 @@
<script type="text/javascript" src="resources/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/wicket-ajax-debug.js"></script>
</head><body>
- <span wicket:id="ajaxLabel" id="ajaxLabel0">UpdateMe</span>
- <a href="#" wicket:id="ajaxLink" onclick="var wcall=wicketAjaxGet('?wicket:interface=:0:ajaxLink::IBehaviorListener:0:', function() { }.bind(this), function() { }.bind(this));return !wcall;" id="ajaxLink1">Update</a>
+ <span wicket:id="ajaxLabel" id="ajaxLabel1">UpdateMe</span>
+ <a href="#" wicket:id="ajaxLink" onclick="var wcall=wicketAjaxGet('?wicket:interface=:0:ajaxLink::IBehaviorListener:0:', function() { }.bind(this), function() { }.bind(this));return !wcall;" id="ajaxLink2">Update</a>
</body>
</html>
Modified: wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxLinkWithBorderPage-1ExpectedResult.html
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxLinkWithBorderPage-1ExpectedResult.html?view=diff&rev=564878&r1=564877&r2=564878
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxLinkWithBorderPage-1ExpectedResult.html (original)
+++ wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxLinkWithBorderPage-1ExpectedResult.html Sat Aug 11 02:12:13 2007
@@ -1 +1 @@
-<?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
+<?xml version="1.0" encoding="UTF-8"?><ajax-response><component id="ajaxLabel1" ><![CDATA[<span wicket:id="ajaxLabel" id="ajaxLabel1">Updated!</span>]]></component></ajax-response>
\ No newline at end of file
Modified: wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxLinkWithBorderPageExpectedResult.html
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxLinkWithBorderPageExpectedResult.html?view=diff&rev=564878&r1=564877&r2=564878
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxLinkWithBorderPageExpectedResult.html (original)
+++ wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxLinkWithBorderPageExpectedResult.html Sat Aug 11 02:12:13 2007
@@ -10,8 +10,8 @@
<span wicket:id="border"><wicket:border>
Border
<wicket:body>
- <span wicket:id="ajaxLabel" id="ajaxLabel0">UpdateMe</span>
- <a href="#" wicket:id="ajaxLink" onclick="var wcall=wicketAjaxGet('?wicket:interface=:0:ajaxLink::IBehaviorListener:0:', function() { }.bind(this), function() { }.bind(this));return !wcall;" id="ajaxLink1">Update</a>
+ <span wicket:id="ajaxLabel" id="ajaxLabel1">UpdateMe</span>
+ <a href="#" wicket:id="ajaxLink" onclick="var wcall=wicketAjaxGet('?wicket:interface=:0:ajaxLink::IBehaviorListener:0:', function() { }.bind(this), function() { }.bind(this));return !wcall;" id="ajaxLink2">Update</a>
</wicket:body>
Border
</wicket:border></span>
Modified: wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxPage2-1_ExpectedResult.html
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxPage2-1_ExpectedResult.html?view=diff&rev=564878&r1=564877&r2=564878
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxPage2-1_ExpectedResult.html (original)
+++ wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxPage2-1_ExpectedResult.html Sat Aug 11 02:12:13 2007
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?><ajax-response><component id="ajaxLabel" ><![CDATA[<span wicket:id="ajaxLabel" id="ajaxLabel0">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="ajaxLabel1">BBBBBBB</span>]]></component></ajax-response>
\ No newline at end of file
Modified: wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxPage2_ExpectedResult.html
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxPage2_ExpectedResult.html?view=diff&rev=564878&r1=564877&r2=564878
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxPage2_ExpectedResult.html (original)
+++ wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxPage2_ExpectedResult.html Sat Aug 11 02:12:13 2007
@@ -15,8 +15,8 @@
<tr>
<td width = "100%">
<wicket:body>
- <span wicket:id="ajaxLabel" id="ajaxLabel0">AAAAAAA</span>
- <a href="#" wicket:id="ajaxLink" onclick="var wcall=wicketAjaxGet('?wicket:interface=:0:ajaxLink::IBehaviorListener:0:', function() { }.bind(this), function() { }.bind(this));return !wcall;" id="ajaxLink1">Update</a>
+ <span wicket:id="ajaxLabel" id="ajaxLabel1">AAAAAAA</span>
+ <a href="#" wicket:id="ajaxLink" onclick="var wcall=wicketAjaxGet('?wicket:interface=:0:ajaxLink::IBehaviorListener:0:', function() { }.bind(this), function() { }.bind(this));return !wcall;" id="ajaxLink2">Update</a>
</wicket:body>
</td>
</tr>
Modified: wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/ajax/markup/html/componentMap/SimpleTestPageExpectedResult-1.html
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/ajax/markup/html/componentMap/SimpleTestPageExpectedResult-1.html?view=diff&rev=564878&r1=564877&r2=564878
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/ajax/markup/html/componentMap/SimpleTestPageExpectedResult-1.html (original)
+++ wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/ajax/markup/html/componentMap/SimpleTestPageExpectedResult-1.html Sat Aug 11 02:12:13 2007
@@ -5,4 +5,4 @@
/*-->]^]^>*/</script>
<script type="text/javascript" src="resources/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/wicket-ajax-debug.js"></script>
-</head>]]></header-contribution><component id="linja10" ><![CDATA[<span wicket:id="linja1" id="linja10">1</span>]]></component><evaluate><![CDATA[setTimeout("var wcall=wicketAjaxGet('?wicket:interface=:0:testPanel:baseSpan:linja1::IBehaviorListener:0:&wicket:ignoreIfNotActive=true', function() { }.bind(this), function() { }.bind(this), function() {var c = Wicket.$('linja10'); return typeof(c) != 'undefined' && c != null});", 2000);]]></evaluate></ajax-response>
\ No newline at end of file
+</head>]]></header-contribution><component id="linja11" ><![CDATA[<span wicket:id="linja1" id="linja11">1</span>]]></component><evaluate><![CDATA[setTimeout("var wcall=wicketAjaxGet('?wicket:interface=:0:testPanel:baseSpan:linja1::IBehaviorListener:0:&wicket:ignoreIfNotActive=true', function() { }.bind(this), function() { }.bind(this), function() {var c = Wicket.$('linja11'); return typeof(c) != 'undefined' && c != null});", 2000);]]></evaluate></ajax-response>
\ No newline at end of file
Modified: wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/ajax/markup/html/componentMap/SimpleTestPageExpectedResult.html
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/ajax/markup/html/componentMap/SimpleTestPageExpectedResult.html?view=diff&rev=564878&r1=564877&r2=564878
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/ajax/markup/html/componentMap/SimpleTestPageExpectedResult.html (original)
+++ wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/ajax/markup/html/componentMap/SimpleTestPageExpectedResult.html Sat Aug 11 02:12:13 2007
@@ -9,7 +9,7 @@
<script type="text/javascript" src="resources/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/wicket-ajax-debug.js"></script>
<script type="text/javascript" ><!--/*--><![CDATA[/*><!--*/
-Wicket.Event.add(window, "load", function() { setTimeout("var wcall=wicketAjaxGet('?wicket:interface=:0:testPanel:baseSpan:linja1::IBehaviorListener:0:&wicket:ignoreIfNotActive=true', function() { }.bind(this), function() { }.bind(this), function() {var c = Wicket.$('linja10'); return typeof(c) != 'undefined' && c != null});", 2000);;});
+Wicket.Event.add(window, "load", function() { setTimeout("var wcall=wicketAjaxGet('?wicket:interface=:0:testPanel:baseSpan:linja1::IBehaviorListener:0:&wicket:ignoreIfNotActive=true', function() { }.bind(this), function() { }.bind(this), function() {var c = Wicket.$('linja11'); return typeof(c) != 'undefined' && c != null});", 2000);;});
/*-->]]>*/</script>
</head>
@@ -17,7 +17,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="linja10">0</span>
+ this counter should update every 2 seconds: <span wicket:id="linja1" id="linja11">0</span>
</wicket:extend></wicket:child>
</span>
</wicket:panel></span>
Modified: wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimplePage_14.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimplePage_14.java?view=diff&rev=564878&r1=564877&r2=564878
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimplePage_14.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimplePage_14.java Sat Aug 11 02:12:13 2007
@@ -38,9 +38,7 @@
{
WebMarkupContainer container = new WebMarkupContainer("html");
container.add(new AttributeModifier("lang", new Model("de")));
- //THIS doesn't work.. but in the markup it is child!
- //container.add(new Label("label","label"));
- add(new Label("label","label"));
+ container.add(new Label("label", "label"));
add(container);
}
}
Modified: wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/border/BoxBorderTestPage_ExpectedResult_3.html
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/border/BoxBorderTestPage_ExpectedResult_3.html?view=diff&rev=564878&r1=564877&r2=564878
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/border/BoxBorderTestPage_ExpectedResult_3.html (original)
+++ wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/border/BoxBorderTestPage_ExpectedResult_3.html Sat Aug 11 02:12:13 2007
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<body>
<span wicket:id="border"><wicket:border>
- <form action="?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>
+ <form action="?wicket:interface=:0:border:myForm::IFormSubmitListener::" wicket:id="myForm" method="post" id="myForm1"><div style="display:none"><input type="hidden" name="myForm1_hf_0" id="myForm1_hf_0" /></div>
<wicket:body>
<input value="" type="text" wicket:id="name" name="border:name"/>
</wicket:body>
Modified: wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/CheckGroupDisabledTestPage_expected.html
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/CheckGroupDisabledTestPage_expected.html?view=diff&rev=564878&r1=564877&r2=564878
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/CheckGroupDisabledTestPage_expected.html (original)
+++ wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/CheckGroupDisabledTestPage_expected.html Sat Aug 11 02:12:13 2007
@@ -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="?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 action="?wicket:interface=:0:form::IFormSubmitListener::" wicket:id="form" method="post" id="form1"><div style="display:none"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div>
<span wicket:id="group">
- <Input value="check1" type="checkbox" disabled="disabled" wicket:id="check1" checked="checked" name="group">check1</input>
+ <Input value="check2" type="checkbox" disabled="disabled" wicket:id="check1" checked="checked" name="group">check1</input>
<span wicket:id="container">
- <input value="check2" type="checkbox" disabled="disabled" wicket:id="check2" checked="checked" name="group">check2</input>
+ <input value="check3" type="checkbox" disabled="disabled" wicket:id="check2" checked="checked" name="group">check2</input>
</span>
</span>
</FORM>
Modified: wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTestPage1_expected.html
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTestPage1_expected.html?view=diff&rev=564878&r1=564877&r2=564878
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTestPage1_expected.html (original)
+++ wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTestPage1_expected.html Sat Aug 11 02:12:13 2007
@@ -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="?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 action="?wicket:interface=:0:form::IFormSubmitListener::" wicket:id="form" method="post" id="form1"><div style="display:none"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div>
- <Input value="check1" type="checkbox" wicket:id="check1" name="group">check1</input>
+ <Input value="check2" type="checkbox" wicket:id="check1" name="group">check1</input>
<span wicket:id="container">
- <input value="check2" type="checkbox" wicket:id="check2" name="group">check2</input>
+ <input value="check3" type="checkbox" wicket:id="check2" name="group">check2</input>
</span>
</FORM>
Modified: wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTestPage2_expected.html
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTestPage2_expected.html?view=diff&rev=564878&r1=564877&r2=564878
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTestPage2_expected.html (original)
+++ wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTestPage2_expected.html Sat Aug 11 02:12:13 2007
@@ -1,11 +1,11 @@
<html>
<head><title>CheckGroupTestPage2</title></head>
<body>
- <form action="?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>
+ <form action="?wicket:interface=:1:form::IFormSubmitListener::" wicket:id="form" method="post" id="form1"><div style="display:none"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div>
- <input value="check1" type="checkbox" wicket:id="check1" checked="checked" name="group">check1</input>
+ <input value="check2" type="checkbox" wicket:id="check1" checked="checked" name="group">check1</input>
<span wicket:id="container">
- <input value="check2" type="checkbox" wicket:id="check2" name="group">check2</input>
+ <input value="check3" type="checkbox" wicket:id="check2" name="group">check2</input>
</span>
</form>
Modified: wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTestPage3_expected.html
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTestPage3_expected.html?view=diff&rev=564878&r1=564877&r2=564878
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTestPage3_expected.html (original)
+++ wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTestPage3_expected.html Sat Aug 11 02:12:13 2007
@@ -1,11 +1,11 @@
<html>
<head><title>CheckGroupTestPage3</title></head>
<body>
- <form action="?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>
+ <form action="?wicket:interface=:2:form::IFormSubmitListener::" wicket:id="form" method="post" id="form1"><div style="display:none"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div>
- <input value="check1" type="checkbox" wicket:id="check1" name="group">check1</input>
+ <input value="check2" type="checkbox" wicket:id="check1" name="group">check1</input>
<span wicket:id="container">
- <input value="check2" type="checkbox" wicket:id="check2" checked="checked" name="group">check2</input>
+ <input value="check3" type="checkbox" wicket:id="check2" checked="checked" name="group">check2</input>
</span>
</form>
Modified: wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTestPage4_expected.html
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTestPage4_expected.html?view=diff&rev=564878&r1=564877&r2=564878
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTestPage4_expected.html (original)
+++ wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTestPage4_expected.html Sat Aug 11 02:12:13 2007
@@ -1,11 +1,11 @@
<html>
<head><title>CheckGroupTestPage4</title></head>
<body>
- <form action="?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>
+ <form action="?wicket:interface=:3:form::IFormSubmitListener::" wicket:id="form" method="post" id="form1"><div style="display:none"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div>
- <input value="check1" type="checkbox" wicket:id="check1" checked="checked" name="group">check1</input>
+ <input value="check2" type="checkbox" wicket:id="check1" checked="checked" name="group">check1</input>
<span wicket:id="container">
- <input value="check2" type="checkbox" wicket:id="check2" checked="checked" name="group">check2</input>
+ <input value="check3" type="checkbox" wicket:id="check2" checked="checked" name="group">check2</input>
</span>
</form>
Modified: wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/FormMethodTestPage_expected.html
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/FormMethodTestPage_expected.html?view=diff&rev=564878&r1=564877&r2=564878
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/FormMethodTestPage_expected.html (original)
+++ wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/FormMethodTestPage_expected.html Sat Aug 11 02:12:13 2007
@@ -1,6 +1,6 @@
<html>
<body>
- <form action="?wicket:interface=:0:formpost::IFormSubmitListener::" wicket:id="formpost" method="post" id="formpost0"><div style="display:none"><input type="hidden" name="formpost0_hf_0" id="formpost0_hf_0" /></div></form>
- <form action="?wicket:interface=:0:formget::IFormSubmitListener::" wicket:id="formget" method="get" id="formget1"><div style="display:none"><input type="hidden" name="formget1_hf_0" id="formget1_hf_0" /></div></form>
+ <form action="?wicket:interface=:0:formpost::IFormSubmitListener::" wicket:id="formpost" method="post" id="formpost1"><div style="display:none"><input type="hidden" name="formpost1_hf_0" id="formpost1_hf_0" /></div></form>
+ <form action="?wicket:interface=:0:formget::IFormSubmitListener::" wicket:id="formget" method="get" id="formget2"><div style="display:none"><input type="hidden" name="formget2_hf_0" id="formget2_hf_0" /></div></form>
</body>
</html>
Modified: wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/RadioGroupDisabledTestPage_expected.html
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/RadioGroupDisabledTestPage_expected.html?view=diff&rev=564878&r1=564877&r2=564878
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/RadioGroupDisabledTestPage_expected.html (original)
+++ wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/RadioGroupDisabledTestPage_expected.html Sat Aug 11 02:12:13 2007
@@ -1,11 +1,11 @@
<html>
<head><title>RadioGroupTestPage1</title></head>
<body>
- <form action="?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 action="?wicket:interface=:0:form::IFormSubmitListener::" wicket:id="form" method="post" id="form1"><div style="display:none"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div>
<span wicket:id="group">
- <input value="radio1" type="radio" disabled="disabled" wicket:id="radio1" name="group">radio1</input>
+ <input value="radio2" type="radio" disabled="disabled" wicket:id="radio1" name="group">radio1</input>
<span wicket:id="container">
- <input value="radio2" type="radio" disabled="disabled" wicket:id="radio2" checked="checked" name="group">radio2</input>
+ <input value="radio3" type="radio" disabled="disabled" wicket:id="radio2" checked="checked" name="group">radio2</input>
</span>
</span>
</form>
Modified: wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/RadioGroupTestPage1_expected.html
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/RadioGroupTestPage1_expected.html?view=diff&rev=564878&r1=564877&r2=564878
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/RadioGroupTestPage1_expected.html (original)
+++ wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/RadioGroupTestPage1_expected.html Sat Aug 11 02:12:13 2007
@@ -1,11 +1,11 @@
<html>
<head><title>RadioGroupTestPage1</title></head>
<body>
- <form action="?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 action="?wicket:interface=:0:form::IFormSubmitListener::" wicket:id="form" method="post" id="form1"><div style="display:none"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div>
- <input value="radio1" type="radio" wicket:id="radio1" name="group">radio1</input>
+ <input value="radio2" type="radio" wicket:id="radio1" name="group">radio1</input>
<span wicket:id="container">
- <input value="radio2" type="radio" wicket:id="radio2" checked="checked" name="group">radio2</input>
+ <input value="radio3" type="radio" wicket:id="radio2" checked="checked" name="group">radio2</input>
</span>
</form>
Modified: wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/RadioGroupTestPage3_expected.html
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/RadioGroupTestPage3_expected.html?view=diff&rev=564878&r1=564877&r2=564878
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/RadioGroupTestPage3_expected.html (original)
+++ wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/RadioGroupTestPage3_expected.html Sat Aug 11 02:12:13 2007
@@ -1,9 +1,9 @@
<html>
<body>
-<form action="?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 action="?wicket:interface=:0:form::IFormSubmitListener::" wicket:id="form" method="post" id="form1"><div style="display:none"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div>
- <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
+ <input value="radio2" type="radio" wicket:id="check1" checked="checked" name="radio">Yes
+ <input value="radio3" type="radio" wicket:id="check2" checked="checked" name="radio">No
</form>
</body>
Modified: wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/header/inheritance/InheritanceHeadTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/header/inheritance/InheritanceHeadTest.java?view=diff&rev=564878&r1=564877&r2=564878
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/header/inheritance/InheritanceHeadTest.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/header/inheritance/InheritanceHeadTest.java Sat Aug 11 02:12:13 2007
@@ -22,7 +22,6 @@
import org.apache.wicket.Response;
import org.apache.wicket.Session;
import org.apache.wicket.WicketTestCase;
-import org.apache.wicket.markup.MarkupException;
import org.apache.wicket.protocol.http.HttpSessionStore;
import org.apache.wicket.protocol.http.WebApplication;
import org.apache.wicket.protocol.http.WebResponse;
@@ -53,23 +52,6 @@
*
* @throws Exception
*/
- public void test_1() throws Exception
- {
- try
- {
- executeTest(ConcretePage.class, "ExpectedResult.html");
- fail("Expected an exception: <wicket:head> are not allowed after <body> tags");
- }
- catch (MarkupException ex)
- {
- // Ignore
- }
- }
-
- /**
- *
- * @throws Exception
- */
public void test_2() throws Exception
{
executeTest(ConcretePage2.class, "ExpectedResult2.html");
@@ -84,35 +66,37 @@
tester = new WicketTester(new WebApplication()
{
/**
- * @see org.apache.wicket.protocol.http.WebApplication#newSession(Request, Response)
+ * @see org.apache.wicket.protocol.http.WebApplication#newSession(Request,
+ * Response)
*/
public Session newSession(Request request, Response response)
{
- return new WebSession(this, request).setStyle("myStyle");
+ return new WebSession(request).setStyle("myStyle");
}
-
+
public Class getHomePage()
{
return ConcretePage2.class;
}
-
+
protected WebResponse newWebResponse(HttpServletResponse servletResponse)
{
return new WebResponse(servletResponse);
}
-
+
protected void outputDevelopmentModeWarning()
{
// Do nothing.
}
-
+
protected ISessionStore newSessionStore()
{
- // Don't use a filestore, or we spawn lots of threads, which makes things slow.
+ // Don't use a filestore, or we spawn lots of threads, which
+ // makes things slow.
return new HttpSessionStore(this);
}
});
-
+
executeTest(ConcretePage2.class, "ExpectedResult3.html");
}
}
Modified: wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/tags/InputTagNotVisibleWebPageResult.html
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/tags/InputTagNotVisibleWebPageResult.html?view=diff&rev=564878&r1=564877&r2=564878
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/tags/InputTagNotVisibleWebPageResult.html (original)
+++ wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/tags/InputTagNotVisibleWebPageResult.html Sat Aug 11 02:12:13 2007
@@ -1,6 +1,6 @@
<html>
<body>
-<form action="?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 action="?wicket:interface=:0:form::IFormSubmitListener::" wicket:id="form" method="post" id="form1"><div style="display:none"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div>
</form>
</body>
Modified: wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/tags/InputTagVisibleWebPageResult.html
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/tags/InputTagVisibleWebPageResult.html?view=diff&rev=564878&r1=564877&r2=564878
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/tags/InputTagVisibleWebPageResult.html (original)
+++ wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/tags/InputTagVisibleWebPageResult.html Sat Aug 11 02:12:13 2007
@@ -1,6 +1,6 @@
<html>
<body>
-<form action="?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 action="?wicket:interface=:0:form::IFormSubmitListener::" wicket:id="form" method="post" id="form1"><div style="display:none"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div>
<input value="" type="text" wicket:id="input" name="input">
</form>
</body>