You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by iv...@apache.org on 2011/01/22 23:40:11 UTC
svn commit: r1062287 - in
/wicket/trunk/wicket-core/src/main/java/org/apache/wicket: Application.java
request/handler/PageProvider.java request/mapper/AbstractComponentMapper.java
Author: ivaynberg
Date: Sat Jan 22 22:40:10 2011
New Revision: 1062287
URL: http://svn.apache.org/viewvc?rev=1062287&view=rev
Log:
Issue: WICKET-3368
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/Application.java
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/handler/PageProvider.java
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/mapper/AbstractComponentMapper.java
Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/Application.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/Application.java?rev=1062287&r1=1062286&r2=1062287&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/Application.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/Application.java Sat Jan 22 22:40:10 2011
@@ -1356,7 +1356,7 @@ public abstract class Application implem
private IPageFactory pageFactory;
- private final IMapperContext encoderContext = new DefaultMapperContext();
+ private IMapperContext encoderContext;
/**
* Override to create custom {@link ResourceReferenceRegistry}.
@@ -1421,12 +1421,27 @@ public abstract class Application implem
*
* @return mapper context
*/
- public final IMapperContext getEncoderContext()
+ public final IMapperContext getMapperContext()
{
+ if (encoderContext == null)
+ {
+ encoderContext = newMapperContext();
+ }
return encoderContext;
}
/**
+ * Factory method for {@link IMapperContext} implementations. {@link DefaultMapperContext} may
+ * be a good starting point for custom implementations.
+ *
+ * @return new instance of mapper context to be used in the application
+ */
+ protected IMapperContext newMapperContext()
+ {
+ return new DefaultMapperContext();
+ }
+
+ /**
*
* @param requestCycle
* @return Session
Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/handler/PageProvider.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/handler/PageProvider.java?rev=1062287&r1=1062286&r2=1062287&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/handler/PageProvider.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/handler/PageProvider.java Sat Jan 22 22:40:10 2011
@@ -223,7 +223,7 @@ public class PageProvider implements IPa
}
if (Application.exists())
{
- return Application.get().getEncoderContext();
+ return Application.get().getMapperContext();
}
else
{
Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/mapper/AbstractComponentMapper.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/mapper/AbstractComponentMapper.java?rev=1062287&r1=1062286&r2=1062287&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/mapper/AbstractComponentMapper.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/mapper/AbstractComponentMapper.java Sat Jan 22 22:40:10 2011
@@ -43,7 +43,7 @@ public abstract class AbstractComponentM
protected IMapperContext getContext()
{
- return Application.get().getEncoderContext();
+ return Application.get().getMapperContext();
}
/**