Author: ivaynberg
Date: Fri Dec 17 16:19:37 2010
New Revision: 1050441
URL: http://svn.apache.org/viewvc?rev=1050441&view=rev
Log:
making page oninitialize() final
Issue: WICKET-3218
Modified:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/WicketExamplePage.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/ComponentInitializationTest.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/ModifyCookiePage.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/resource/PageWithXmlProperties.java
Modified:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/WicketExamplePage.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/WicketExamplePage.java?rev=1050441&r1=1050440&r2=1050441&view=diff
==============================================================================
---
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/WicketExamplePage.java
(original)
+++
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/WicketExamplePage.java
Fri Dec 17 16:19:37 2010
@@ -42,6 +42,10 @@ public class WicketExamplePage extends W
public WicketExamplePage(final PageParameters pageParameters)
{
super(pageParameters);
+
+ final String packageName = getClass().getPackage().getName();
+ add(new WicketExampleHeader("mainNavigation",
Strings.afterLast(packageName, '.'), this));
+ explain();
}
@@ -56,19 +60,6 @@ public class WicketExamplePage extends W
}
/**
- * @see org.apache.wicket.Component#onInitialize()
- */
- @Override
- protected void onInitialize()
- {
- super.onInitialize();
-
- final String packageName = getClass().getPackage().getName();
- add(new WicketExampleHeader("mainNavigation",
Strings.afterLast(packageName, '.'), this));
- explain();
- }
-
- /**
* Override base method to provide an explanation
*/
protected void explain()
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/ComponentInitializationTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/ComponentInitializationTest.java?rev=1050441&r1=1050440&r2=1050441&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/ComponentInitializationTest.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/ComponentInitializationTest.java
Fri Dec 17 16:19:37 2010
@@ -24,10 +24,8 @@ import org.apache.wicket.markup.IMarkupR
import org.apache.wicket.markup.html.WebComponent;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.WebPage;
-import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.util.resource.IResourceStream;
import org.apache.wicket.util.resource.StringResourceStream;
-import org.apache.wicket.util.tester.WicketTester;
/**
* Tests {...@link Component#onInitialize()} contract
@@ -68,10 +66,6 @@ public class ComponentInitializationTest
// test initialization when readding a component with
uninitialized children
page.add(t1);
assertEquals(1, t4.getCount());
-
- // test page was initialized
- assertEquals(1, page.getCount());
-
}
public void testAtomicity()
@@ -101,18 +95,6 @@ public class ComponentInitializationTest
page.add(t1);
assertEquals(1, t1.getCount());
assertEquals(1, t2.getCount());
-
- // test page was only initialized once
- assertEquals(1, page.getCount());
- }
-
- public void testPageInitialization()
- {
- WicketTester tester = new WicketTester();
- tester.startPage(TestPage.class);
- TestPage page = (TestPage)tester.getLastRenderedPage();
-
- assertEquals(1, page.getCount());
}
public void testOnInitializeSuperVerified()
@@ -182,31 +164,14 @@ public class ComponentInitializationTest
public static class TestPage extends WebPage implements
IMarkupResourceStreamProvider
{
- private int count = 0;
-
public TestPage()
{
}
- @Override
- protected void onInitialize()
- {
- super.onInitialize();
- count++;
- add(new Label("addedComponent",
- "Testing addition of a component to show
StackOverflowError"));
- }
-
- public int getCount()
- {
- return count;
- }
-
public IResourceStream getMarkupResourceStream(MarkupContainer
container,
Class<?> containerClass)
{
- return new StringResourceStream(
- "<html><body><span
wicket:id=\"addedComponent\"></span></body></html>");
+ return new
StringResourceStream("<html><body></body></html>");
}
}
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/ModifyCookiePage.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/ModifyCookiePage.java?rev=1050441&r1=1050440&r2=1050441&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/ModifyCookiePage.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/ModifyCookiePage.java
Fri Dec 17 16:19:37 2010
@@ -16,33 +16,25 @@
*/
package org.apache.wicket.protocol.http;
+import javax.servlet.http.Cookie;
+
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.request.http.WebResponse;
-import javax.servlet.http.Cookie;
-
public class ModifyCookiePage extends WebPage
{
private static final long serialVersionUID = 3884508803470168634L;
-
+
public static final String CREATE_COOKIE_ID = "createCookie";
public static final String COOKIE_NAME = "wicketTest";
public static final String COOKIE_VALUE = "1";
- private WebResponse getWebResponse()
- {
- return (WebResponse) getResponse();
- }
-
- @Override
- protected void onInitialize()
+ public ModifyCookiePage()
{
- super.onInitialize();
-
add(new Link<Void>(CREATE_COOKIE_ID)
{
- private static final long serialVersionUID =
6762033052623200948L;
+ private static final long serialVersionUID = 1L;
@Override
public void onClick()
@@ -51,4 +43,9 @@ public class ModifyCookiePage extends We
}
});
}
+
+ private WebResponse getWebResponse()
+ {
+ return (WebResponse)getResponse();
+ }
}
\ No newline at end of file
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/resource/PageWithXmlProperties.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/resource/PageWithXmlProperties.java?rev=1050441&r1=1050440&r2=1050441&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/resource/PageWithXmlProperties.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/resource/PageWithXmlProperties.java
Fri Dec 17 16:19:37 2010
@@ -28,13 +28,6 @@ public class PageWithXmlProperties exten
/***/
public PageWithXmlProperties()
{
- }
-
- @Override
- public void onInitialize()
- {
- super.onInitialize();
-
String expected =
XmlFilePropertiesLoaderTest.EXPECTED_LOCALIZATIONS.get(getSession().getLocale());
String actual = getString("testProperty");
assertEquals(expected, actual);
