Author: ivaynberg
Date: Thu Oct 30 12:32:45 2008
New Revision: 709230
URL: http://svn.apache.org/viewvc?rev=709230&view=rev
Log:
some api cleanup
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/Component.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/Session.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/PageLink.java
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/Component.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/Component.java?rev=709230&r1=709229&r2=709230&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/Component.java
(original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/Component.java Thu Oct
30 12:32:45 2008
@@ -1640,7 +1640,6 @@
* Model object to convert to string
* @return The string
*/
- @SuppressWarnings("unchecked")
public final String getDefaultModelObjectAsString(final Object
modelObject)
{
if (modelObject != null)
@@ -1711,14 +1710,6 @@
}
/**
- * @return The page factory for the session that this component is in
- */
- public final IPageFactory getPageFactory()
- {
- return getSession().getPageFactory();
- }
-
- /**
* Gets the path to this component relative to the page it is in.
*
* @return The path to this component relative to the page it is in
@@ -2185,36 +2176,6 @@
}
/**
- * Creates a new page using the component's page factory
- *
- * @param <C>
- *
- * @param c
- * The class of page to create
- * @return The new page
- */
- public final <C extends Page> Page newPage(final Class<C> c)
- {
- return getPageFactory().newPage(c);
- }
-
- /**
- * Creates a new page using the component's page factory
- *
- * @param <C>
- *
- * @param c
- * The class of page to create
- * @param parameters
- * Any parameters to pass to the constructor
- * @return The new page
- */
- public final <C extends Page> Page newPage(final Class<C> c, final
PageParameters parameters)
- {
- return getPageFactory().newPage(c, parameters);
- }
-
- /**
* THIS METHOD IS NOT PART OF THE WICKET PUBLIC API. DO NOT USE IT!
* <p>
* Prepares the component and it's children for rendering. On whole
page render this method must
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/Session.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/Session.java?rev=709230&r1=709229&r2=709230&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/Session.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/Session.java Thu Oct 30
12:32:45 2008
@@ -795,20 +795,6 @@
}
/**
- * @param page
- * The page, or null if no page context is available
- * @return The page factory for the page, or the default page factory
if page was null
- */
- public final IPageFactory getPageFactory(final Page page)
- {
- if (page != null)
- {
- return page.getPageFactory();
- }
- return getPageFactory();
- }
-
- /**
* @return A list of all PageMaps in this session.
*/
public final List<IPageMap> getPageMaps()
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/PageLink.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/PageLink.java?rev=709230&r1=709229&r2=709230&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/PageLink.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/PageLink.java
Thu Oct 30 12:32:45 2008
@@ -65,7 +65,7 @@
public Page getPage()
{
// Create page using page factory
- return
PageLink.this.getPage().getPageFactory().newPage(c);
+ return getSession().getPageFactory().newPage(c);
}
public Class<? extends Page> getPageIdentity()
