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 2006/11/04 14:47:08 UTC
svn commit: r471185 [2/2] - in /incubator/wicket/trunk/wicket/src:
main/java/wicket/ main/java/wicket/ajax/ main/java/wicket/markup/
main/java/wicket/markup/html/ main/java/wicket/markup/html/border/
main/java/wicket/markup/html/internal/ main/java/wic...
Modified: incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/portlet/PortletPage.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/portlet/PortletPage.java?view=diff&rev=471185&r1=471184&r2=471185
==============================================================================
--- incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/portlet/PortletPage.java (original)
+++ incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/portlet/PortletPage.java Sat Nov 4 05:47:06 2006
@@ -23,9 +23,7 @@
import wicket.Page;
import wicket.PageMap;
import wicket.PageParameters;
-import wicket.markup.ComponentTag;
-import wicket.markup.MarkupNotFoundException;
-import wicket.markup.MarkupStream;
+import wicket.markup.MarkupFragment;
import wicket.markup.html.WebPage;
import wicket.markup.html.internal.PortletHeaderContainer;
import wicket.markup.parser.filter.HtmlHeaderSectionHandler;
@@ -65,7 +63,6 @@
protected PortletPage()
{
super();
- commonInit();
}
/**
@@ -82,7 +79,6 @@
protected PortletPage(final PageMap pageMap)
{
super(pageMap);
- commonInit();
}
/**
@@ -91,7 +87,6 @@
protected PortletPage(final PageMap pageMap, final IModel<T> model)
{
super(pageMap, model);
- commonInit();
}
/**
@@ -193,45 +188,28 @@
{
}
- /*
+ /**
* Called when the window state is changed.
*
- * @param portletMode
+ * @param windowState
*/
protected void onSetWindowState(WindowState windowState)
{
}
-
+
/**
- * Common code executed by constructors.
+ * @see wicket.MarkupContainer#onAssociatedMarkupLoaded(wicket.markup.MarkupFragment)
*/
- private void commonInit()
+ @Override
+ protected void onAssociatedMarkupLoaded(MarkupFragment markup)
{
- MarkupStream markupStream = new MarkupStream(getAssociatedMarkup(false));
- if (markupStream == null)
+ if (get(HtmlHeaderSectionHandler.HEADER_ID) == null)
{
- throw new MarkupNotFoundException(
- "Each Page must have associated markup. Unable to find the markup file for Page: "
- + this.toString());
+ // HtmlHeaderSectionHandler guarantees that a <head> tag exists
+ new PortletHeaderContainer(this, HtmlHeaderSectionHandler.HEADER_ID);
}
- // The <head> container. It can be accessed, replaced
- // and attribute modifiers can be attached.
- markupStream.setCurrentIndex(0);
- while (markupStream.hasMoreComponentTags())
- {
- final ComponentTag tag = markupStream.getTag();
- if (tag.isOpen() && tag.isHeadTag())
- {
- // Add a default container if the tag has the default
- // name. If the tag has a wicket:id, than the user
- // must create the component.
- if (HtmlHeaderSectionHandler.HEADER_ID.equals(tag.getId()))
- {
- new PortletHeaderContainer(this, tag.getId());
- }
- break;
- }
- }
+ // default
+ super.onAssociatedMarkupLoaded(markup);
}
}
Modified: incubator/wicket/trunk/wicket/src/main/java/wicket/response/StringResponse.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/main/java/wicket/response/StringResponse.java?view=diff&rev=471185&r1=471184&r2=471185
==============================================================================
--- incubator/wicket/trunk/wicket/src/main/java/wicket/response/StringResponse.java (original)
+++ incubator/wicket/trunk/wicket/src/main/java/wicket/response/StringResponse.java Sat Nov 4 05:47:06 2006
@@ -37,10 +37,20 @@
/**
* Constructor
+ *
+ * @param initialSize The initial size of the string buffer
+ */
+ public StringResponse(final int initialSize)
+ {
+ this.out = new AppendingStringBuffer(initialSize);
+ }
+
+ /**
+ * Constructor
*/
public StringResponse()
{
- this.out = new AppendingStringBuffer(128);
+ this(500);
}
/**
Modified: incubator/wicket/trunk/wicket/src/main/java/wicket/settings/IMarkupSettings.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/main/java/wicket/settings/IMarkupSettings.java?view=diff&rev=471185&r1=471184&r2=471185
==============================================================================
--- incubator/wicket/trunk/wicket/src/main/java/wicket/settings/IMarkupSettings.java (original)
+++ incubator/wicket/trunk/wicket/src/main/java/wicket/settings/IMarkupSettings.java Sat Nov 4 05:47:06 2006
@@ -18,8 +18,11 @@
*/
package wicket.settings;
+import java.util.List;
+
import wicket.markup.IMarkupParserFactory;
import wicket.markup.MarkupParserFactory;
+import wicket.markup.parser.onLoadListener.IMarkupLoadListener;
/**
* Interface for markup related settings.
@@ -177,4 +180,21 @@
* if true, xml declaration will be stripped from output
*/
void setStripXmlDeclarationFromOutput(final boolean strip);
+
+ /**
+ * Register a markup load listener to the application.
+ * <p>
+ * This is for cross functional listeners. For component specific listeners
+ * you may subclass MarkupContainer.ononAssociatedMarkupLoaded().
+ *
+ * @param listener
+ */
+ void addMarkupLoadListener(IMarkupLoadListener listener);
+
+ /**
+ * Get the list of registered markup load listeners.
+ *
+ * @return List<IMarkupLoadListener>
+ */
+ List<IMarkupLoadListener> getMarkupLoadListeners();
}
Modified: incubator/wicket/trunk/wicket/src/main/java/wicket/settings/Settings.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/main/java/wicket/settings/Settings.java?view=diff&rev=471185&r1=471184&r2=471185
==============================================================================
--- incubator/wicket/trunk/wicket/src/main/java/wicket/settings/Settings.java (original)
+++ incubator/wicket/trunk/wicket/src/main/java/wicket/settings/Settings.java Sat Nov 4 05:47:06 2006
@@ -47,6 +47,7 @@
import wicket.markup.html.PackageResourceGuard;
import wicket.markup.html.form.persistence.CookieValuePersisterSettings;
import wicket.markup.html.pages.BrowserInfoPage;
+import wicket.markup.parser.onLoadListener.IMarkupLoadListener;
import wicket.markup.resolver.AutoComponentResolver;
import wicket.markup.resolver.IComponentResolver;
import wicket.protocol.http.WebRequest;
@@ -294,6 +295,9 @@
/** Determines if pages should be managed by a version manager by default */
private boolean versionPagesByDefault = true;
+ /** List of registered markup load listeners */
+ private final List<IMarkupLoadListener> markupLoadListeners = new ArrayList<IMarkupLoadListener>();
+
/**
* Create the application settings, carrying out any necessary
* initialisations.
@@ -1274,5 +1278,21 @@
throw new IllegalArgumentException("argument " + pageClass
+ " must be a subclass of Page");
}
+ }
+
+ /**
+ * @see wicket.settings.IMarkupSettings#addMarkupLoadListener(wicket.markup.parser.onLoadListener.IMarkupLoadListener)
+ */
+ public void addMarkupLoadListener(final IMarkupLoadListener listener)
+ {
+ this.markupLoadListeners.add(listener);
+ }
+
+ /**
+ * @see wicket.settings.IMarkupSettings#getMarkupLoadListeners()
+ */
+ public List<IMarkupLoadListener> getMarkupLoadListeners()
+ {
+ return this.markupLoadListeners;
}
}
Modified: incubator/wicket/trunk/wicket/src/test/java/wicket/ajax/AjaxRequestTargetTest.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/test/java/wicket/ajax/AjaxRequestTargetTest.java?view=diff&rev=471185&r1=471184&r2=471185
==============================================================================
--- incubator/wicket/trunk/wicket/src/test/java/wicket/ajax/AjaxRequestTargetTest.java (original)
+++ incubator/wicket/trunk/wicket/src/test/java/wicket/ajax/AjaxRequestTargetTest.java Sat Nov 4 05:47:06 2006
@@ -27,6 +27,7 @@
import wicket.MarkupContainer;
import wicket.MockPageWithLinkAndComponent;
import wicket.Page;
+import wicket.WicketRuntimeException;
import wicket.WicketTestCase;
import wicket.ajax.markup.html.AjaxLink;
import wicket.markup.html.WebComponent;
@@ -115,7 +116,7 @@
}
catch (Exception e)
{
- e.printStackTrace();
+ throw new WicketRuntimeException(e);
}
}
};
@@ -133,18 +134,18 @@
application.clickLink(MockPageWithLinkAndComponent.LINK_ID);
String document = application.getServletResponse().getDocument();
-
+ assertTrue("Error while execution ajax request", Pattern.compile("</ajax-response>").matcher(document).find());
+
Pattern pat = Pattern.compile(".*<header-contribution>(.*?)</header-contribution>.*",
Pattern.DOTALL);
Matcher mat = pat.matcher(document);
String headerContribution = null;
-
if (mat.matches())
{
headerContribution = mat.group(1);
}
-
+
// If the filename is empty we use it to say that the headerContribution
// should be empty.
// This means that it doesn't exist at all
@@ -155,6 +156,7 @@
}
else
{
+ assertNotNull("Probably an exception happened", headerContribution);
assertTrue(DiffUtil.validatePage(headerContribution, this.getClass(), expectedFile));
}
}
Modified: incubator/wicket/trunk/wicket/src/test/java/wicket/markup/MarkupInheritanceExpectedResult_10.html
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/test/java/wicket/markup/MarkupInheritanceExpectedResult_10.html?view=diff&rev=471185&r1=471184&r2=471185
==============================================================================
--- incubator/wicket/trunk/wicket/src/test/java/wicket/markup/MarkupInheritanceExpectedResult_10.html (original)
+++ incubator/wicket/trunk/wicket/src/test/java/wicket/markup/MarkupInheritanceExpectedResult_10.html Sat Nov 4 05:47:06 2006
@@ -1,8 +1,8 @@
<html>
+
<head>
<link src="myStyle.css" wicket:id="css"/>
- </head>
- <body>
+ </head><body>
111<span wicket:id="label1">base label 1</span>222
<wicket:child><wicket:extend>
888<span wicket:id="label3">extension label</span>999
Modified: incubator/wicket/trunk/wicket/src/test/java/wicket/markup/MarkupInheritanceExpectedResult_11.html
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/test/java/wicket/markup/MarkupInheritanceExpectedResult_11.html?view=diff&rev=471185&r1=471184&r2=471185
==============================================================================
--- incubator/wicket/trunk/wicket/src/test/java/wicket/markup/MarkupInheritanceExpectedResult_11.html (original)
+++ incubator/wicket/trunk/wicket/src/test/java/wicket/markup/MarkupInheritanceExpectedResult_11.html Sat Nov 4 05:47:06 2006
@@ -1,8 +1,8 @@
<html>
+
<head>
<link src="myStyle.css" wicket:id="css"/>
- </head>
- <body>
+ </head><body>
111<span wicket:id="label1">base label 1</span>222
<wicket:child><wicket:extend>
555<span wicket:id="label3">base label 3</span>666
Modified: incubator/wicket/trunk/wicket/src/test/java/wicket/markup/MarkupInheritanceExpectedResult_12.html
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/test/java/wicket/markup/MarkupInheritanceExpectedResult_12.html?view=diff&rev=471185&r1=471184&r2=471185
==============================================================================
--- incubator/wicket/trunk/wicket/src/test/java/wicket/markup/MarkupInheritanceExpectedResult_12.html (original)
+++ incubator/wicket/trunk/wicket/src/test/java/wicket/markup/MarkupInheritanceExpectedResult_12.html Sat Nov 4 05:47:06 2006
@@ -1,10 +1,10 @@
<html>
+
<head>
base head
extension header
-</head>
- <body onload="baseOnLoad();extOnLoad();">
+</head><body onload="baseOnLoad();extOnLoad();">
111<span wicket:id="label1">0</span>222
<wicket:child><wicket:extend>
888<span wicket:id="label3">extension label</span>999
Modified: incubator/wicket/trunk/wicket/src/test/java/wicket/markup/html/debug/WicketComponentTreeTestPage_ExpectedResult.html
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/test/java/wicket/markup/html/debug/WicketComponentTreeTestPage_ExpectedResult.html?view=diff&rev=471185&r1=471184&r2=471185
==============================================================================
--- incubator/wicket/trunk/wicket/src/test/java/wicket/markup/html/debug/WicketComponentTreeTestPage_ExpectedResult.html (original)
+++ incubator/wicket/trunk/wicket/src/test/java/wicket/markup/html/debug/WicketComponentTreeTestPage_ExpectedResult.html Sat Nov 4 05:47:06 2006
@@ -39,8 +39,8 @@
<td valign="top" align="left"><span wicket:id="model"></span> </td>
</tr><tr wicket:id="components">
<td valign="top" align="left"><span wicket:id="row">2</span> </td>
- <td valign="top" align="left"><span wicket:id="path"><auto>-<header></span> </td>
- <td valign="top" align="left" nowrap><span wicket:id="size">607 bytes</span> </td>
+ <td valign="top" align="left"><span wicket:id="path"><auto>-header</span> </td>
+ <td valign="top" align="left" nowrap><span wicket:id="size">557 bytes</span> </td>
<td valign="top" align="left"><span wicket:id="type">wicket.markup.html.internal.HtmlHeaderContainer</span> </td>
<td valign="top" align="left"><span wicket:id="model"></span> </td>
</tr><tr wicket:id="components">
Modified: incubator/wicket/trunk/wicket/src/test/java/wicket/markup/html/header/testing4/Panel1.html
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/test/java/wicket/markup/html/header/testing4/Panel1.html?view=diff&rev=471185&r1=471184&r2=471185
==============================================================================
--- incubator/wicket/trunk/wicket/src/test/java/wicket/markup/html/header/testing4/Panel1.html (original)
+++ incubator/wicket/trunk/wicket/src/test/java/wicket/markup/html/header/testing4/Panel1.html Sat Nov 4 05:47:06 2006
@@ -2,5 +2,5 @@
<script wicket:id="testid" />
</wicket:head>
<wicket:panel>
-Test panel 2
+Test panel 1
</wicket:panel>
Modified: incubator/wicket/trunk/wicket/src/test/java/wicket/markup/html/header/testing4/TestPage_ExpectedResult-1.html
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/test/java/wicket/markup/html/header/testing4/TestPage_ExpectedResult-1.html?view=diff&rev=471185&r1=471184&r2=471185
==============================================================================
--- incubator/wicket/trunk/wicket/src/test/java/wicket/markup/html/header/testing4/TestPage_ExpectedResult-1.html (original)
+++ incubator/wicket/trunk/wicket/src/test/java/wicket/markup/html/header/testing4/TestPage_ExpectedResult-1.html Sat Nov 4 05:47:06 2006
@@ -9,7 +9,7 @@
</head>
<body>
<span wicket:id="panel1"><wicket:panel>
-Test panel 2
+Test panel 1
</wicket:panel></span>
<span wicket:id="panel2"><wicket:panel>
Test panel 2
Modified: incubator/wicket/trunk/wicket/src/test/java/wicket/markup/parser/filter/HeaderSectionMyLabel.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/test/java/wicket/markup/parser/filter/HeaderSectionMyLabel.java?view=diff&rev=471185&r1=471184&r2=471185
==============================================================================
--- incubator/wicket/trunk/wicket/src/test/java/wicket/markup/parser/filter/HeaderSectionMyLabel.java (original)
+++ incubator/wicket/trunk/wicket/src/test/java/wicket/markup/parser/filter/HeaderSectionMyLabel.java Sat Nov 4 05:47:06 2006
@@ -22,7 +22,6 @@
import wicket.markup.ComponentTag;
import wicket.markup.MarkupStream;
import wicket.markup.html.WebMarkupContainerWithAssociatedMarkup;
-import wicket.markup.html.internal.HeaderContainer;
import wicket.model.Model;
@@ -45,19 +44,6 @@
public HeaderSectionMyLabel(MarkupContainer parent, final String id, final String label)
{
super(parent, id, new Model<String>(label));
- }
-
- /**
- * This label renders its markup the normal way, and is still able to take
- * and render the header tag from an associated markup file.
- *
- * @see wicket.Component#renderHead(wicket.markup.html.internal.HeaderContainer)
- */
- @Override
- public void renderHead(HeaderContainer container)
- {
- this.renderHeadFromAssociatedMarkupFile(container);
- super.renderHead(container);
}
/**
Modified: incubator/wicket/trunk/wicket/src/test/java/wicket/markup/parser/filter/HeaderSectionMyLabel2.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/test/java/wicket/markup/parser/filter/HeaderSectionMyLabel2.java?view=diff&rev=471185&r1=471184&r2=471185
==============================================================================
--- incubator/wicket/trunk/wicket/src/test/java/wicket/markup/parser/filter/HeaderSectionMyLabel2.java (original)
+++ incubator/wicket/trunk/wicket/src/test/java/wicket/markup/parser/filter/HeaderSectionMyLabel2.java Sat Nov 4 05:47:06 2006
@@ -19,8 +19,8 @@
package wicket.markup.parser.filter;
import wicket.MarkupContainer;
+import wicket.markup.html.IHeaderResponse;
import wicket.markup.html.basic.Label;
-import wicket.markup.html.internal.HeaderContainer;
import wicket.model.Model;
@@ -49,8 +49,8 @@
* @param container
*/
@Override
- public void renderHead(HeaderContainer container)
+ public void renderHead(IHeaderResponse response)
{
- this.getResponse().write("text added by contributor");
+ response.getResponse().write("text added by contributor");
}
}
Modified: incubator/wicket/trunk/wicket/src/test/java/wicket/markup/parser/filter/HeaderSectionPageExpectedResult_14.html
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/test/java/wicket/markup/parser/filter/HeaderSectionPageExpectedResult_14.html?view=diff&rev=471185&r1=471184&r2=471185
==============================================================================
--- incubator/wicket/trunk/wicket/src/test/java/wicket/markup/parser/filter/HeaderSectionPageExpectedResult_14.html (original)
+++ incubator/wicket/trunk/wicket/src/test/java/wicket/markup/parser/filter/HeaderSectionPageExpectedResult_14.html Sat Nov 4 05:47:06 2006
@@ -1,11 +1,11 @@
<html xmlns:wicket>
+
<head>
<link href="/WicketTester/feedback.css" type="text/css" rel="stylesheet"/>
<meta http-equiv="content-type" content="text/html;charset=UTF-8"></meta>
<link href="/WicketTester/style.css" type="text/css" rel="stylesheet"></link>
-</head>
-<body>
+</head><body>
<h3> Do a view source on this page and you should see a double <head></h3>
<div wicket:id="border"><wicket:border>
<div class="main">
Modified: incubator/wicket/trunk/wicket/src/test/java/wicket/markup/parser/filter/HeaderSectionPageExpectedResult_9.html
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/test/java/wicket/markup/parser/filter/HeaderSectionPageExpectedResult_9.html?view=diff&rev=471185&r1=471184&r2=471185
==============================================================================
--- incubator/wicket/trunk/wicket/src/test/java/wicket/markup/parser/filter/HeaderSectionPageExpectedResult_9.html (original)
+++ incubator/wicket/trunk/wicket/src/test/java/wicket/markup/parser/filter/HeaderSectionPageExpectedResult_9.html Sat Nov 4 05:47:06 2006
@@ -13,14 +13,14 @@
limitations under the License.
-->
<html xmlns:wicket>
+
<head> - wicket header -
panel header
<link media="print,type" href="myStyle.css" type="css" wicket:id="cssHref"/>
<wicket:link autolink="true">
<link href="/WicketTester/WicketTester/resources/wicket.markup.parser.filter.HeaderSectionPanel_2/style.css" rel="StyleSheet" type="text/css"/>
</wicket:link>
-</head>
-<body>
+</head><body>
<span wicket:id="panel"><wicket:panel>
panel
</wicket:panel></span>
Modified: incubator/wicket/trunk/wicket/src/test/java/wicket/markup/parser/filter/HeaderSectionPageExpectedResult_9a.html
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/test/java/wicket/markup/parser/filter/HeaderSectionPageExpectedResult_9a.html?view=diff&rev=471185&r1=471184&r2=471185
==============================================================================
--- incubator/wicket/trunk/wicket/src/test/java/wicket/markup/parser/filter/HeaderSectionPageExpectedResult_9a.html (original)
+++ incubator/wicket/trunk/wicket/src/test/java/wicket/markup/parser/filter/HeaderSectionPageExpectedResult_9a.html Sat Nov 4 05:47:06 2006
@@ -13,14 +13,14 @@
limitations under the License.
-->
<html xmlns:wicket>
+
<head> - wicket header -
panel header
<wicket:link autolink="true">
<link href="/WicketTester/WicketTester/resources/wicket.markup.parser.filter.HeaderSectionPanel_2/style.css" rel="StyleSheet" type="text/css"/>
</wicket:link>
-</head>
-<body>
+</head><body>
<span wicket:id="panel"><wicket:panel>
panel
</wicket:panel></span>
Modified: incubator/wicket/trunk/wicket/src/test/java/wicket/markup/parser/filter/HeaderSectionPage_19.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/test/java/wicket/markup/parser/filter/HeaderSectionPage_19.java?view=diff&rev=471185&r1=471184&r2=471185
==============================================================================
--- incubator/wicket/trunk/wicket/src/test/java/wicket/markup/parser/filter/HeaderSectionPage_19.java (original)
+++ incubator/wicket/trunk/wicket/src/test/java/wicket/markup/parser/filter/HeaderSectionPage_19.java Sat Nov 4 05:47:06 2006
@@ -23,7 +23,6 @@
/**
* Mock page for testing.
*
- * @author Chris Turner
*/
public class HeaderSectionPage_19 extends WebPage
{
Modified: incubator/wicket/trunk/wicket/src/test/java/wicket/protocol/http/portlet/MockPortletPage.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/test/java/wicket/protocol/http/portlet/MockPortletPage.java?view=diff&rev=471185&r1=471184&r2=471185
==============================================================================
--- incubator/wicket/trunk/wicket/src/test/java/wicket/protocol/http/portlet/MockPortletPage.java (original)
+++ incubator/wicket/trunk/wicket/src/test/java/wicket/protocol/http/portlet/MockPortletPage.java Sat Nov 4 05:47:06 2006
@@ -24,25 +24,22 @@
import wicket.model.PropertyModel;
/**
- *
* Example mock portlet page.
*
* @author Janne Hietamäki (jannehietamaki)
*/
public class MockPortletPage extends PortletPage
{
-
- /**
- *
- */
private static final long serialVersionUID = 1L;
+ private int linkClickCount = 0;
/**
* Construct.
*
*/
- public MockPortletPage() {
+ public MockPortletPage()
+ {
// Action link counts link clicks
final Link actionLink = new Link(this, "actionLink")
{
@@ -55,23 +52,23 @@
}
};
new Label(actionLink, "linkClickCount", new PropertyModel(this, "linkClickCount"));
- add(HeaderContributor.forCss(MockPortletPage.class,"style.css"));
+ add(HeaderContributor.forCss(MockPortletPage.class, "style.css"));
}
/**
* @return Returns the linkClickCount.
*/
- public int getLinkClickCount() {
+ public int getLinkClickCount()
+ {
return linkClickCount;
}
/**
- * @param linkClickCount The linkClickCount to set.
+ * @param linkClickCount
+ * The linkClickCount to set.
*/
- public void setLinkClickCount(final int linkClickCount) {
+ public void setLinkClickCount(final int linkClickCount)
+ {
this.linkClickCount = linkClickCount;
}
-
- private int linkClickCount = 0;
-
}
Added: incubator/wicket/trunk/wicket/src/test/java/wicket/util/tester/apps_7/EmailPage.html
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/test/java/wicket/util/tester/apps_7/EmailPage.html?view=auto&rev=471185
==============================================================================
--- incubator/wicket/trunk/wicket/src/test/java/wicket/util/tester/apps_7/EmailPage.html (added)
+++ incubator/wicket/trunk/wicket/src/test/java/wicket/util/tester/apps_7/EmailPage.html Sat Nov 4 05:47:06 2006
@@ -0,0 +1,10 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head></head>
+<body>
+ <span wicket:id="myPanel"></span>
+ <form wicket:id="form">
+ <input wicket:id="email" type="text" />
+ </form>
+</body>
+</html>
\ No newline at end of file
Propchange: incubator/wicket/trunk/wicket/src/test/java/wicket/util/tester/apps_7/EmailPage.html
------------------------------------------------------------------------------
svn:keywords = "LastChangedDate LastChangedRevision URL"
Propchange: incubator/wicket/trunk/wicket/src/test/java/wicket/util/tester/apps_7/EmailPage.html
------------------------------------------------------------------------------
svn:mime-type = text/html
Added: incubator/wicket/trunk/wicket/src/test/java/wicket/util/tester/apps_7/EmailPage.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/test/java/wicket/util/tester/apps_7/EmailPage.java?view=auto&rev=471185
==============================================================================
--- incubator/wicket/trunk/wicket/src/test/java/wicket/util/tester/apps_7/EmailPage.java (added)
+++ incubator/wicket/trunk/wicket/src/test/java/wicket/util/tester/apps_7/EmailPage.java Sat Nov 4 05:47:06 2006
@@ -0,0 +1,77 @@
+/*
+ * $Id: org.eclipse.jdt.ui.prefs 5004 2006-03-17 20:47:08 -0800 (Fri, 17 Mar
+ * 2006) eelco12 $ $Revision$ $Date: 2006-03-17 20:47:08 -0800 (Fri, 17
+ * Mar 2006) $
+ *
+ * ==============================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package wicket.util.tester.apps_7;
+
+import java.util.Locale;
+
+import wicket.markup.html.WebPage;
+import wicket.markup.html.form.Form;
+import wicket.markup.html.form.TextField;
+import wicket.model.CompoundPropertyModel;
+
+/**
+ * @author Juergen Donnerstag
+ */
+public class EmailPage extends WebPage
+{
+ private static final long serialVersionUID = 1L;
+
+ private String email;
+
+ /**
+ * Construct
+ *
+ */
+ public EmailPage()
+ {
+ new MyPanel(this, "myPanel");
+
+ Form form = new Form<EmailPage>(this, "form", new CompoundPropertyModel<EmailPage>(this))
+ {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ protected void onSubmit()
+ {
+ getSession().setLocale(Locale.GERMAN);
+ super.onSubmit();
+ }
+ };
+
+ new TextField(form, "email");
+ }
+
+ /**
+ *
+ * @return xx
+ */
+ public String getEmail()
+ {
+ return this.email;
+ }
+
+ /**
+ *
+ * @param email
+ */
+ public void setEmail(final String email)
+ {
+ this.email = email;
+ }
+}
Propchange: incubator/wicket/trunk/wicket/src/test/java/wicket/util/tester/apps_7/EmailPage.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/wicket/trunk/wicket/src/test/java/wicket/util/tester/apps_7/EmailPage.java
------------------------------------------------------------------------------
svn:keywords = "LastChangedDate LastChangedRevision URL"
Added: incubator/wicket/trunk/wicket/src/test/java/wicket/util/tester/apps_7/ExpectedResult-1.html
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/test/java/wicket/util/tester/apps_7/ExpectedResult-1.html?view=auto&rev=471185
==============================================================================
--- incubator/wicket/trunk/wicket/src/test/java/wicket/util/tester/apps_7/ExpectedResult-1.html (added)
+++ incubator/wicket/trunk/wicket/src/test/java/wicket/util/tester/apps_7/ExpectedResult-1.html Sat Nov 4 05:47:06 2006
@@ -0,0 +1,14 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head><span wicket:id="label">my wicket header label</span></head>
+<body>
+ <span wicket:id="myPanel"><wicket:panel>
+ MyPanel
+</wicket:panel></span>
+ <form action="/WicketTester/WicketTester?wicket:interface=:0:form::IFormSubmitListener" id="form" method="post" wicket:id="form">
+<div style="display:none"><input type="hidden" name="form:hf:fs" id="form:hf:fs"/>
+<input type="hidden" name="wicketState" id="form:hf:ws"/></div>
+ <input value="" type="text" name="email" wicket:id="email"/>
+ </form>
+</body>
+</html>
\ No newline at end of file
Propchange: incubator/wicket/trunk/wicket/src/test/java/wicket/util/tester/apps_7/ExpectedResult-1.html
------------------------------------------------------------------------------
svn:keywords = "LastChangedDate LastChangedRevision URL"
Propchange: incubator/wicket/trunk/wicket/src/test/java/wicket/util/tester/apps_7/ExpectedResult-1.html
------------------------------------------------------------------------------
svn:mime-type = text/html
Added: incubator/wicket/trunk/wicket/src/test/java/wicket/util/tester/apps_7/ExpectedResult-2.html
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/test/java/wicket/util/tester/apps_7/ExpectedResult-2.html?view=auto&rev=471185
==============================================================================
--- incubator/wicket/trunk/wicket/src/test/java/wicket/util/tester/apps_7/ExpectedResult-2.html (added)
+++ incubator/wicket/trunk/wicket/src/test/java/wicket/util/tester/apps_7/ExpectedResult-2.html Sat Nov 4 05:47:06 2006
@@ -0,0 +1,14 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head><span wicket:id="label">my wicket header label</span></head>
+<body>
+ <span wicket:id="myPanel"><wicket:panel>
+ MyPanel
+</wicket:panel></span>
+ <form action="/WicketTester/WicketTester?wicket:interface=:0:form::IFormSubmitListener" id="form" method="post" wicket:id="form">
+<div style="display:none"><input type="hidden" name="form:hf:fs" id="form:hf:fs"/>
+<input type="hidden" name="wicketState" id="form:hf:ws"/></div>
+ <input value="a" type="text" name="email" wicket:id="email"/>
+ </form>
+</body>
+</html>
\ No newline at end of file
Propchange: incubator/wicket/trunk/wicket/src/test/java/wicket/util/tester/apps_7/ExpectedResult-2.html
------------------------------------------------------------------------------
svn:keywords = "LastChangedDate LastChangedRevision URL"
Propchange: incubator/wicket/trunk/wicket/src/test/java/wicket/util/tester/apps_7/ExpectedResult-2.html
------------------------------------------------------------------------------
svn:mime-type = text/html
Added: incubator/wicket/trunk/wicket/src/test/java/wicket/util/tester/apps_7/FormTesterTest.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/test/java/wicket/util/tester/apps_7/FormTesterTest.java?view=auto&rev=471185
==============================================================================
--- incubator/wicket/trunk/wicket/src/test/java/wicket/util/tester/apps_7/FormTesterTest.java (added)
+++ incubator/wicket/trunk/wicket/src/test/java/wicket/util/tester/apps_7/FormTesterTest.java Sat Nov 4 05:47:06 2006
@@ -0,0 +1,72 @@
+/*
+ * $Id: org.eclipse.jdt.ui.prefs 5004 2006-03-17 20:47:08 -0800 (Fri, 17 Mar
+ * 2006) eelco12 $ $Revision$ $Date: 2006-03-17 20:47:08 -0800 (Fri, 17
+ * Mar 2006) $
+ *
+ * ==============================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package wicket.util.tester.apps_7;
+
+import wicket.WicketTestCase;
+import wicket.util.diff.DiffUtil;
+import wicket.util.tester.FormTester;
+
+/**
+ *
+ */
+public class FormTesterTest extends WicketTestCase
+{
+ /**
+ * Construct.
+ *
+ * @param name
+ */
+ public FormTesterTest(String name)
+ {
+ super(name);
+ }
+
+ @Override
+ protected void setUp() throws Exception
+ {
+ super.setUp();
+ }
+
+ /**
+ * @throws Exception
+ */
+ public void test_1() throws Exception
+ {
+ application.setHomePage(EmailPage.class);
+ application.setupRequestAndResponse();
+ application.processRequestCycle();
+
+ String document = application.getServletResponse().getDocument();
+ assertTrue(DiffUtil.validatePage(document, this.getClass(), "ExpectedResult-1.html"));
+
+ assertEquals(EmailPage.class, application.getLastRenderedPage().getClass());
+ EmailPage page = (EmailPage)application.getLastRenderedPage();
+
+ FormTester formTester = application.newFormTester("form");
+
+ formTester.setValue("email", "a");
+ formTester.submit();
+
+ page = (EmailPage)application.getLastRenderedPage();
+ assertEquals(EmailPage.class, page.getClass());
+
+ document = application.getServletResponse().getDocument();
+ assertTrue(DiffUtil.validatePage(document, this.getClass(), "ExpectedResult-2.html"));
+ }
+}
Propchange: incubator/wicket/trunk/wicket/src/test/java/wicket/util/tester/apps_7/FormTesterTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/wicket/trunk/wicket/src/test/java/wicket/util/tester/apps_7/FormTesterTest.java
------------------------------------------------------------------------------
svn:keywords = "LastChangedDate LastChangedRevision URL"
Added: incubator/wicket/trunk/wicket/src/test/java/wicket/util/tester/apps_7/MyPanel.html
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/test/java/wicket/util/tester/apps_7/MyPanel.html?view=auto&rev=471185
==============================================================================
--- incubator/wicket/trunk/wicket/src/test/java/wicket/util/tester/apps_7/MyPanel.html (added)
+++ incubator/wicket/trunk/wicket/src/test/java/wicket/util/tester/apps_7/MyPanel.html Sat Nov 4 05:47:06 2006
@@ -0,0 +1,4 @@
+<wicket:head><span wicket:id="label">my label</span></wicket:head>
+<wicket:panel>
+ MyPanel
+</wicket:panel>
Propchange: incubator/wicket/trunk/wicket/src/test/java/wicket/util/tester/apps_7/MyPanel.html
------------------------------------------------------------------------------
svn:keywords = "LastChangedDate LastChangedRevision URL"
Propchange: incubator/wicket/trunk/wicket/src/test/java/wicket/util/tester/apps_7/MyPanel.html
------------------------------------------------------------------------------
svn:mime-type = text/html
Added: incubator/wicket/trunk/wicket/src/test/java/wicket/util/tester/apps_7/MyPanel.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/test/java/wicket/util/tester/apps_7/MyPanel.java?view=auto&rev=471185
==============================================================================
--- incubator/wicket/trunk/wicket/src/test/java/wicket/util/tester/apps_7/MyPanel.java (added)
+++ incubator/wicket/trunk/wicket/src/test/java/wicket/util/tester/apps_7/MyPanel.java Sat Nov 4 05:47:06 2006
@@ -0,0 +1,44 @@
+/*
+ * $Id: org.eclipse.jdt.ui.prefs 5004 2006-03-17 20:47:08 -0800 (Fri, 17 Mar
+ * 2006) eelco12 $ $Revision$ $Date: 2006-03-17 20:47:08 -0800 (Fri, 17
+ * Mar 2006) $
+ *
+ * ==============================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package wicket.util.tester.apps_7;
+
+import wicket.MarkupContainer;
+import wicket.markup.html.basic.Label;
+import wicket.markup.html.panel.Panel;
+
+/**
+ * @author Juergen Donnerstag
+ */
+public class MyPanel extends Panel
+{
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * Construct
+ *
+ * @param parent
+ * @param id
+ */
+ public MyPanel(final MarkupContainer parent, final String id)
+ {
+ super(parent, id);
+
+ new Label(this, "label", "my wicket header label");
+ }
+}
Propchange: incubator/wicket/trunk/wicket/src/test/java/wicket/util/tester/apps_7/MyPanel.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/wicket/trunk/wicket/src/test/java/wicket/util/tester/apps_7/MyPanel.java
------------------------------------------------------------------------------
svn:keywords = "LastChangedDate LastChangedRevision URL"