Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/component/IBookmarkablePageRequestTarget.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/component/IBookmarkablePageRequestTarget.java?rev=824605&r1=824604&r2=824605&view=diff ============================================================================== --- wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/component/IBookmarkablePageRequestTarget.java (original) +++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/component/IBookmarkablePageRequestTarget.java Tue Oct 13 06:42:17 2009 @@ -18,7 +18,7 @@ import org.apache.wicket.IRequestTarget; import org.apache.wicket.Page; -import org.apache.wicket.ng.request.component.PageParameters; +import org.apache.wicket.PageParameters; import org.apache.wicket.request.target.IEventProcessor; /**
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/session/DefaultPageFactory.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/session/DefaultPageFactory.java?rev=824605&r1=824604&r2=824605&view=diff ============================================================================== --- wicket/trunk/wicket/src/main/java/org/apache/wicket/session/DefaultPageFactory.java (original) +++ wicket/trunk/wicket/src/main/java/org/apache/wicket/session/DefaultPageFactory.java Tue Oct 13 06:42:17 2009 @@ -22,11 +22,11 @@ import org.apache.wicket.AbortException; import org.apache.wicket.IPageFactory; +import org.apache.wicket.Page; +import org.apache.wicket.PageParameters; import org.apache.wicket.WicketRuntimeException; import org.apache.wicket.authorization.AuthorizationException; import org.apache.wicket.markup.MarkupException; -import org.apache.wicket.ng.request.component.PageParameters; -import org.apache.wicket.ng.request.component.RequestablePage; import org.apache.wicket.util.lang.Generics; @@ -38,21 +38,19 @@ * * @author Juergen Donnerstag * @author Jonathan Locke - * @author Matej Knopp - * @author Igor Vaynberg */ public final class DefaultPageFactory implements IPageFactory { /** Map of Constructors for Page subclasses */ - private final Map<Class<? extends RequestablePage>, Constructor<? extends RequestablePage>> constructorForClass = Generics.newConcurrentHashMap(); + private final Map<Class<? extends Page>, Constructor<? extends Page>> constructorForClass = Generics.newConcurrentHashMap(); /** * @see IPageFactory#newPage(Class) */ - public final <C extends RequestablePage> RequestablePage newPage(final Class<C> pageClass) + public final <C extends Page> Page newPage(final Class<C> pageClass) { // Try default constructor if one exists - Constructor<? extends RequestablePage> constructor = constructor(pageClass); + Constructor<? extends Page> constructor = constructor(pageClass); if (constructor != null) { // return new Page() @@ -74,8 +72,7 @@ /** * @see IPageFactory#newPage(Class, PageParameters) */ - public final <C extends RequestablePage> RequestablePage newPage(final Class<C> pageClass, - PageParameters parameters) + public final <C extends Page> Page newPage(final Class<C> pageClass, PageParameters parameters) { // If no parameters are provided, try the default constructor first, than the PageParameter // constructor with empty parameter list. @@ -85,8 +82,7 @@ } // If parameters not null, than try to get constructor that takes PageParameters - Constructor<? extends RequestablePage> constructor = constructor(pageClass, - PageParameters.class); + Constructor<? extends Page> constructor = constructor(pageClass, PageParameters.class); if (constructor != null) { // return new Page(parameters) @@ -115,8 +111,7 @@ * @return The page constructor, or null if no one-arg constructor can be found taking the given * argument type. */ - private final <C extends RequestablePage> Constructor<? extends RequestablePage> constructor( - final Class<C> pageClass) + private final <C extends Page> Constructor<? extends Page> constructor(final Class<C> pageClass) { try { @@ -143,11 +138,11 @@ * @return The page constructor, or null if no one-arg constructor can be found taking the given * argument type. */ - private final <C extends RequestablePage> Constructor<? extends RequestablePage> constructor( + private final <C extends Page> Constructor<? extends Page> constructor( final Class<C> pageClass, final Class<PageParameters> argumentType) { // Get constructor for page class from cache - Constructor<? extends RequestablePage> constructor = constructorForClass.get(pageClass); + Constructor<? extends Page> constructor = constructorForClass.get(pageClass); // Need to look up? if (constructor == null) @@ -183,33 +178,19 @@ * Thrown if the Page cannot be instantiated using the given constructor and * argument. */ - private final RequestablePage createPage( - final Constructor<? extends RequestablePage> constructor, final PageParameters argument) + private final Page createPage(final Constructor<? extends Page> constructor, + final PageParameters argument) { - final RequestablePage instance; try { if (argument != null) { - instance = constructor.newInstance(new Object[] { argument }); + return constructor.newInstance(new Object[] { argument }); } else { - instance = constructor.newInstance(); + return constructor.newInstance(); } - - // the page might have not propagate page parameters from constructor. if that's the - // case - // we force the parameters - if (argument != null && instance.getPageParameters() != argument) - { - instance.getPageParameters().assign(argument); - } - - instance.setWasCreatedBookmarkable(true); - - return instance; - } catch (InstantiationException e) { @@ -238,7 +219,7 @@ * @param argument * @return description */ - private String createDescription(Constructor<? extends RequestablePage> constructor, + private String createDescription(Constructor<? extends Page> constructor, PageParameters argument) { if (argument != null) Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/session/ISessionStore.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/session/ISessionStore.java?rev=824605&r1=824604&r2=824605&view=diff ============================================================================== --- wicket/trunk/wicket/src/main/java/org/apache/wicket/session/ISessionStore.java (original) +++ wicket/trunk/wicket/src/main/java/org/apache/wicket/session/ISessionStore.java Tue Oct 13 06:42:17 2009 @@ -16,8 +16,6 @@ */ package org.apache.wicket.session; -import java.io.Serializable; -import java.util.Collection; import java.util.List; import javax.servlet.http.HttpSession; @@ -34,7 +32,6 @@ * * @author Eelco Hillenius * @author Johan Compagner - * @author Matej Knopp */ public interface ISessionStore { @@ -47,7 +44,7 @@ * The name of the attribute to store * @return The value of the attribute */ - Serializable getAttribute(Request request, final String name); + Object getAttribute(Request request, final String name); /** * @param request @@ -86,7 +83,7 @@ * @param value * the value of the attribute */ - void setAttribute(Request request, String name, Serializable value); + void setAttribute(Request request, String name, Object value); /** * Get the session id for the provided request. If create is false and the creation of the @@ -168,33 +165,4 @@ * Called when the WebApplication is destroyed. */ void destroy(); - - /** - * Listener invoked when session is unbound. - * - * @author Matej Knopp - */ - public interface UnboundListener - { - public void sessionUnbound(String sessionId); - }; - - /** - * Registers listener invoked when session is unbound. - * - * @param listener - */ - public void registerUnboundListener(UnboundListener listener); - - /** - * Unregisters listener invoked when session is unbound. - * - * @param listener - */ - public void unregisterUnboundListener(UnboundListener listener); - - /** - * @return immutable collection of unbound listeners - */ - public Collection<UnboundListener> getUnboundListeners(); } Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java?rev=824605&r1=824604&r2=824605&view=diff ============================================================================== --- wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java (original) +++ wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java Tue Oct 13 06:42:17 2009 @@ -27,6 +27,7 @@ import org.apache.wicket.Component; import org.apache.wicket.MarkupContainer; import org.apache.wicket.Page; +import org.apache.wicket.PageParameters; import org.apache.wicket.RequestCycle; import org.apache.wicket.Session; import org.apache.wicket.WicketRuntimeException; @@ -57,7 +58,6 @@ import org.apache.wicket.markup.html.link.Link; import org.apache.wicket.markup.html.list.ListView; import org.apache.wicket.markup.html.panel.Panel; -import org.apache.wicket.ng.request.component.PageParameters; import org.apache.wicket.protocol.http.HttpSessionStore; import org.apache.wicket.protocol.http.MockHttpServletResponse; import org.apache.wicket.protocol.http.MockWebApplication; Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/PageFactoryTest.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/PageFactoryTest.java?rev=824605&r1=824604&r2=824605&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/PageFactoryTest.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/PageFactoryTest.java Tue Oct 13 06:42:17 2009 @@ -16,7 +16,6 @@ */ package org.apache.wicket; -import org.apache.wicket.ng.request.component.PageParameters; import org.apache.wicket.session.DefaultPageFactory; Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/WicketTestCase.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/WicketTestCase.java?rev=824605&r1=824604&r2=824605&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/WicketTestCase.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/WicketTestCase.java Tue Oct 13 06:42:17 2009 @@ -19,7 +19,6 @@ import junit.framework.TestCase; import org.apache.wicket.behavior.AbstractAjaxBehavior; -import org.apache.wicket.ng.request.component.PageParameters; import org.apache.wicket.util.tester.WicketTester; /** Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/HomePage2.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/HomePage2.java?rev=824605&r1=824604&r2=824605&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/HomePage2.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/HomePage2.java Tue Oct 13 06:42:17 2009 @@ -16,11 +16,11 @@ */ package org.apache.wicket.ajax; +import org.apache.wicket.PageParameters; import org.apache.wicket.ajax.markup.html.AjaxLink; import org.apache.wicket.markup.html.WebPage; import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.model.PropertyModel; -import org.apache.wicket.ng.request.component.PageParameters; /** * Homepage WICKET-2328 Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/autolink/Index.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/autolink/Index.java?rev=824605&r1=824604&r2=824605&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/autolink/Index.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/autolink/Index.java Tue Oct 13 06:42:17 2009 @@ -16,7 +16,7 @@ */ package org.apache.wicket.markup.html.autolink; -import org.apache.wicket.ng.request.component.PageParameters; +import org.apache.wicket.PageParameters; /** * Basic bookmarkable index page. Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimpleResponsePageClass.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimpleResponsePageClass.java?rev=824605&r1=824604&r2=824605&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimpleResponsePageClass.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimpleResponsePageClass.java Tue Oct 13 06:42:17 2009 @@ -16,9 +16,9 @@ */ package org.apache.wicket.markup.html.basic; +import org.apache.wicket.PageParameters; import org.apache.wicket.markup.html.WebPage; import org.apache.wicket.markup.html.form.Form; -import org.apache.wicket.ng.request.component.PageParameters; /** * @author jcompagner Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/border/HomePage.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/border/HomePage.java?rev=824605&r1=824604&r2=824605&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/border/HomePage.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/border/HomePage.java Tue Oct 13 06:42:17 2009 @@ -16,11 +16,11 @@ */ package org.apache.wicket.markup.html.form.border; +import org.apache.wicket.PageParameters; import org.apache.wicket.markup.html.WebPage; import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.markup.html.form.TextField; import org.apache.wicket.model.PropertyModel; -import org.apache.wicket.ng.request.component.PageParameters; /** * Homepage Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/imagebutton/Home.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/imagebutton/Home.java?rev=824605&r1=824604&r2=824605&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/imagebutton/Home.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/imagebutton/Home.java Tue Oct 13 06:42:17 2009 @@ -18,10 +18,10 @@ import java.util.Locale; +import org.apache.wicket.PageParameters; import org.apache.wicket.markup.html.WebPage; import org.apache.wicket.markup.html.form.ImageButton; import org.apache.wicket.markup.html.link.Link; -import org.apache.wicket.ng.request.component.PageParameters; /** Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/validation/HomePage.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/validation/HomePage.java?rev=824605&r1=824604&r2=824605&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/validation/HomePage.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/validation/HomePage.java Tue Oct 13 06:42:17 2009 @@ -16,6 +16,7 @@ */ package org.apache.wicket.markup.html.form.validation; +import org.apache.wicket.PageParameters; import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.ajax.markup.html.form.AjaxSubmitLink; import org.apache.wicket.markup.html.WebPage; @@ -25,7 +26,6 @@ import org.apache.wicket.markup.html.form.TextField; import org.apache.wicket.markup.html.panel.FeedbackPanel; import org.apache.wicket.model.PropertyModel; -import org.apache.wicket.ng.request.component.PageParameters; /** * Homepage Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/image/Home.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/image/Home.java?rev=824605&r1=824604&r2=824605&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/image/Home.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/image/Home.java Tue Oct 13 06:42:17 2009 @@ -18,9 +18,9 @@ import java.util.Locale; +import org.apache.wicket.PageParameters; import org.apache.wicket.markup.html.WebPage; import org.apache.wicket.markup.html.link.Link; -import org.apache.wicket.ng.request.component.PageParameters; /** Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePage_4.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePage_4.java?rev=824605&r1=824604&r2=824605&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePage_4.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePage_4.java Tue Oct 13 06:42:17 2009 @@ -16,10 +16,10 @@ */ package org.apache.wicket.markup.html.internal; +import org.apache.wicket.PageParameters; import org.apache.wicket.markup.html.WebMarkupContainer; import org.apache.wicket.markup.html.WebPage; import org.apache.wicket.markup.html.basic.Label; -import org.apache.wicket.ng.request.component.PageParameters; /** * Mock page for testing. Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePage_5.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePage_5.java?rev=824605&r1=824604&r2=824605&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePage_5.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePage_5.java Tue Oct 13 06:42:17 2009 @@ -16,9 +16,9 @@ */ package org.apache.wicket.markup.html.internal; +import org.apache.wicket.PageParameters; import org.apache.wicket.markup.html.WebMarkupContainer; import org.apache.wicket.markup.html.basic.Label; -import org.apache.wicket.ng.request.component.PageParameters; /** * Mock page for testing. Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/internal/EnclosureTest.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/internal/EnclosureTest.java?rev=824605&r1=824604&r2=824605&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/internal/EnclosureTest.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/internal/EnclosureTest.java Tue Oct 13 06:42:17 2009 @@ -16,8 +16,8 @@ */ package org.apache.wicket.markup.html.internal; +import org.apache.wicket.PageParameters; import org.apache.wicket.WicketTestCase; -import org.apache.wicket.ng.request.component.PageParameters; import org.apache.wicket.protocol.http.WebApplication; import org.apache.wicket.resource.DummyApplication; import org.apache.wicket.util.tester.WicketTester; Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/link/BookmarkableHomePageLinksPage.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/link/BookmarkableHomePageLinksPage.java?rev=824605&r1=824604&r2=824605&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/link/BookmarkableHomePageLinksPage.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/link/BookmarkableHomePageLinksPage.java Tue Oct 13 06:42:17 2009 @@ -19,8 +19,8 @@ import org.apache.wicket.Application; import org.apache.wicket.Page; import org.apache.wicket.PageMap; +import org.apache.wicket.PageParameters; import org.apache.wicket.markup.html.WebPage; -import org.apache.wicket.ng.request.component.PageParameters; /** * @author jcompagner Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/link/BookmarkablePageLinkTest.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/link/BookmarkablePageLinkTest.java?rev=824605&r1=824604&r2=824605&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/link/BookmarkablePageLinkTest.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/link/BookmarkablePageLinkTest.java Tue Oct 13 06:42:17 2009 @@ -16,8 +16,8 @@ */ package org.apache.wicket.markup.html.link; +import org.apache.wicket.PageParameters; import org.apache.wicket.WicketTestCase; -import org.apache.wicket.ng.request.component.PageParameters; /** * @author jcompagner Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/link/IndexedParamUrlCodingTest.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/link/IndexedParamUrlCodingTest.java?rev=824605&r1=824604&r2=824605&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/link/IndexedParamUrlCodingTest.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/link/IndexedParamUrlCodingTest.java Tue Oct 13 06:42:17 2009 @@ -17,8 +17,8 @@ package org.apache.wicket.markup.html.link; import org.apache.wicket.IRequestTarget; +import org.apache.wicket.PageParameters; import org.apache.wicket.WicketTestCase; -import org.apache.wicket.ng.request.component.PageParameters; import org.apache.wicket.protocol.http.WebRequestCycle; import org.apache.wicket.request.IRequestCodingStrategy; import org.apache.wicket.request.RequestParameters; Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/HomePage.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/HomePage.java?rev=824605&r1=824604&r2=824605&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/HomePage.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/HomePage.java Tue Oct 13 06:42:17 2009 @@ -16,10 +16,10 @@ */ package org.apache.wicket.markup.parser; +import org.apache.wicket.PageParameters; import org.apache.wicket.markup.html.WebPage; import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.markup.html.panel.FeedbackPanel; -import org.apache.wicket.ng.request.component.PageParameters; /** * Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/resolver/HomePage_1.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/resolver/HomePage_1.java?rev=824605&r1=824604&r2=824605&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/resolver/HomePage_1.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/resolver/HomePage_1.java Tue Oct 13 06:42:17 2009 @@ -16,9 +16,9 @@ */ package org.apache.wicket.markup.resolver; +import org.apache.wicket.PageParameters; import org.apache.wicket.markup.html.WebPage; import org.apache.wicket.markup.html.basic.Label; -import org.apache.wicket.ng.request.component.PageParameters; /** * Homepage Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/resolver/HomePage_2.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/resolver/HomePage_2.java?rev=824605&r1=824604&r2=824605&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/resolver/HomePage_2.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/resolver/HomePage_2.java Tue Oct 13 06:42:17 2009 @@ -16,10 +16,10 @@ */ package org.apache.wicket.markup.resolver; +import org.apache.wicket.PageParameters; import org.apache.wicket.markup.html.CSSPackageResource; import org.apache.wicket.markup.html.WebPage; import org.apache.wicket.markup.html.basic.Label; -import org.apache.wicket.ng.request.component.PageParameters; /** * Homepage Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/model/HomePage.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/model/HomePage.java?rev=824605&r1=824604&r2=824605&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/model/HomePage.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/model/HomePage.java Tue Oct 13 06:42:17 2009 @@ -18,12 +18,12 @@ import java.io.Serializable; +import org.apache.wicket.PageParameters; import org.apache.wicket.markup.html.WebPage; import org.apache.wicket.markup.html.form.Form; import org.apache.wicket.markup.html.form.TextField; import org.apache.wicket.markup.html.form.validation.FormComponentFeedbackBorder; import org.apache.wicket.markup.html.panel.FeedbackPanel; -import org.apache.wicket.ng.request.component.PageParameters; import org.apache.wicket.validation.validator.StringValidator; /** Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/MockPage.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/MockPage.java?rev=824605&r1=824604&r2=824605&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/MockPage.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/MockPage.java Tue Oct 13 06:42:17 2009 @@ -26,11 +26,11 @@ */ public class MockPage extends MockComponent implements RequestablePage { - + private static final long serialVersionUID = 1L; - + private int pageId; - + /** * Construct. * @@ -41,10 +41,9 @@ setPath(""); } - + /** * Construct. - * * @param pageId * @param pageVersion * @param pageMapName @@ -53,10 +52,9 @@ { setPageId(pageId); } - + /** * Sets the page id - * * @param pageId * @return <code>this</code> */ @@ -65,7 +63,7 @@ this.pageId = pageId; return this; } - + @Override public RequestablePage getPage() { @@ -75,22 +73,22 @@ public int getPageId() { return pageId; - } - - private final PageParameters pageParameters = new PageParameters(); + } + + private PageParameters pageParameters = new PageParameters(); public PageParameters getPageParameters() { return pageParameters; - } + } private boolean bookmarkable; - + public boolean isBookmarkable() { return bookmarkable; } - + /** * Sets the bookmarkable flags * @@ -104,7 +102,7 @@ } private boolean stateless = false; - + /** * Sets the stateless flag * @@ -116,7 +114,7 @@ this.stateless = stateless; return this; } - + public boolean isPageStateless() { return stateless; @@ -125,14 +123,14 @@ public void renderPage() { } - + private boolean createBookmarkable; public boolean wasCreatedBookmarkable() { return createBookmarkable; } - + /** * Sets the createdBookmarkable flag. * @@ -143,32 +141,23 @@ */ public MockPage setCreatedBookmarkable(boolean createdBookmarkable) { - createBookmarkable = createdBookmarkable; + this.createBookmarkable = createdBookmarkable; return this; } private int renderCount; - + public int getRenderCount() { return renderCount; } - + /** * Sets the render count - * * @param renderCount */ public void setRenderCount(int renderCount) { this.renderCount = renderCount; } - - /** - * TODO javadoc - */ - public void setWasCreatedBookmarkable(boolean b) - { - createBookmarkable = b; - } } Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/test/TestPageRender.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/test/TestPageRender.java?rev=824605&r1=824604&r2=824605&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/test/TestPageRender.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/test/TestPageRender.java Tue Oct 13 06:42:17 2009 @@ -18,7 +18,7 @@ import junit.framework.TestCase; -import org.apache.wicket.ng.Page2; +import org.apache.wicket.ng.Page; import org.apache.wicket.ng.ThreadContext; import org.apache.wicket.ng.markup.html.link.ILinkListener; import org.apache.wicket.ng.markup.html.link.Link; @@ -35,7 +35,7 @@ public class TestPageRender extends TestCase { - public static class Page1 extends Page2 + public static class Page1 extends Page { private static final long serialVersionUID = 1L; Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/WebRequestCodingStrategyTest.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/WebRequestCodingStrategyTest.java?rev=824605&r1=824604&r2=824605&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/WebRequestCodingStrategyTest.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/WebRequestCodingStrategyTest.java Tue Oct 13 06:42:17 2009 @@ -18,7 +18,7 @@ import junit.framework.TestCase; -import org.apache.wicket.ng.request.component.PageParameters; +import org.apache.wicket.PageParameters; import org.apache.wicket.protocol.http.request.WebRequestCodingStrategy; import org.apache.wicket.request.target.component.BookmarkablePageRequestTarget; import org.apache.wicket.util.tester.WicketTester; Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/request/urlcompressing/MyPage.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/request/urlcompressing/MyPage.java?rev=824605&r1=824604&r2=824605&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/request/urlcompressing/MyPage.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/request/urlcompressing/MyPage.java Tue Oct 13 06:42:17 2009 @@ -16,8 +16,8 @@ */ package org.apache.wicket.protocol.http.request.urlcompressing; +import org.apache.wicket.PageParameters; import org.apache.wicket.markup.html.WebPage; -import org.apache.wicket.ng.request.component.PageParameters; /** * @author Juergen Donnerstag Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/request/urlcompressing/UrlCompressingWebRequestProcessorTest.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/request/urlcompressing/UrlCompressingWebRequestProcessorTest.java?rev=824605&r1=824604&r2=824605&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/request/urlcompressing/UrlCompressingWebRequestProcessorTest.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/request/urlcompressing/UrlCompressingWebRequestProcessorTest.java Tue Oct 13 06:42:17 2009 @@ -19,7 +19,7 @@ import junit.framework.TestCase; import org.apache.wicket.Page; -import org.apache.wicket.ng.request.component.PageParameters; +import org.apache.wicket.PageParameters; import org.apache.wicket.request.IRequestCycleProcessor; import org.apache.wicket.util.tester.ITestPageSource; import org.apache.wicket.util.tester.WicketTester; Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/abort/AbortExceptionPage.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/abort/AbortExceptionPage.java?rev=824605&r1=824604&r2=824605&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/abort/AbortExceptionPage.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/abort/AbortExceptionPage.java Tue Oct 13 06:42:17 2009 @@ -19,12 +19,12 @@ import java.util.Collections; import java.util.List; +import org.apache.wicket.PageParameters; import org.apache.wicket.markup.html.WebPage; import org.apache.wicket.markup.html.list.ListItem; import org.apache.wicket.markup.html.list.ListView; import org.apache.wicket.model.IModel; import org.apache.wicket.model.LoadableDetachableModel; -import org.apache.wicket.ng.request.component.PageParameters; import org.apache.wicket.protocol.http.servlet.AbortWithWebErrorCodeException; /** Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/abort/AbortExceptionTest.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/abort/AbortExceptionTest.java?rev=824605&r1=824604&r2=824605&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/abort/AbortExceptionTest.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/abort/AbortExceptionTest.java Tue Oct 13 06:42:17 2009 @@ -18,9 +18,9 @@ import junit.framework.Assert; +import org.apache.wicket.PageParameters; import org.apache.wicket.WicketRuntimeException; import org.apache.wicket.WicketTestCase; -import org.apache.wicket.ng.request.component.PageParameters; import org.apache.wicket.protocol.http.servlet.AbortWithWebErrorCodeException; /** Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/encodingtest/A.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/encodingtest/A.java?rev=824605&r1=824604&r2=824605&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/encodingtest/A.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/encodingtest/A.java Tue Oct 13 06:42:17 2009 @@ -16,9 +16,9 @@ */ package org.apache.wicket.redirect.encodingtest; +import org.apache.wicket.PageParameters; import org.apache.wicket.markup.html.WebPage; import org.apache.wicket.markup.html.basic.Label; -import org.apache.wicket.ng.request.component.PageParameters; import org.apache.wicket.protocol.http.WebApplication; /** Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/encodingtest/HomePage.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/encodingtest/HomePage.java?rev=824605&r1=824604&r2=824605&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/encodingtest/HomePage.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/encodingtest/HomePage.java Tue Oct 13 06:42:17 2009 @@ -16,8 +16,8 @@ */ package org.apache.wicket.redirect.encodingtest; +import org.apache.wicket.PageParameters; import org.apache.wicket.markup.html.WebPage; -import org.apache.wicket.ng.request.component.PageParameters; /** * Homepage Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/encodingtest/RequestEncodingTest.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/encodingtest/RequestEncodingTest.java?rev=824605&r1=824604&r2=824605&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/encodingtest/RequestEncodingTest.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/encodingtest/RequestEncodingTest.java Tue Oct 13 06:42:17 2009 @@ -16,8 +16,8 @@ */ package org.apache.wicket.redirect.encodingtest; +import org.apache.wicket.PageParameters; import org.apache.wicket.WicketTestCase; -import org.apache.wicket.ng.request.component.PageParameters; import org.apache.wicket.request.target.coding.MixedParamUrlCodingStrategy; import org.apache.wicket.util.tester.WicketTester; import org.slf4j.Logger; Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/request/target/coding/IndexParamWithStatelessIFrameTest.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/request/target/coding/IndexParamWithStatelessIFrameTest.java?rev=824605&r1=824604&r2=824605&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/request/target/coding/IndexParamWithStatelessIFrameTest.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/request/target/coding/IndexParamWithStatelessIFrameTest.java Tue Oct 13 06:42:17 2009 @@ -16,8 +16,8 @@ */ package org.apache.wicket.request.target.coding; +import org.apache.wicket.PageParameters; import org.apache.wicket.WicketTestCase; -import org.apache.wicket.ng.request.component.PageParameters; import org.apache.wicket.protocol.http.WebRequestCycle; /** Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/request/target/coding/IndexedHybridUrlCodingStrategyTest.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/request/target/coding/IndexedHybridUrlCodingStrategyTest.java?rev=824605&r1=824604&r2=824605&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/request/target/coding/IndexedHybridUrlCodingStrategyTest.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/request/target/coding/IndexedHybridUrlCodingStrategyTest.java Tue Oct 13 06:42:17 2009 @@ -20,11 +20,11 @@ import org.apache.wicket.IRedirectListener; import org.apache.wicket.IRequestTarget; +import org.apache.wicket.PageParameters; import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.ajax.markup.html.AjaxLink; import org.apache.wicket.markup.html.WebPage; import org.apache.wicket.markup.html.link.Link; -import org.apache.wicket.ng.request.component.PageParameters; import org.apache.wicket.request.target.component.listener.ListenerInterfaceRequestTarget; import org.apache.wicket.util.tester.WicketTester; Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/request/target/coding/IndexedSharedResourceCodingStrategyTest.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/request/target/coding/IndexedSharedResourceCodingStrategyTest.java?rev=824605&r1=824604&r2=824605&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/request/target/coding/IndexedSharedResourceCodingStrategyTest.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/request/target/coding/IndexedSharedResourceCodingStrategyTest.java Tue Oct 13 06:42:17 2009 @@ -18,10 +18,10 @@ import java.io.OutputStream; +import org.apache.wicket.PageParameters; import org.apache.wicket.Resource; import org.apache.wicket.ResourceReference; import org.apache.wicket.WicketTestCase; -import org.apache.wicket.ng.request.component.PageParameters; import org.apache.wicket.protocol.http.WebRequestCycle; import org.apache.wicket.util.resource.AbstractResourceStreamWriter; import org.apache.wicket.util.resource.IResourceStream; @@ -91,8 +91,7 @@ params.add("1", "param1"); params.put("test", new String[] { "testval1", "testval2" }); params.add("foo", "fooval"); - final String url = cycle.urlFor(new ResourceReference(RESOURCE_NAME), params.toValueMap()) - .toString(); + final String url = cycle.urlFor(new ResourceReference(RESOURCE_NAME), params).toString(); assertEquals("test/param0/param1?test=testval1&test=testval2&foo=fooval", url); tester.getServletRequest().setURL(URL_PREFIX + url); tester.processRequestCycle(cycle); Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/request/target/coding/QueryStringUrlCodingStrategyTest.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/request/target/coding/QueryStringUrlCodingStrategyTest.java?rev=824605&r1=824604&r2=824605&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/request/target/coding/QueryStringUrlCodingStrategyTest.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/request/target/coding/QueryStringUrlCodingStrategyTest.java Tue Oct 13 06:42:17 2009 @@ -17,8 +17,8 @@ package org.apache.wicket.request.target.coding; import org.apache.wicket.IRequestTarget; +import org.apache.wicket.PageParameters; import org.apache.wicket.WicketTestCase; -import org.apache.wicket.ng.request.component.PageParameters; import org.apache.wicket.request.target.component.BookmarkablePageRequestTarget; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/request/target/coding/TestPageWithIFrame.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/request/target/coding/TestPageWithIFrame.java?rev=824605&r1=824604&r2=824605&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/request/target/coding/TestPageWithIFrame.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/request/target/coding/TestPageWithIFrame.java Tue Oct 13 06:42:17 2009 @@ -17,10 +17,10 @@ package org.apache.wicket.request.target.coding; import org.apache.wicket.IResourceListener; +import org.apache.wicket.PageParameters; import org.apache.wicket.markup.ComponentTag; import org.apache.wicket.markup.html.WebMarkupContainer; import org.apache.wicket.markup.html.WebPage; -import org.apache.wicket.ng.request.component.PageParameters; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/session/DefaultPageFactoryTest.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/session/DefaultPageFactoryTest.java?rev=824605&r1=824604&r2=824605&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/session/DefaultPageFactoryTest.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/session/DefaultPageFactoryTest.java Tue Oct 13 06:42:17 2009 @@ -19,9 +19,9 @@ import org.apache.wicket.AbstractRestartResponseException; import org.apache.wicket.IPageFactory; import org.apache.wicket.Page; +import org.apache.wicket.PageParameters; import org.apache.wicket.WicketRuntimeException; import org.apache.wicket.WicketTestCase; -import org.apache.wicket.ng.request.component.PageParameters; /** Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams.java?rev=824605&r1=824604&r2=824605&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams.java Tue Oct 13 06:42:17 2009 @@ -16,10 +16,10 @@ */ package org.apache.wicket.stateless; +import org.apache.wicket.PageParameters; import org.apache.wicket.WicketRuntimeException; import org.apache.wicket.markup.html.WebPage; import org.apache.wicket.markup.html.link.StatelessLink; -import org.apache.wicket.ng.request.component.PageParameters; /** * @author jcompagner Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/StatelessComponentTest.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/StatelessComponentTest.java?rev=824605&r1=824604&r2=824605&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/StatelessComponentTest.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/StatelessComponentTest.java Tue Oct 13 06:42:17 2009 @@ -16,8 +16,8 @@ */ package org.apache.wicket.stateless; +import org.apache.wicket.PageParameters; import org.apache.wicket.WicketTestCase; -import org.apache.wicket.ng.request.component.PageParameters; import org.apache.wicket.request.target.coding.IndexedParamUrlCodingStrategy; /** Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/util/parse/metapattern/parsers/Page2.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/util/parse/metapattern/parsers/Page2.java?rev=824605&r1=824604&r2=824605&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/util/parse/metapattern/parsers/Page2.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/util/parse/metapattern/parsers/Page2.java Tue Oct 13 06:42:17 2009 @@ -16,8 +16,8 @@ */ package org.apache.wicket.util.parse.metapattern.parsers; +import org.apache.wicket.PageParameters; import org.apache.wicket.markup.html.WebPage; -import org.apache.wicket.ng.request.component.PageParameters; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/FormTesterTest.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/FormTesterTest.java?rev=824605&r1=824604&r2=824605&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/FormTesterTest.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/FormTesterTest.java Tue Oct 13 06:42:17 2009 @@ -18,10 +18,10 @@ import java.util.Locale; +import org.apache.wicket.PageParameters; import org.apache.wicket.Session; import org.apache.wicket.WicketTestCase; import org.apache.wicket.markup.html.form.upload.FileUpload; -import org.apache.wicket.ng.request.component.PageParameters; import org.apache.wicket.util.file.File; import org.apache.wicket.util.tester.MockFormFileUploadPage.MockDomainObjectFileUpload; import org.apache.wicket.util.tester.MockFormPage.MockDomainObject; Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/MockFormFileUploadPage.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/MockFormFileUploadPage.java?rev=824605&r1=824604&r2=824605&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/MockFormFileUploadPage.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/MockFormFileUploadPage.java Tue Oct 13 06:42:17 2009 @@ -18,6 +18,7 @@ import java.io.Serializable; +import org.apache.wicket.PageParameters; import org.apache.wicket.markup.html.WebPage; import org.apache.wicket.markup.html.form.Form; import org.apache.wicket.markup.html.form.TextField; @@ -25,7 +26,6 @@ import org.apache.wicket.markup.html.form.upload.FileUploadField; import org.apache.wicket.model.CompoundPropertyModel; import org.apache.wicket.model.Model; -import org.apache.wicket.ng.request.component.PageParameters; import org.apache.wicket.util.lang.Bytes; /** Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/MockPageParameterPage.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/MockPageParameterPage.java?rev=824605&r1=824604&r2=824605&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/MockPageParameterPage.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/MockPageParameterPage.java Tue Oct 13 06:42:17 2009 @@ -16,10 +16,10 @@ */ package org.apache.wicket.util.tester; +import org.apache.wicket.PageParameters; import org.apache.wicket.markup.html.WebPage; import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.markup.html.link.BookmarkablePageLink; -import org.apache.wicket.ng.request.component.PageParameters; /** * Mock page for testing PageParameters handling in WicketTester.
