Author: mgrigorov
Date: Mon Aug 15 11:53:24 2011
New Revision: 1157789
URL: http://svn.apache.org/viewvc?rev=1157789&view=rev
Log:
Use consistently get(Session|Application) instead of (Session|Application).get()
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/Component.java
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/Page.java
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/WebPage.java
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/Component.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/Component.java?rev=1157789&r1=1157788&r2=1157789&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/Component.java
(original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/Component.java Mon
Aug 15 11:53:24 2011
@@ -677,7 +677,7 @@ public abstract class Component
setId(id);
getApplication().getComponentInstantiationListeners().onInstantiation(this);
- final IDebugSettings debugSettings =
Application.get().getDebugSettings();
+ final IDebugSettings debugSettings =
getApplication().getDebugSettings();
if (debugSettings.isLinePreciseReportingOnNewComponentEnabled())
{
setMetaData(CONSTRUCTED_AT_KEY,
@@ -1106,8 +1106,8 @@ public abstract class Component
*/
public final void debug(final Serializable message)
{
- Session.get().getFeedbackMessages().debug(this, message);
- Session.get().dirty();
+ getSession().getFeedbackMessages().debug(this, message);
+ getSession().dirty();
}
/**
@@ -1208,8 +1208,8 @@ public abstract class Component
*/
public final void error(final Serializable message)
{
- Session.get().getFeedbackMessages().error(this, message);
- Session.get().dirty();
+ getSession().getFeedbackMessages().error(this, message);
+ getSession().dirty();
}
/**
@@ -1220,8 +1220,8 @@ public abstract class Component
*/
public final void fatal(final Serializable message)
{
- Session.get().getFeedbackMessages().fatal(this, message);
- Session.get().dirty();
+ getSession().getFeedbackMessages().fatal(this, message);
+ getSession().dirty();
}
/**
@@ -1326,7 +1326,7 @@ public abstract class Component
@SuppressWarnings("deprecation")
public final FeedbackMessage getFeedbackMessage()
{
- return
Session.get().getFeedbackMessages().messageForComponent(this);
+ return
getSession().getFeedbackMessages().messageForComponent(this);
}
/**
@@ -1334,7 +1334,7 @@ public abstract class Component
*/
public final List<FeedbackMessage> getFeedbackMessages()
{
- return
Session.get().getFeedbackMessages().messagesForComponent(this);
+ return
getSession().getFeedbackMessages().messagesForComponent(this);
}
/**
@@ -1503,7 +1503,7 @@ public abstract class Component
}
final int generatedMarkupId = storedMarkupId instanceof Integer
? (Integer)storedMarkupId
- : Session.get().nextSequenceValue();
+ : getSession().nextSequenceValue();
if (storedMarkupId == null)
{
@@ -1948,7 +1948,7 @@ public abstract class Component
*/
public final boolean hasErrorMessage()
{
- return
Session.get().getFeedbackMessages().hasErrorMessageFor(this);
+ return
getSession().getFeedbackMessages().hasErrorMessageFor(this);
}
/**
@@ -1956,7 +1956,7 @@ public abstract class Component
*/
public final boolean hasFeedbackMessage()
{
- return Session.get().getFeedbackMessages().hasMessageFor(this);
+ return getSession().getFeedbackMessages().hasMessageFor(this);
}
/**
@@ -1967,8 +1967,8 @@ public abstract class Component
*/
public final void info(final Serializable message)
{
- Session.get().getFeedbackMessages().info(this, message);
- Session.get().dirty();
+ getSession().getFeedbackMessages().info(this, message);
+ getSession().dirty();
}
/**
@@ -1979,8 +1979,8 @@ public abstract class Component
*/
public final void success(final Serializable message)
{
- Session.get().getFeedbackMessages().success(this, message);
- Session.get().dirty();
+ getSession().getFeedbackMessages().success(this, message);
+ getSession().dirty();
}
/**
@@ -3399,8 +3399,8 @@ public abstract class Component
*/
public final void warn(final Serializable message)
{
- Session.get().getFeedbackMessages().warn(this, message);
- Session.get().dirty();
+ getSession().getFeedbackMessages().warn(this, message);
+ getSession().dirty();
}
/**
Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/Page.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/Page.java?rev=1157789&r1=1157788&r2=1157789&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/Page.java
(original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/Page.java Mon Aug
15 11:53:24 2011
@@ -242,7 +242,7 @@ public abstract class Page extends Marku
public final void componentRendered(final Component component)
{
// Inform the page that this component rendered
- if (Application.get().getDebugSettings().getComponentUseCheck())
+ if (getApplication().getDebugSettings().getComponentUseCheck())
{
if (renderedComponents == null)
{
@@ -633,7 +633,7 @@ public abstract class Page extends Marku
{
// If the application wants component uses checked and
// the response is not a redirect
- final IDebugSettings debugSettings =
Application.get().getDebugSettings();
+ final IDebugSettings debugSettings =
getApplication().getDebugSettings();
if (debugSettings.getComponentUseCheck())
{
final List<Component> unrenderedComponents = new
ArrayList<Component>();
@@ -774,7 +774,7 @@ public abstract class Page extends Marku
}
// Set versioning of page based on default
-
setVersioned(Application.get().getPageSettings().getVersionPagesByDefault());
+
setVersioned(getApplication().getPageSettings().getVersionPagesByDefault());
// All Pages are born dirty so they get clustered right away
dirty(true);
@@ -880,7 +880,7 @@ public abstract class Page extends Marku
checkRendering(this);
// clean up debug meta data if component check is on
- if (Application.get().getDebugSettings().getComponentUseCheck())
+ if (getApplication().getDebugSettings().getComponentUseCheck())
{
visitChildren(new IVisitor<Component, Void>()
{
@@ -895,7 +895,7 @@ public abstract class Page extends Marku
if (!isPageStateless())
{
// trigger creation of the actual session in case it
was deferred
-
Session.get().getSessionStore().getSessionId(RequestCycle.get().getRequest(),
true);
+
getSession().getSessionStore().getSessionId(RequestCycle.get().getRequest(),
true);
// Add/touch the response page in the session.
getSession().getPageManager().touchPage(this);
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/WebPage.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/WebPage.java?rev=1157789&r1=1157788&r2=1157789&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/WebPage.java
(original)
+++
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/WebPage.java
Mon Aug 15 11:53:24 2011
@@ -161,13 +161,12 @@ public class WebPage extends Page
*/
protected void configureResponse(final WebResponse response)
{
- final WebApplication application = WebApplication.get();
-
- // Users may sublcass setHeader() to set there own headers
+ // Users may subclass setHeader() to set there own headers
setHeaders(response);
// The response encoding is an application setting
- final String encoding =
application.getRequestCycleSettings().getResponseRequestEncoding();
+ final String encoding =
getApplication().getRequestCycleSettings()
+ .getResponseRequestEncoding();
final boolean validEncoding = (Strings.isEmpty(encoding) ==
false);
final String contentType;
if (validEncoding)
