Author: mgrigorov
Date: Mon Oct 3 07:47:58 2011
New Revision: 1178323
URL: http://svn.apache.org/viewvc?rev=1178323&view=rev
Log:
WICKET-4093 Deprecate ISessionSettings#getPageFactory() and delegate it to
Application#getPageFactory()
Modified:
wicket/trunk/wicket-auth-roles/src/main/java/org/apache/wicket/authroles/authentication/panel/SignInPanel.java
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/Session.java
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/settings/ISessionSettings.java
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/settings/def/SessionSettings.java
wicket/trunk/wicket-jmx/src/main/java/org/apache/wicket/jmx/SessionSettings.java
Modified:
wicket/trunk/wicket-auth-roles/src/main/java/org/apache/wicket/authroles/authentication/panel/SignInPanel.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-auth-roles/src/main/java/org/apache/wicket/authroles/authentication/panel/SignInPanel.java?rev=1178323&r1=1178322&r2=1178323&view=diff
==============================================================================
---
wicket/trunk/wicket-auth-roles/src/main/java/org/apache/wicket/authroles/authentication/panel/SignInPanel.java
(original)
+++
wicket/trunk/wicket-auth-roles/src/main/java/org/apache/wicket/authroles/authentication/panel/SignInPanel.java
Mon Oct 3 07:47:58 2011
@@ -133,9 +133,8 @@ public class SignInPanel extends Panel
if (!continueToOriginalDestination())
{
// Ups, no original
destination. Go to the home page
- throw new
RestartResponseException(getApplication().getSessionSettings()
- .getPageFactory()
-
.newPage(getApplication().getHomePage()));
+ throw new
RestartResponseException(getSession().getPageFactory().newPage(
+
getApplication().getHomePage()));
}
}
else
Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/Session.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/Session.java?rev=1178323&r1=1178322&r2=1178323&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/Session.java
(original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/Session.java Mon
Oct 3 07:47:58 2011
@@ -428,7 +428,7 @@ public abstract class Session implements
*/
public IPageFactory getPageFactory()
{
- return getApplication().getSessionSettings().getPageFactory();
+ return getApplication().getPageFactory();
}
/**
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/settings/ISessionSettings.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/settings/ISessionSettings.java?rev=1178323&r1=1178322&r2=1178323&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/settings/ISessionSettings.java
(original)
+++
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/settings/ISessionSettings.java
Mon Oct 3 07:47:58 2011
@@ -16,7 +16,9 @@
*/
package org.apache.wicket.settings;
+import org.apache.wicket.Application;
import org.apache.wicket.IPageFactory;
+import org.apache.wicket.Session;
/**
* Interface for session related settings
@@ -38,7 +40,9 @@ public interface ISessionSettings
* Gets the factory to be used when creating pages
*
* @return The default page factory
+ * @deprecated Use {@link Session#getPageFactory()}
*/
+ @Deprecated
IPageFactory getPageFactory();
/**
@@ -46,6 +50,8 @@ public interface ISessionSettings
*
* @param pageFactory
* The default factory
+ * @deprecated Use {@link Application#newPageFactory()} instead.
*/
+ @Deprecated
void setPageFactory(final IPageFactory pageFactory);
}
\ No newline at end of file
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/settings/def/SessionSettings.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/settings/def/SessionSettings.java?rev=1178323&r1=1178322&r2=1178323&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/settings/def/SessionSettings.java
(original)
+++
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/settings/def/SessionSettings.java
Mon Oct 3 07:47:58 2011
@@ -16,8 +16,9 @@
*/
package org.apache.wicket.settings.def;
+import org.apache.wicket.Application;
import org.apache.wicket.IPageFactory;
-import org.apache.wicket.session.DefaultPageFactory;
+import org.apache.wicket.Session;
import org.apache.wicket.settings.ISessionSettings;
/**
@@ -33,22 +34,29 @@ import org.apache.wicket.settings.ISessi
*/
public class SessionSettings implements ISessionSettings
{
- /** factory to create new Page objects */
- private IPageFactory pageFactory = new DefaultPageFactory();
-
/**
* @see org.apache.wicket.settings.ISessionSettings#getPageFactory()
+ * @deprecated Use {@link Session#getPageFactory()}
*/
+ @Deprecated
public IPageFactory getPageFactory()
{
+ IPageFactory pageFactory = null;
+
+ if (Application.exists())
+ {
+ pageFactory = Application.get().getPageFactory();
+ }
+
return pageFactory;
}
/**
* @see
org.apache.wicket.settings.ISessionSettings#setPageFactory(org.apache.wicket.IPageFactory)
+ * @deprecated Use {@link Application#newPageFactory()} instead.
*/
+ @Deprecated
public void setPageFactory(final IPageFactory defaultPageFactory)
{
- pageFactory = defaultPageFactory;
}
}
Modified:
wicket/trunk/wicket-jmx/src/main/java/org/apache/wicket/jmx/SessionSettings.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-jmx/src/main/java/org/apache/wicket/jmx/SessionSettings.java?rev=1178323&r1=1178322&r2=1178323&view=diff
==============================================================================
---
wicket/trunk/wicket-jmx/src/main/java/org/apache/wicket/jmx/SessionSettings.java
(original)
+++
wicket/trunk/wicket-jmx/src/main/java/org/apache/wicket/jmx/SessionSettings.java
Mon Oct 3 07:47:58 2011
@@ -40,7 +40,7 @@ public class SessionSettings implements
*/
public String getPageFactory()
{
- return
Stringz.className(application.getSessionSettings().getPageFactory());
+ return Stringz.className(application.getPageFactory());
}
/**
