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/11/16 22:49:15 UTC
svn commit: r1202896 - in /wicket/trunk/wicket-core: .settings/
src/main/java/org/apache/wicket/request/handler/
Author: ivaynberg
Date: Wed Nov 16 21:49:15 2011
New Revision: 1202896
URL: http://svn.apache.org/viewvc?rev=1202896&view=rev
Log:
more deprecation cleanup
Removed:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/handler/IIntrospectablePageProvider.java
Modified:
wicket/trunk/wicket-core/.settings/org.eclipse.jdt.core.prefs
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/handler/IPageAndComponentProvider.java
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/handler/IPageProvider.java
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/handler/ListenerInterfaceRequestHandler.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/handler/RenderPageRequestHandler.java
Modified: wicket/trunk/wicket-core/.settings/org.eclipse.jdt.core.prefs
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/.settings/org.eclipse.jdt.core.prefs?rev=1202896&r1=1202895&r2=1202896&view=diff
==============================================================================
--- wicket/trunk/wicket-core/.settings/org.eclipse.jdt.core.prefs (original)
+++ wicket/trunk/wicket-core/.settings/org.eclipse.jdt.core.prefs Wed Nov 16 21:49:15 2011
@@ -1,4 +1,4 @@
-#Fri Nov 05 09:41:17 PDT 2010
+#Wed Nov 16 13:48:25 PST 2011
eclipse.preferences.version=1
encoding//src/main/java=UTF-8
encoding//src/main/resources=UTF-8
@@ -12,9 +12,9 @@ org.eclipse.jdt.core.circularClasspath=e
org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.compliance=1.6
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -91,7 +91,7 @@ org.eclipse.jdt.core.compiler.problem.un
org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=ignore
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.6
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/handler/IPageAndComponentProvider.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/handler/IPageAndComponentProvider.java?rev=1202896&r1=1202895&r2=1202896&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/handler/IPageAndComponentProvider.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/handler/IPageAndComponentProvider.java Wed Nov 16 21:49:15 2011
@@ -24,7 +24,7 @@ import org.apache.wicket.request.compone
*
* @author Matej Knopp
*/
-public interface IPageAndComponentProvider extends IPageProvider, IIntrospectablePageProvider
+public interface IPageAndComponentProvider extends IPageProvider
{
/**
* Returns component on specified page with given path.
Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/handler/IPageProvider.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/handler/IPageProvider.java?rev=1202896&r1=1202895&r2=1202896&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/handler/IPageProvider.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/handler/IPageProvider.java Wed Nov 16 21:49:15 2011
@@ -16,7 +16,6 @@
*/
package org.apache.wicket.request.handler;
-import org.apache.wicket.protocol.http.PageExpiredException;
import org.apache.wicket.request.component.IRequestablePage;
import org.apache.wicket.request.mapper.StalePageException;
import org.apache.wicket.request.mapper.parameter.PageParameters;
@@ -40,7 +39,7 @@ public interface IPageProvider
* if render count has been specified in constructor and the render count of page
* does not match the value
* @throws {@link PageExpiredException} if the specified page could not have been found and the
- * constructor used did not provide enough information to create new page instance
+ * constructor used did not provide enough information to create new page instance
*/
IRequestablePage getPageInstance();
@@ -93,8 +92,7 @@ public interface IPageProvider
*
* @return {@code true} iff page instance has been created or retrieved
*/
- // TODO wicket.next add this method to the interface
- // public final boolean hasPageInstance();
+ public boolean hasPageInstance();
/**
* Returns whether or not the page instance held by this provider has been instantiated by the
@@ -106,7 +104,6 @@ public interface IPageProvider
* @return {@code true} iff the page instance held by this provider was instantiated by the
* provider
*/
- // TODO wicket.next add this method to the interface
- // public final boolean isPageInstanceFresh();
+ public boolean isPageInstanceFresh();
}
\ No newline at end of file
Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/handler/ListenerInterfaceRequestHandler.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/handler/ListenerInterfaceRequestHandler.java?rev=1202896&r1=1202895&r2=1202896&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/handler/ListenerInterfaceRequestHandler.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/handler/ListenerInterfaceRequestHandler.java Wed Nov 16 21:49:15 2011
@@ -264,16 +264,7 @@ public class ListenerInterfaceRequestHan
public final boolean isPageInstanceCreated()
{
- // FIXME wicket.next remove the workaround for page providers that don't implement the
- // interface
- if (!(pageComponentProvider instanceof IIntrospectablePageProvider))
- {
- LOG.warn(
- "{} used by this application does not implement {}, the request handler is falling back on using incorrect behavior",
- IPageProvider.class, IIntrospectablePageProvider.class);
- return !pageComponentProvider.isNewPageInstance();
- }
- return ((IIntrospectablePageProvider)pageComponentProvider).hasPageInstance();
+ return pageComponentProvider.hasPageInstance();
}
public final String getComponentPath()
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=1202896&r1=1202895&r2=1202896&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 Wed Nov 16 21:49:15 2011
@@ -45,7 +45,7 @@ import org.apache.wicket.util.lang.Args;
*
* @author Matej Knopp
*/
-public class PageProvider implements IPageProvider, IIntrospectablePageProvider
+public class PageProvider implements IPageProvider
{
private final Integer renderCount;
@@ -372,6 +372,7 @@ public class PageProvider implements IPa
*
* @return {@code true} iff page instance has been created or retrieved
*/
+ @Override
public final boolean hasPageInstance()
{
if (pageInstance == null && pageId != null)
@@ -392,6 +393,7 @@ public class PageProvider implements IPa
* @return {@code true} iff the page instance held by this provider was instantiated by the
* provider
*/
+ @Override
public final boolean isPageInstanceFresh()
{
if (!hasPageInstance())
Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/handler/RenderPageRequestHandler.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/handler/RenderPageRequestHandler.java?rev=1202896&r1=1202895&r2=1202896&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/handler/RenderPageRequestHandler.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/handler/RenderPageRequestHandler.java Wed Nov 16 21:49:15 2011
@@ -169,16 +169,7 @@ public class RenderPageRequestHandler
public final boolean isPageInstanceCreated()
{
- // FIXME wicket.next remove the workaround for page providers that dont implement the
- // interface
- if (!(pageProvider instanceof IIntrospectablePageProvider))
- {
- logger.warn(
- "{} used by this application does not implement {}, the request handler is falling back on using incorrect behavior",
- IPageProvider.class, IIntrospectablePageProvider.class);
- return !pageProvider.isNewPageInstance();
- }
- return ((IIntrospectablePageProvider)pageProvider).hasPageInstance();
+ return pageProvider.hasPageInstance();
}
public final Integer getRenderCount()