Author: ivaynberg
Date: Sat May 24 23:04:44 2008
New Revision: 659922
URL: http://svn.apache.org/viewvc?rev=659922&view=rev
Log:
WICKET-1636
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/WebPage.java
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/WebPage.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/WebPage.java?rev=659922&r1=659921&r2=659922&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/WebPage.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/WebPage.java
Sat May 24 23:04:44 2008
@@ -122,7 +122,7 @@
Session session = Session.get();
- Session.PageMapAccessMetaData meta =
(Session.PageMapAccessMetaData)session.getMetaData(Session.PAGEMAP_ACCESS_MDK);
+ Session.PageMapAccessMetaData meta =
session.getMetaData(Session.PAGEMAP_ACCESS_MDK);
if (meta == null)
{
meta = new Session.PageMapAccessMetaData();
@@ -310,10 +310,10 @@
public void onNewBrowserWindow()
{
// if the browser reports a history of 0 then make a new webpage
- WebPage< ? > clonedPage = this;
+ WebPage<?> clonedPage = this;
try
{
- clonedPage = (WebPage< ? >)Objects.cloneObject(this);
+ clonedPage = (WebPage<?>)Objects.cloneObject(this);
}
catch (Exception e)
{
@@ -397,11 +397,11 @@
protected void onAfterRender()
{
super.onAfterRender();
- if (getApplication().getConfigurationType() ==
Application.DEVELOPMENT)
+ if
(Application.DEVELOPMENT.equals(getApplication().getConfigurationType()))
{
- HtmlHeaderContainer header =
(HtmlHeaderContainer)visitChildren(new IVisitor<Component< ? >>()
+ HtmlHeaderContainer header =
(HtmlHeaderContainer)visitChildren(new IVisitor<Component<?>>()
{
- public Object component(Component< ? >
component)
+ public Object component(Component<?> component)
{
if (component instanceof
HtmlHeaderContainer)
{
@@ -431,12 +431,12 @@
// Make sure all Components interested
in contributing to the header
// and there attached behaviors are
asked.
final HtmlHeaderContainer finalHeader =
header;
- visitChildren(new IVisitor<Component< ?
>>()
+ visitChildren(new
IVisitor<Component<?>>()
{
/**
* @see
org.apache.wicket.Component.IVisitor#component(org.apache.wicket.Component)
*/
- public Object
component(Component< ? > component)
+ public Object
component(Component<?> component)
{
component.renderHead(finalHeader);
return
CONTINUE_TRAVERSAL;