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 2008/06/29 07:51:39 UTC
svn commit: r672603 [14/18] - in /wicket/trunk:
testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app1/
testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app2/
wicket-auth-roles/src/main/java/org/apache/w...
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=672603&r1=672602&r2=672603&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 Sat Jun 28 22:50:41 2008
@@ -47,13 +47,13 @@
/**
* @see IPageFactory#newPage(Class)
*/
- public final <C extends Page<?>> Page<?> newPage(final Class<C> pageClass)
+ public final <C extends Page> Page newPage(final Class<C> pageClass)
{
try
{
// throw an exception in case default constructor is missing
// => improved error message
- final Constructor<? extends Page<?>> constructor = pageClass.getConstructor((Class[])null);
+ final Constructor<? extends Page> constructor = pageClass.getConstructor((Class[])null);
return newPage(constructor, null);
}
@@ -76,7 +76,7 @@
/**
* @see IPageFactory#newPage(Class, PageParameters)
*/
- public final <C extends Page<?>> Page<?> newPage(final Class<C> pageClass,
+ public final <C extends Page> Page newPage(final Class<C> pageClass,
final PageParameters parameters)
{
// Try to get constructor that takes PageParameters
@@ -105,7 +105,7 @@
* @return The page constructor, or null if no one-arg constructor can be found taking the given
* argument type.
*/
- private final <C extends Page<?>> Constructor<?> constructor(final Class<C> pageClass,
+ private final <C extends Page> Constructor<?> constructor(final Class<C> pageClass,
final Class<PageParameters> argumentType)
{
// Get constructor for page class from cache
@@ -143,14 +143,14 @@
* Thrown if the Page cannot be instantiated using the given constructor and
* argument.
*/
- private final Page<?> newPage(final Constructor<?> constructor, final Object argument)
+ private final Page newPage(final Constructor<?> constructor, final Object argument)
{
try
{
if (argument != null)
- return (Page<?>)constructor.newInstance(new Object[] { argument });
+ return (Page)constructor.newInstance(new Object[] { argument });
else
- return (Page<?>)constructor.newInstance(new Object[] {});
+ return (Page)constructor.newInstance(new Object[] {});
}
catch (InstantiationException e)
{
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=672603&r1=672602&r2=672603&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 Sat Jun 28 22:50:41 2008
@@ -155,13 +155,11 @@
IPageMap createPageMap(String name);
/**
- * @param <T>
- * the page's model object type
* @param page
* The page for which this version manager must be created
* @return A instance of a IPageVersionManager that the page will use.
*/
- <T> IPageVersionManager<T> newVersionManager(Page<T> page);
+ IPageVersionManager newVersionManager(Page page);
/**
* Called when the WebApplication is destroyed.
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/session/pagemap/AbstractPageMapEntry.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/session/pagemap/AbstractPageMapEntry.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/session/pagemap/AbstractPageMapEntry.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/session/pagemap/AbstractPageMapEntry.java Sat Jun 28 22:50:41 2008
@@ -42,7 +42,7 @@
/**
* @see org.apache.wicket.session.pagemap.IPageMapEntry#getPage()
*/
- public abstract Page<?> getPage();
+ public abstract Page getPage();
/**
* Failing to override this method could be pretty expensive because this default implementation
@@ -53,9 +53,9 @@
* @see org.apache.wicket.session.pagemap.IPageMapEntry#getPageClass()
*/
@SuppressWarnings("unchecked")
- public Class<? extends Page<?>> getPageClass()
+ public Class<? extends Page> getPageClass()
{
- return (Class<? extends Page<?>>)getPage().getClass();
+ return (Class<? extends Page>)getPage().getClass();
}
/**
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/session/pagemap/IPageMapEntry.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/session/pagemap/IPageMapEntry.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/session/pagemap/IPageMapEntry.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/session/pagemap/IPageMapEntry.java Sat Jun 28 22:50:41 2008
@@ -39,13 +39,13 @@
/**
* @return Gets the page, possibly creating it on the fly.
*/
- Page<?> getPage();
+ Page getPage();
/**
* @return The class of page stored in this page map entry (which can be used by an eviction
* strategy to prioritize evictions)
*/
- Class<? extends Page<?>> getPageClass();
+ Class<? extends Page> getPageClass();
/**
* @param id
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/session/pagemap/LeastRecentlyAccessedEvictionStrategy.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/session/pagemap/LeastRecentlyAccessedEvictionStrategy.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/session/pagemap/LeastRecentlyAccessedEvictionStrategy.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/session/pagemap/LeastRecentlyAccessedEvictionStrategy.java Sat Jun 28 22:50:41 2008
@@ -71,7 +71,7 @@
// If entry is a page (cannot be null if we're evicting)
if (oldestEntry instanceof Page)
{
- Page<?> page = (Page<?>)oldestEntry;
+ Page page = (Page)oldestEntry;
// If there is more than one version of this page
if (page.getVersions() > 1)
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/settings/IApplicationSettings.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/settings/IApplicationSettings.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/settings/IApplicationSettings.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/settings/IApplicationSettings.java Sat Jun 28 22:50:41 2008
@@ -44,7 +44,7 @@
* @return Returns the accessDeniedPage.
* @see IApplicationSettings#setAccessDeniedPage(Class)
*/
- Class<? extends Page<?>> getAccessDeniedPage();
+ Class<? extends Page> getAccessDeniedPage();
/**
* Gets the default resolver to use when finding classes and resources
@@ -67,7 +67,7 @@
* @return Returns the internalErrorPage.
* @see IApplicationSettings#setInternalErrorPage(Class)
*/
- Class<? extends Page<?>> getInternalErrorPage();
+ Class<? extends Page> getInternalErrorPage();
/**
* Gets the page expired page class.
@@ -75,7 +75,7 @@
* @return Returns the pageExpiredErrorPage.
* @see IApplicationSettings#setPageExpiredErrorPage(Class)
*/
- Class<? extends Page<?>> getPageExpiredErrorPage();
+ Class<? extends Page> getPageExpiredErrorPage();
/**
* Sets the access denied page class. The class must be bookmarkable and must extend Page.
@@ -85,7 +85,7 @@
* @param accessDeniedPage
* The accessDeniedPage to set.
*/
- <C extends Page<?>> void setAccessDeniedPage(final Class<C> accessDeniedPage);
+ <C extends Page> void setAccessDeniedPage(final Class<C> accessDeniedPage);
/**
* Sets the default class resolver to use when finding classes and resources
@@ -112,7 +112,7 @@
* @param internalErrorPage
* The internalErrorPage to set.
*/
- <C extends Page<?>> void setInternalErrorPage(final Class<C> internalErrorPage);
+ <C extends Page> void setInternalErrorPage(final Class<C> internalErrorPage);
/**
* Sets the page expired page class. The class must be bookmarkable and must extend Page.
@@ -122,5 +122,5 @@
* @param pageExpiredErrorPage
* The pageExpiredErrorPage to set.
*/
- <C extends Page<?>> void setPageExpiredErrorPage(final Class<C> pageExpiredErrorPage);
+ <C extends Page> void setPageExpiredErrorPage(final Class<C> pageExpiredErrorPage);
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/settings/Settings.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/settings/Settings.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/settings/Settings.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/settings/Settings.java Sat Jun 28 22:50:41 2008
@@ -93,7 +93,7 @@
IRequestLoggerSettings
{
/** Class of access denied page. */
- private WeakReference<Class<? extends Page<?>>> accessDeniedPage;
+ private WeakReference<Class<? extends Page>> accessDeniedPage;
/** ajax debug mode status */
private boolean ajaxDebugModeEnabled = false;
@@ -161,7 +161,7 @@
private boolean gatherExtendedBrowserInfo = false;
/** Class of internal error page. */
- private WeakReference<Class<? extends Page<?>>> internalErrorPage;
+ private WeakReference<Class<? extends Page>> internalErrorPage;
/**
* whether wicket should track line precise additions of components for error reporting.
@@ -195,7 +195,7 @@
private IPackageResourceGuard packageResourceGuard = new PackageResourceGuard();
/** The error page displayed when an expired page is accessed. */
- private WeakReference<Class<? extends Page<?>>> pageExpiredErrorPage;
+ private WeakReference<Class<? extends Page>> pageExpiredErrorPage;
/** factory to create new Page objects */
private IPageFactory pageFactory = new DefaultPageFactory();
@@ -276,7 +276,7 @@
* @param component
* The partially constructed component (only the id is guaranteed to be valid).
*/
- public void onUnauthorizedInstantiation(final Component<?> component)
+ public void onUnauthorizedInstantiation(final Component component)
{
throw new UnauthorizedInstantiationException(component.getClass());
}
@@ -399,7 +399,7 @@
/**
* @see org.apache.wicket.settings.IApplicationSettings#getAccessDeniedPage()
*/
- public Class<? extends Page<?>> getAccessDeniedPage()
+ public Class<? extends Page> getAccessDeniedPage()
{
return accessDeniedPage.get();
}
@@ -542,7 +542,7 @@
/**
* @see org.apache.wicket.settings.IApplicationSettings#getInternalErrorPage()
*/
- public Class<? extends Page<?>> getInternalErrorPage()
+ public Class<? extends Page> getInternalErrorPage()
{
return internalErrorPage.get();
}
@@ -598,7 +598,7 @@
/**
* @see org.apache.wicket.settings.IApplicationSettings#getPageExpiredErrorPage()
*/
- public Class<? extends Page<?>> getPageExpiredErrorPage()
+ public Class<? extends Page> getPageExpiredErrorPage()
{
return pageExpiredErrorPage.get();
}
@@ -822,7 +822,7 @@
/**
* @see org.apache.wicket.settings.IApplicationSettings#setAccessDeniedPage(java.lang.Class)
*/
- public <C extends Page<?>> void setAccessDeniedPage(Class<C> accessDeniedPage)
+ public <C extends Page> void setAccessDeniedPage(Class<C> accessDeniedPage)
{
if (accessDeniedPage == null)
{
@@ -830,7 +830,7 @@
}
checkPageClass(accessDeniedPage);
- this.accessDeniedPage = new WeakReference<Class<? extends Page<?>>>(accessDeniedPage);
+ this.accessDeniedPage = new WeakReference<Class<? extends Page>>(accessDeniedPage);
}
/**
@@ -973,7 +973,7 @@
/**
* @see org.apache.wicket.settings.IApplicationSettings#setInternalErrorPage(java.lang.Class)
*/
- public <C extends Page<?>> void setInternalErrorPage(final Class<C> internalErrorPage)
+ public <C extends Page> void setInternalErrorPage(final Class<C> internalErrorPage)
{
if (internalErrorPage == null)
{
@@ -981,7 +981,7 @@
}
checkPageClass(internalErrorPage);
- this.internalErrorPage = new WeakReference<Class<? extends Page<?>>>(internalErrorPage);
+ this.internalErrorPage = new WeakReference<Class<? extends Page>>(internalErrorPage);
}
/**
@@ -1020,7 +1020,7 @@
/**
* @see org.apache.wicket.settings.IApplicationSettings#setPageExpiredErrorPage(java.lang.Class)
*/
- public <C extends Page<?>> void setPageExpiredErrorPage(final Class<C> pageExpiredErrorPage)
+ public <C extends Page> void setPageExpiredErrorPage(final Class<C> pageExpiredErrorPage)
{
if (pageExpiredErrorPage == null)
{
@@ -1028,7 +1028,7 @@
}
checkPageClass(pageExpiredErrorPage);
- this.pageExpiredErrorPage = new WeakReference<Class<? extends Page<?>>>(
+ this.pageExpiredErrorPage = new WeakReference<Class<? extends Page>>(
pageExpiredErrorPage);
}
@@ -1185,7 +1185,7 @@
* @param pageClass
* the page class to check
*/
- private <C extends Page<?>> void checkPageClass(final Class<C> pageClass)
+ private <C extends Page> void checkPageClass(final Class<C> pageClass)
{
// NOTE: we can't really check on whether it is a bookmarkable page
// here, as - though the default is that a bookmarkable page must
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/util/collections/IntHashMap.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/collections/IntHashMap.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/util/collections/IntHashMap.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/util/collections/IntHashMap.java Sat Jun 28 22:50:41 2008
@@ -215,7 +215,7 @@
* contains no mapping for this key.
* @see #put(int, Object)
*/
- public Object get(int key)
+ public V get(int key)
{
int i = indexFor(key, table.length);
Entry<V> e = table[i];
@@ -223,7 +223,7 @@
{
if (e == null)
{
- return e;
+ return null;
}
if (key == e.key)
{
@@ -285,7 +285,7 @@
* mapping for key. A <tt>null</tt> return can also indicate that the HashMap
* previously associated <tt>null</tt> with the specified key.
*/
- public Object put(int key, V value)
+ public V put(int key, V value)
{
int i = indexFor(key, table.length);
@@ -456,10 +456,10 @@
* mapping for key. A <tt>null</tt> return can also indicate that the map previously
* associated <tt>null</tt> with the specified key.
*/
- public Object remove(int key)
+ public V remove(int key)
{
Entry<V> e = removeEntryForKey(key);
- return (e == null ? e : e.value);
+ return (e == null ? null : e.value);
}
/**
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/util/io/SerializableChecker.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/io/SerializableChecker.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/util/io/SerializableChecker.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/util/io/SerializableChecker.java Sat Jun 28 22:50:41 2008
@@ -659,7 +659,7 @@
result.append(" [class=").append(slot.object.getClass().getName());
if (slot.object instanceof Component)
{
- Component<?> component = (Component<?>)slot.object;
+ Component component = (Component)slot.object;
result.append(", path=").append(component.getPath());
}
result.append("]");
@@ -681,7 +681,7 @@
root = obj;
if (fieldDescription == null)
{
- fieldDescription = (root instanceof Component) ? ((Component<?>)root).getPath() : "";
+ fieldDescription = (root instanceof Component) ? ((Component)root).getPath() : "";
}
check(root);
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/util/lang/Objects.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/lang/Objects.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/util/lang/Objects.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/util/lang/Objects.java Sat Jun 28 22:50:41 2008
@@ -101,10 +101,10 @@
private static final class ReplaceObjectInputStream extends ObjectInputStream
{
private final ClassLoader classloader;
- private final HashMap<String, Component<?>> replacedComponents;
+ private final HashMap<String, Component> replacedComponents;
private ReplaceObjectInputStream(InputStream in,
- HashMap<String, Component<?>> replacedComponents, ClassLoader classloader)
+ HashMap<String, Component> replacedComponents, ClassLoader classloader)
throws IOException
{
super(in);
@@ -169,10 +169,10 @@
private static final class ReplaceObjectOutputStream extends ObjectOutputStream
{
- private final HashMap<String, Component<?>> replacedComponents;
+ private final HashMap<String, Component> replacedComponents;
private ReplaceObjectOutputStream(OutputStream out,
- HashMap<String, Component<?>> replacedComponents) throws IOException
+ HashMap<String, Component> replacedComponents) throws IOException
{
super(out);
this.replacedComponents = replacedComponents;
@@ -184,7 +184,7 @@
{
if (obj instanceof Component)
{
- final Component<?> component = (Component<?>)obj;
+ final Component component = (Component)obj;
String name = component.getPath();
replacedComponents.put(name, component);
return name;
@@ -438,7 +438,7 @@
try
{
final ByteArrayOutputStream out = new ByteArrayOutputStream(256);
- final HashMap<String, Component<?>> replacedObjects = Generics.newHashMap();
+ final HashMap<String, Component> replacedObjects = Generics.newHashMap();
ObjectOutputStream oos = new ReplaceObjectOutputStream(out, replacedObjects);
oos.writeObject(object);
ObjectInputStream ois = new ReplaceObjectInputStream(new ByteArrayInputStream(
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/util/string/Strings.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/string/Strings.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/util/string/Strings.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/util/string/Strings.java Sat Jun 28 22:50:41 2008
@@ -1138,7 +1138,7 @@
* the location where the component was created or added in the java code.
* @return a string giving the line precise location where the component was added or created.
*/
- public static String toString(final Component<?> component, final Throwable location)
+ public static String toString(final Component component, final Throwable location)
{
Class<?> componentClass = component.getClass();
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/util/template/TextTemplateLink.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/template/TextTemplateLink.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/util/template/TextTemplateLink.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/util/template/TextTemplateLink.java Sat Jun 28 22:50:41 2008
@@ -28,7 +28,7 @@
* @author Jonathan Locke
* @since 1.2.6
*/
-public class TextTemplateLink extends ResourceLink<Void>
+public class TextTemplateLink extends ResourceLink
{
private static final long serialVersionUID = 1L;
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=672603&r1=672602&r2=672603&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 Sat Jun 28 22:50:41 2008
@@ -92,7 +92,7 @@
*/
private static final class TestPageSource implements ITestPageSource
{
- private final Page<?> page;
+ private final Page page;
private static final long serialVersionUID = 1L;
@@ -101,12 +101,12 @@
*
* @param page
*/
- private TestPageSource(Page<?> page)
+ private TestPageSource(Page page)
{
this.page = page;
}
- public Page<?> getTestPage()
+ public Page getTestPage()
{
return page;
}
@@ -118,7 +118,7 @@
public static class DummyWebApplication extends WebApplication
{
@Override
- public Class<? extends Page<?>> getHomePage()
+ public Class<? extends Page> getHomePage()
{
return DummyHomePage.class;
}
@@ -155,7 +155,7 @@
* @param homePage
* a home page <code>Class</code>
*/
- public <C extends Page<?>> BaseWicketTester(final Class<C> homePage)
+ public <C extends Page> BaseWicketTester(final Class<C> homePage)
{
this(new WebApplication()
{
@@ -163,7 +163,7 @@
* @see org.apache.wicket.Application#getHomePage()
*/
@Override
- public Class<? extends Page<?>> getHomePage()
+ public Class<? extends Page> getHomePage()
{
return homePage;
}
@@ -205,8 +205,8 @@
* the absolute path on disk to the <code>WebApplication</code>'s contents (e.g.
* war root) - may be <code>null</code>
*
- * @see org.apache.wicket.protocol.http.MockWebApplication#MockWebApplication(
- * org.apache.wicket.protocol.http.WebApplication, String)
+ * @see org.apache.wicket.protocol.http.MockWebApplication#MockWebApplication(org.apache.wicket.protocol.http.WebApplication,
+ * String)
*/
public BaseWicketTester(final WebApplication application, final String path)
{
@@ -233,7 +233,7 @@
* a <code>Page</code> factory that creates a test page instance
* @return the rendered Page
*/
- public final Page<?> startPage(final ITestPageSource testPageSource)
+ public final Page startPage(final ITestPageSource testPageSource)
{
startPage(DummyHomePage.class);
DummyHomePage page = (DummyHomePage)getLastRenderedPage();
@@ -250,7 +250,7 @@
* @param component
* the listener to invoke
*/
- public void executeListener(Component<?> component)
+ public void executeListener(Component component)
{
setupRequestAndResponse();
getServletRequest().setRequestToComponent(component);
@@ -281,7 +281,7 @@
* a <code>Page</code> to render
* @return the rendered <code>Page</code>
*/
- public final Page<?> startPage(final Page<?> page)
+ public final Page startPage(final Page page)
{
return startPage(new TestPageSource(page));
}
@@ -295,7 +295,7 @@
* a test <code>Page</code> class with default constructor
* @return the rendered <code>Page</code>
*/
- public final <C extends Page<?>> Page<?> startPage(Class<C> pageClass)
+ public final <C extends Page> Page startPage(Class<C> pageClass)
{
processRequestCycle(pageClass);
return getLastRenderedPage();
@@ -312,7 +312,7 @@
* the parameters to use for the class.
* @return the rendered <code>Page</code>
*/
- public final <C extends Page<?>> Page<?> startPage(Class<C> pageClass, PageParameters parameters)
+ public final <C extends Page> Page startPage(Class<C> pageClass, PageParameters parameters)
{
processRequestCycle(pageClass, parameters);
return getLastRenderedPage();
@@ -353,7 +353,7 @@
* Renders a <code>Panel</code> defined in <code>TestPanelSource</code>. The usage is
* similar to {@link #startPage(ITestPageSource)}. Please note that testing <code>Panel</code>
* must use the supplied <code>panelId<code> as a <code>Component</code> id.
- *
+ *
* <pre>
* tester.startPanel(new TestPanelSource()
* {
@@ -364,18 +364,18 @@
* }
* });
* </pre>
- *
+ *
* @param testPanelSource
* a <code>Panel</code> factory that creates test <code>Panel</code> instances
* @return a rendered <code>Panel</code>
*/
- public final Panel<?> startPanel(final TestPanelSource testPanelSource)
+ public final Panel startPanel(final TestPanelSource testPanelSource)
{
- return (Panel<?>)startPage(new ITestPageSource()
+ return (Panel)startPage(new ITestPageSource()
{
private static final long serialVersionUID = 1L;
- public Page<?> getTestPage()
+ public Page getTestPage()
{
return new DummyPanelPage(testPanelSource);
}
@@ -391,23 +391,23 @@
* a test <code>Panel</code> class with <code>Panel(String id)</code> constructor
* @return a rendered <code>Panel</code>
*/
- public final <C extends Panel<?>> Panel<?> startPanel(final Class<C> panelClass)
+ public final <C extends Panel> Panel startPanel(final Class<C> panelClass)
{
- return (Panel<?>)startPage(new ITestPageSource()
+ return (Panel)startPage(new ITestPageSource()
{
private static final long serialVersionUID = 1L;
- public Page<?> getTestPage()
+ public Page getTestPage()
{
return new DummyPanelPage(new TestPanelSource()
{
private static final long serialVersionUID = 1L;
- public Panel<?> getTestPanel(String panelId)
+ public Panel getTestPanel(String panelId)
{
try
{
- Constructor<? extends Panel<?>> c = panelClass.getConstructor(new Class[] { String.class });
+ Constructor<? extends Panel> c = panelClass.getConstructor(new Class[] { String.class });
return c.newInstance(new Object[] { panelId });
}
catch (SecurityException e)
@@ -449,7 +449,7 @@
*
* @param component
*/
- public void startComponent(Component<?> component)
+ public void startComponent(Component component)
{
if (component instanceof FormComponent)
{
@@ -479,9 +479,9 @@
* @return The component at the path
* @see org.apache.wicket.MarkupContainer#get(String)
*/
- public Component<?> getComponentFromLastRenderedPage(String path)
+ public Component getComponentFromLastRenderedPage(String path)
{
- final Component<?> component = getLastRenderedPage().get(path);
+ final Component component = getLastRenderedPage().get(path);
if (component == null)
{
fail("path: '" + path + "' does not exist for page: " +
@@ -506,8 +506,8 @@
*/
public Result hasLabel(String path, String expectedLabelText)
{
- Label<?> label = (Label<?>)getComponentFromLastRenderedPage(path);
- return isEqual(expectedLabelText, label.getModelObjectAsString());
+ Label label = (Label)getComponentFromLastRenderedPage(path);
+ return isEqual(expectedLabelText, label.getDefaultModelObjectAsString());
}
/**
@@ -521,9 +521,9 @@
* expected page class to link
* @return a <code>Result</code>
*/
- public <C extends Page<?>> Result isPageLink(String path, Class<C> expectedPageClass)
+ public <C extends Page> Result isPageLink(String path, Class<C> expectedPageClass)
{
- PageLink<?> pageLink = (PageLink<?>)getComponentFromLastRenderedPage(path);
+ PageLink pageLink = (PageLink)getComponentFromLastRenderedPage(path);
try
{
Field iPageLinkField = pageLink.getClass().getDeclaredField("pageLink");
@@ -556,9 +556,9 @@
* expected component class
* @return a <code>Result</code>
*/
- public <C extends Component<?>> Result isComponent(String path, Class<C> expectedComponentClass)
+ public <C extends Component> Result isComponent(String path, Class<C> expectedComponentClass)
{
- Component<?> component = getComponentFromLastRenderedPage(path);
+ Component component = getComponentFromLastRenderedPage(path);
return isTrue("component '" + Classes.simpleName(component.getClass()) + "' is not type:" +
Classes.simpleName(expectedComponentClass),
expectedComponentClass.isAssignableFrom(component.getClass()));
@@ -573,7 +573,7 @@
*/
public Result isVisible(String path)
{
- Component<?> component = getLastRenderedPage().get(path);
+ Component component = getLastRenderedPage().get(path);
if (component == null)
{
fail("path: '" + path + "' does no exist for page: " +
@@ -664,7 +664,7 @@
*/
public void clickLink(String path, boolean isAjax)
{
- Component<?> linkComponent = getComponentFromLastRenderedPage(path);
+ Component linkComponent = getComponentFromLastRenderedPage(path);
// if the link is an AjaxLink, we process it differently
// than a normal link
@@ -677,7 +677,7 @@
"not be invoked when AJAX (javascript) is disabled.");
}
- AjaxLink<?> link = (AjaxLink<?>)linkComponent;
+ AjaxLink link = (AjaxLink)linkComponent;
setupRequestAndResponse(true);
WebRequestCycle requestCycle = createRequestCycle();
@@ -695,7 +695,7 @@
// Link.
else if (linkComponent instanceof AjaxFallbackLink && isAjax)
{
- AjaxFallbackLink<?> link = (AjaxFallbackLink<?>)linkComponent;
+ AjaxFallbackLink link = (AjaxFallbackLink)linkComponent;
setupRequestAndResponse(true);
WebRequestCycle requestCycle = createRequestCycle();
@@ -718,7 +718,7 @@
"will not be invoked when AJAX (javascript) is disabled.");
}
- AjaxSubmitLink<?> link = (AjaxSubmitLink<?>)linkComponent;
+ AjaxSubmitLink link = (AjaxSubmitLink)linkComponent;
// We cycle through the attached behaviors and select the
// LAST matching behavior as the one we handle.
@@ -752,7 +752,7 @@
*/
else if (linkComponent instanceof SubmitLink)
{
- SubmitLink<?> submitLink = (SubmitLink<?>)linkComponent;
+ SubmitLink submitLink = (SubmitLink)linkComponent;
String pageRelativePath = submitLink.getInputName();
getParametersForNextRequest().put(pageRelativePath, new String[] { "x" });
@@ -761,7 +761,7 @@
// if the link is a normal link (or ResourceLink)
else if (linkComponent instanceof AbstractLink)
{
- AbstractLink<?> link = (AbstractLink<?>)linkComponent;
+ AbstractLink link = (AbstractLink)linkComponent;
/*
* If the link is a bookmarkable link, then we need to transfer the parameters to the
@@ -827,7 +827,7 @@
fail("before using this method, at least one page has to be rendered");
}
- Component<?> c = getComponentFromLastRenderedPage(componentPath);
+ Component c = getComponentFromLastRenderedPage(componentPath);
if (c == null)
{
fail("component " + componentPath + " was not found");
@@ -857,9 +857,9 @@
* expected class of last rendered page
* @return a <code>Result</code>
*/
- public <C extends Page<?>> Result isRenderedPage(Class<C> expectedRenderedPageClass)
+ public <C extends Page> Result isRenderedPage(Class<C> expectedRenderedPageClass)
{
- Page<?> page = getLastRenderedPage();
+ Page page = getLastRenderedPage();
if (page == null)
{
return Result.fail("page was null");
@@ -1011,7 +1011,7 @@
* the <code>Component</code> to test
* @return a <code>Result</code>
*/
- public Result isComponentOnAjaxResponse(Component<?> component)
+ public Result isComponentOnAjaxResponse(Component component)
{
String failMessage = "A component which is null could not have been added to the AJAX response";
notNull(failMessage, component);
@@ -1076,7 +1076,7 @@
*/
public void executeAjaxEvent(String componentPath, String event)
{
- Component<?> component = getComponentFromLastRenderedPage(componentPath);
+ Component component = getComponentFromLastRenderedPage(componentPath);
executeAjaxEvent(component, event);
}
@@ -1117,7 +1117,7 @@
* the event to simulate being fired. If <code>event</code> is <code>null</code>,
* the test will fail.
*/
- public void executeAjaxEvent(Component<?> component, String event)
+ public void executeAjaxEvent(Component component, String event)
{
String failMessage = "Can't execute event on a component which is null.";
notNull(failMessage, component);
@@ -1241,8 +1241,9 @@
form.visitFormComponents(new FormComponent.AbstractVisitor()
{
+ @SuppressWarnings("unchecked")
@Override
- public void onFormComponent(FormComponent<?> formComponent)
+ public void onFormComponent(FormComponent formComponent)
{
// !(formComponent instanceof Button) &&
if (!(formComponent instanceof RadioGroup) &&
@@ -1359,11 +1360,15 @@
throw new WicketRuntimeException(message);
}
+ /**
+ * @param rc
+ */
+ // FIXME 1.5: REMOVE THIS HACK. Currently there is no way to call
+ // requestcycle.onbeginrequest() from outside and since tester shortcircuits the normal
+ // workflow it is necessary to call onbeginrequest manually
+ @Deprecated
public static void callOnBeginRequest(RequestCycle rc)
{
- // FIXME 1.5: REMOVE THIS HACK. Currently there is no way to call
- // requestcycle.onbeginrequest() from outside and since tester shortcircuits the normal
- // workflow it is necessary to call onbeginrequest manually
try
{
Method method = RequestCycle.class.getDeclaredMethod("onBeginRequest", (Class[])null);
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/DummyHomePage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/DummyHomePage.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/DummyHomePage.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/DummyHomePage.java Sat Jun 28 22:50:41 2008
@@ -25,7 +25,7 @@
* @author Ingram Chen
* @since 1.2.6
*/
-public class DummyHomePage extends WebPage<Object>
+public class DummyHomePage extends WebPage
{
private static final long serialVersionUID = 1L;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/DummyPanelPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/DummyPanelPage.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/DummyPanelPage.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/DummyPanelPage.java Sat Jun 28 22:50:41 2008
@@ -24,7 +24,7 @@
* @author Ingram Chen
* @since 1.2.6
*/
-public class DummyPanelPage extends WebPage<Void>
+public class DummyPanelPage extends WebPage
{
private static final long serialVersionUID = 1L;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/ExternalPageViewer.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/ExternalPageViewer.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/ExternalPageViewer.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/ExternalPageViewer.java Sat Jun 28 22:50:41 2008
@@ -36,10 +36,8 @@
*/
public class ExternalPageViewer
{
- private static final List browserPaths = new ArrayList();
+ private static final List<String> browserPaths = new ArrayList<String>();
- // TODO Post 1.2: General: We could use JNLP to launch browser (see
- // http://www.croftsoft.com/library/tutorials/browser/), but why not use Swing HTMLArea??
static
{
registerBrowserPath("C:/Program Files/Mozilla Firefox/firefox.exe");
@@ -130,10 +128,10 @@
*/
private String getBrowserPath()
{
- Iterator iter = browserPaths.iterator();
+ Iterator<String> iter = browserPaths.iterator();
while (iter.hasNext())
{
- String path = (String)iter.next();
+ String path = iter.next();
if (new File(path).exists())
{
return path;
@@ -171,7 +169,7 @@
private URL getThisClassFileURL()
{
URL url = getClass().getClassLoader().getResource(
- getClass().getName().replace('.', '/') + ".class");
+ getClass().getName().replace('.', '/') + ".class");
return url;
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/FormTester.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/FormTester.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/FormTester.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/FormTester.java Sat Jun 28 22:50:41 2008
@@ -68,7 +68,7 @@
/**
* TODO need Javadoc from author.
*/
- private final class SearchOptionByIndexVisitor implements IVisitor<Component<?>>
+ private final class SearchOptionByIndexVisitor implements IVisitor<Component>
{
int count = 0;
@@ -83,7 +83,7 @@
/**
* @see org.apache.wicket.Component.IVisitor#component(org.apache.wicket.Component)
*/
- public Object component(Component<?> component)
+ public Object component(Component component)
{
if (count == index)
{
@@ -173,7 +173,7 @@
* @return the id value at the selected index
*/
@SuppressWarnings("unchecked")
- private String selectAbstractChoice(FormComponent<?> formComponent, final int index)
+ private String selectAbstractChoice(FormComponent formComponent, final int index)
{
try
{
@@ -380,7 +380,7 @@
{
@SuppressWarnings("unchecked")
@Override
- public void onFormComponent(final FormComponent<?> formComponent)
+ public void onFormComponent(final FormComponent formComponent)
{
// do nothing for invisible component
if (!formComponent.isVisibleInHierarchy())
@@ -420,12 +420,12 @@
}
else if (formComponent instanceof CheckGroup)
{
- final Collection<?> checkGroupValues = (Collection<?>)formComponent.getModelObject();
- formComponent.visitChildren(Check.class, new IVisitor<Component<?>>()
+ final Collection<?> checkGroupValues = (Collection<?>)formComponent.getDefaultModelObject();
+ formComponent.visitChildren(Check.class, new IVisitor<Component>()
{
- public Object component(Component<?> component)
+ public Object component(Component component)
{
- if (checkGroupValues.contains(component.getModelObject()))
+ if (checkGroupValues.contains(component.getDefaultModelObject()))
{
addFormComponentValue(formComponent,
((Check<?>)component).getValue());
@@ -439,14 +439,14 @@
// TODO 1.5: see if all these transformations can be factored out into
// checkgroup/radiogroup by them implementing some sort of interface {
// getValue(); } otherwise all these implementation details leak into the tester
- final Object value = formComponent.getModelObject();
+ final Object value = formComponent.getDefaultModelObject();
if (value != null)
{
- formComponent.visitChildren(Radio.class, new IVisitor<Component<?>>()
+ formComponent.visitChildren(Radio.class, new IVisitor<Component>()
{
- public Object component(Component<?> component)
+ public Object component(Component component)
{
- if (value.equals(component.getModelObject()))
+ if (value.equals(component.getDefaultModelObject()))
{
addFormComponentValue(formComponent,
((Radio<?>)component).getValue());
@@ -481,7 +481,7 @@
*/
public String getTextComponentValue(String id)
{
- Component<?> c = getForm().get(id);
+ Component c = getForm().get(id);
if (c instanceof AbstractTextComponent)
{
return ((AbstractTextComponent<?>)c).getValue();
@@ -568,7 +568,7 @@
{
checkClosed();
- Component<?> component = workingForm.get(formComponentId);
+ Component component = workingForm.get(formComponentId);
if (component instanceof IFormSubmittingComponent)
{
setFormSubmittingComponentValue((IFormSubmittingComponent)component, value);
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/TagTester.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/TagTester.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/TagTester.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/TagTester.java Sat Jun 28 22:50:41 2008
@@ -119,9 +119,9 @@
if (attributeMap != null)
{
- for (Iterator iter = attributeMap.keySet().iterator(); iter.hasNext();)
+ for (Iterator<String> iter = attributeMap.keySet().iterator(); iter.hasNext();)
{
- String attr = (String)iter.next();
+ String attr = iter.next();
if (attr.equalsIgnoreCase(attribute))
{
@@ -362,7 +362,7 @@
TagTester tester = null;
if (Strings.isEmpty(markup) == false && Strings.isEmpty(attribute) == false &&
- Strings.isEmpty(value) == false)
+ Strings.isEmpty(value) == false)
{
try
{
@@ -383,12 +383,11 @@
{
IValueMap attributeMap = xmlTag.getAttributes();
- for (Iterator iter = attributeMap.entrySet().iterator(); iter.hasNext();)
+ for (Iterator<Map.Entry<String, Object>> iter = attributeMap.entrySet()
+ .iterator(); iter.hasNext();)
{
- Map.Entry entry = (Map.Entry) iter.next();
-
- String attr = (String) entry.getKey();
-
+ Map.Entry<String, Object> entry = iter.next();
+ String attr = entry.getKey();
if (attr.equals(attribute) && value.equals(entry.getValue()))
{
if (xmlTag.isOpen())
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/WicketTester.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/WicketTester.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/WicketTester.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/WicketTester.java Sat Jun 28 22:50:41 2008
@@ -16,6 +16,7 @@
*/
package org.apache.wicket.util.tester;
+import java.io.Serializable;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Iterator;
@@ -51,7 +52,7 @@
*
* <pre>
* // production page
- * public class MyPage extends WebPage<Void>
+ * public class MyPage extends WebPage
* {
* public MyPage()
* {
@@ -92,7 +93,7 @@
*
* <pre>
* // production page
- * public class YourPage extends WebPage<Void>
+ * public class YourPage extends WebPage
* {
* public YourPage(String message)
* {
@@ -161,7 +162,7 @@
* @see org.apache.wicket.Application#getHomePage()
*/
@Override
- public Class< ? extends Page< ? >> getHomePage()
+ public Class<? extends Page> getHomePage()
{
return DummyHomePage.class;
}
@@ -254,7 +255,7 @@
* @param homePage
* a home page <code>Class</code>
*/
- public WicketTester(final Class homePage)
+ public WicketTester(final Class<? extends Page> homePage)
{
this(new WebApplication()
{
@@ -262,7 +263,7 @@
* @see org.apache.wicket.Application#getHomePage()
*/
@Override
- public Class< ? extends Page< ? >> getHomePage()
+ public Class<? extends Page> getHomePage()
{
return homePage;
}
@@ -354,7 +355,7 @@
* @param expectedComponentClass
* expected <code>Component</code> class
*/
- public void assertComponent(String path, Class expectedComponentClass)
+ public void assertComponent(String path, Class<? extends Component> expectedComponentClass)
{
assertResult(isComponent(path, expectedComponentClass));
}
@@ -413,9 +414,9 @@
*/
public void assertErrorMessages(String[] expectedErrorMessages)
{
- List actualMessages = getMessages(FeedbackMessage.ERROR);
- List msgs = new ArrayList();
- for (Iterator iterator = actualMessages.iterator(); iterator.hasNext();)
+ List<Serializable> actualMessages = getMessages(FeedbackMessage.ERROR);
+ List<Serializable> msgs = new ArrayList<Serializable>();
+ for (Iterator<Serializable> iterator = actualMessages.iterator(); iterator.hasNext();)
{
msgs.add(iterator.next().toString());
}
@@ -430,7 +431,7 @@
*/
public void assertInfoMessages(String[] expectedInfoMessages)
{
- List actualMessages = getMessages(FeedbackMessage.INFO);
+ List<Serializable> actualMessages = getMessages(FeedbackMessage.INFO);
WicketTesterHelper.assertEquals(Arrays.asList(expectedInfoMessages), actualMessages);
}
@@ -456,7 +457,7 @@
public void assertLabel(String path, String expectedLabelText)
{
Label label = (Label)getComponentFromLastRenderedPage(path);
- Assert.assertEquals(expectedLabelText, label.getModelObjectAsString());
+ Assert.assertEquals(expectedLabelText, label.getDefaultModelObjectAsString());
}
/**
@@ -470,7 +471,7 @@
public void assertModelValue(String path, Object expectedValue)
{
Component component = getComponentFromLastRenderedPage(path);
- Assert.assertEquals(expectedValue, component.getModelObject());
+ Assert.assertEquals(expectedValue, component.getDefaultModelObject());
}
/**
@@ -482,7 +483,7 @@
* expected <code>List</code> in the model of the given {@link ListView}
*/
@Override
- public void assertListView(String path, List expectedList)
+ public void assertListView(String path, List<?> expectedList)
{
ListView listView = (ListView)getComponentFromLastRenderedPage(path);
WicketTesterHelper.assertEquals(expectedList, listView.getList());
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/WicketTesterHelper.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/WicketTesterHelper.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/WicketTesterHelper.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/WicketTesterHelper.java Sat Jun 28 22:50:41 2008
@@ -91,7 +91,7 @@
object.type = name;
try
{
- object.value = component.getModelObjectAsString();
+ object.value = component.getDefaultModelObjectAsString();
}
catch (Exception e)
{
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/validation/IValidatorAddListener.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/validation/IValidatorAddListener.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/validation/IValidatorAddListener.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/validation/IValidatorAddListener.java Sat Jun 28 22:50:41 2008
@@ -48,5 +48,5 @@
* @param component
* a <code>Component</code> to which the validator was just added
*/
- void onAdded(Component<?> component);
+ void onAdded(Component component);
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/validation/validator/AbstractValidator.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/validation/validator/AbstractValidator.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/validation/validator/AbstractValidator.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/validation/validator/AbstractValidator.java Sat Jun 28 22:50:41 2008
@@ -227,7 +227,7 @@
* FIXME 2.0: remove asap
*/
@Deprecated
- protected final Map<String, Object> messageModel(final FormComponent<?> formComponent)
+ protected final Map<String, Object> messageModel(final FormComponent formComponent)
{
throw new UnsupportedOperationException("THIS METHOD IS DEPRECATED, SEE JAVADOC");
}
@@ -250,7 +250,7 @@
*
*/
@Deprecated
- protected final String resourceKey(final FormComponent<?> formComponent)
+ protected final String resourceKey(final FormComponent formComponent)
{
throw new UnsupportedOperationException("THIS METHOD IS DEPRECATED, SEE JAVADOC");
}
@@ -276,7 +276,7 @@
* FIXME 2.0: remove asap
*/
@Deprecated
- public final void validate(final FormComponent<?> component)
+ public final void validate(final FormComponent component)
{
throw new UnsupportedOperationException("THIS METHOD IS DEPRECATED, SEE JAVADOC");
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/version/IPageVersionManager.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/version/IPageVersionManager.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/version/IPageVersionManager.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/version/IPageVersionManager.java Sat Jun 28 22:50:41 2008
@@ -22,22 +22,21 @@
import org.apache.wicket.version.undo.Change;
/**
- * An interface that manages versions of a <code>Page</code>. Initially a page has a version
- * number of 0, indicating that it is in its original state. When one or more changes are made to
- * the page, we arrive at version 1.
+ * An interface that manages versions of a <code>Page</code>. Initially a page has a version number
+ * of 0, indicating that it is in its original state. When one or more changes are made to the page,
+ * we arrive at version 1.
* <p>
* During a <code>RequestCycle</code>, just before a change is about to occur, the
* <code>beginVersion</code> method is called, followed by one or more calls to
- * <code>componentAdded</code>, <code>componentRemoved</code> or
- * <code>componentModelChanging</code>. If <code>beginVersion</code> is called by the framework
- * during a given request cycle, a balancing call to <code>endVersion</code> will occur at the end
- * of the request cycle. However, if no changes occur to a page during a request cycle, none of
- * these methods will be called.
+ * <code>componentAdded</code>, <code>componentRemoved</code> or <code>componentModelChanging</code>
+ * . If <code>beginVersion</code> is called by the framework during a given request cycle, a
+ * balancing call to <code>endVersion</code> will occur at the end of the request cycle. However, if
+ * no changes occur to a page during a request cycle, none of these methods will be called.
* <p>
- * Once version information has been added to a page version manager (<code>IPageVersionManager</code>),
- * versions can be retrieved by number using the <code>getVersion(int)</code> method. Since
- * version 0 is the first version of a page, calling <code>getVersion(0)</code> will retrieve that
- * version.
+ * Once version information has been added to a page version manager (
+ * <code>IPageVersionManager</code>), versions can be retrieved by number using the
+ * <code>getVersion(int)</code> method. Since version 0 is the first version of a page, calling
+ * <code>getVersion(0)</code> will retrieve that version.
* <p>
* The current version number of a page (that is, the number of the newest available version) can be
* retrieved by calling <code>getCurrentVersionNumber</code>.
@@ -47,7 +46,7 @@
* type of page
* @since 1.2.6
*/
-public interface IPageVersionManager<T> extends IClusterable
+public interface IPageVersionManager extends IClusterable
{
/**
* Called when changes are immediately impending to the <code>Page</code> being managed. The
@@ -68,7 +67,7 @@
* @param component
* the <code>Component</code> that was added
*/
- void componentAdded(Component<?> component);
+ void componentAdded(Component component);
/**
* Indicates that the model for the given <code>Component</code> is about to change.
@@ -76,7 +75,7 @@
* @param component
* the <code>Component</code> whose model is about to change
*/
- void componentModelChanging(Component<?> component);
+ void componentModelChanging(Component component);
/**
* Indicates an internal state for the given <code>Component</code> is about to change.
@@ -92,7 +91,7 @@
* @param component
* the <code>Component</code> that was removed
*/
- void componentRemoved(Component<?> component);
+ void componentRemoved(Component component);
/**
* Called when changes to the <code>Page</code> have ended.
@@ -109,16 +108,14 @@
void expireOldestVersion();
/**
- * Retrieves a given <code>Page</code> version. This method does not include the Ajax
- * versions.
+ * Retrieves a given <code>Page</code> version. This method does not include the Ajax versions.
*
*
* @param versionNumber
* the version of the page to get
- * @return the <code>Page</code>, or <code>null</code> if the version requested is not
- * available
+ * @return the <code>Page</code>, or <code>null</code> if the version requested is not available
*/
- Page<T> getVersion(int versionNumber);
+ Page getVersion(int versionNumber);
/**
@@ -130,7 +127,7 @@
* the number of versions to roll back
* @return the rolled-back <code>Page</code>
*/
- Page<T> rollbackPage(int numberOfVersions);
+ Page rollbackPage(int numberOfVersions);
/**
* Retrieves the number of versions stored in this page version manager.
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/version/undo/Add.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/version/undo/Add.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/version/undo/Add.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/version/undo/Add.java Sat Jun 28 22:50:41 2008
@@ -36,7 +36,7 @@
private static final Logger log = LoggerFactory.getLogger(Add.class);
/** the subject <code>Component</code> */
- private final Component<?> component;
+ private final Component component;
/**
* Constructor.
@@ -44,7 +44,7 @@
* @param component
* the subject <code>Component</code>
*/
- Add(final Component<?> component)
+ Add(final Component component)
{
if (component == null)
{
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/version/undo/ChangeList.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/version/undo/ChangeList.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/version/undo/ChangeList.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/version/undo/ChangeList.java Sat Jun 28 22:50:41 2008
@@ -47,7 +47,7 @@
* @param component
* the <code>Component</code> that was added
*/
- void componentAdded(Component<?> component)
+ void componentAdded(Component component)
{
changes.add(new Add(component));
}
@@ -55,15 +55,13 @@
/**
* An <code>IModel</code> is about to change.
*
- * @param <T>
- * type of component's model object
*
* @param component
* the <code>Component</code> for which the <code>IModel</code> changed
*/
- <T> void componentModelChanging(Component<T> component)
+ void componentModelChanging(Component component)
{
- changes.add(new ModelChange<T>(component));
+ changes.add(new ModelChange(component));
}
/**
@@ -88,7 +86,7 @@
* @param component
* the <code>Component</code> that was removed
*/
- void componentRemoved(Component<?> component)
+ void componentRemoved(Component component)
{
changes.add(new Remove(component));
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/version/undo/ModelChange.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/version/undo/ModelChange.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/version/undo/ModelChange.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/version/undo/ModelChange.java Sat Jun 28 22:50:41 2008
@@ -34,7 +34,7 @@
* type of component's model object
* @since 1.2.6
*/
-class ModelChange<T> extends Change
+class ModelChange extends Change
{
private static final long serialVersionUID = 1L;
@@ -42,10 +42,10 @@
private static final Logger log = LoggerFactory.getLogger(ModelChange.class);
/** the subject <code>Component</code> */
- private final Component<T> component;
+ private final Component component;
/** the original <code>IModel</code> */
- private IModel<T> originalModel;
+ private IModel<?> originalModel;
/**
* Constructor.
@@ -54,7 +54,7 @@
* the subject <code>Component</code>
*/
@SuppressWarnings("unchecked")
- ModelChange(final Component<T> component)
+ ModelChange(final Component component)
{
if (component == null)
{
@@ -65,7 +65,7 @@
this.component = component;
// Get component model
- final IModel<T> model = component.getModel();
+ final IModel<?> model = component.getDefaultModel();
// If the component has a model, it's about to change!
if (model != null)
@@ -79,7 +79,7 @@
if (component instanceof FormComponent)
{
// and it's using the same model as the form
- if (((FormComponent<T>)component).getForm().getModel() == model)
+ if (((FormComponent)component).getForm().getDefaultModel() == model)
{
// we don't need to clone the model, because it will
// be re-initialized using initModel()
@@ -89,7 +89,7 @@
else
{
// If the component is using the same model as the page
- if (component.getPage().getModel() == model)
+ if (component.getPage().getDefaultModel() == model)
{
// we don't need to clone the model, because it will
// be re-initialized using initModel()
@@ -102,7 +102,7 @@
if (cloneModel)
{
model.detach();
- originalModel = (IModel<T>)Objects.cloneModel(model);
+ originalModel = (IModel<?>)Objects.cloneModel(model);
}
else
{
@@ -129,7 +129,7 @@
component.getPath() + "@" + component.hashCode() + ")");
}
- component.setModel(originalModel);
+ component.setDefaultModel(originalModel);
}
/**
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/version/undo/Remove.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/version/undo/Remove.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/version/undo/Remove.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/version/undo/Remove.java Sat Jun 28 22:50:41 2008
@@ -37,10 +37,10 @@
private static final Logger log = LoggerFactory.getLogger(Remove.class);
/** the subject <code>Component</code> */
- private final Component<?> component;
+ private final Component component;
/** the parent <code>MarkupContainer</code> */
- private final MarkupContainer<?> container;
+ private final MarkupContainer container;
/**
* Constructor.
@@ -48,7 +48,7 @@
* @param component
* the subject <code>Component</code>
*/
- Remove(final Component<?> component)
+ Remove(final Component component)
{
if (component == null)
{
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/version/undo/UndoPageVersionManager.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/version/undo/UndoPageVersionManager.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/version/undo/UndoPageVersionManager.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/version/undo/UndoPageVersionManager.java Sat Jun 28 22:50:41 2008
@@ -25,16 +25,16 @@
/**
- * A version manager implemented by recording <code>Component</code> changes as undo records.
- * These records can later be reversed to get back to a given version of the <code>Page</code>
- * being managed.
+ * A version manager implemented by recording <code>Component</code> changes as undo records. These
+ * records can later be reversed to get back to a given version of the <code>Page</code> being
+ * managed.
*
* @author Jonathan Locke
* @param <T>
* Type of Page
* @since 1.2.6
*/
-public class UndoPageVersionManager<T> implements IPageVersionManager<T>
+public class UndoPageVersionManager implements IPageVersionManager
{
/** logger */
private static final Logger log = LoggerFactory.getLogger(UndoPageVersionManager.class);
@@ -57,7 +57,7 @@
private final int maxVersions;
/** the <code>Page</code> being managed */
- private final Page<T> page;
+ private final Page page;
/**
* If this is true, the version that was created is not merged with the previous one.
@@ -72,7 +72,7 @@
* @param maxVersions
* the maximum number of versions to maintain before expiring old versions
*/
- public UndoPageVersionManager(final Page<T> page, final int maxVersions)
+ public UndoPageVersionManager(final Page page, final int maxVersions)
{
this.page = page;
this.maxVersions = maxVersions;
@@ -112,7 +112,7 @@
/**
* @see IPageVersionManager#componentAdded(Component)
*/
- public void componentAdded(Component<?> component)
+ public void componentAdded(Component component)
{
changeList.componentAdded(component);
}
@@ -120,7 +120,7 @@
/**
* @see IPageVersionManager#componentModelChanging(Component)
*/
- public void componentModelChanging(Component<?> component)
+ public void componentModelChanging(Component component)
{
changeList.componentModelChanging(component);
}
@@ -128,7 +128,7 @@
/**
* @see IPageVersionManager#componentRemoved(Component)
*/
- public void componentRemoved(Component<?> component)
+ public void componentRemoved(Component component)
{
changeList.componentRemoved(component);
}
@@ -204,7 +204,7 @@
/**
* @see IPageVersionManager#getVersion(int)
*/
- public Page<T> getVersion(final int versionNumber)
+ public Page getVersion(final int versionNumber)
{
// If the requested version is at or before the current version,
if (versionNumber <= getCurrentVersionNumber())
@@ -232,7 +232,7 @@
/**
* @see IPageVersionManager#rollbackPage(int)
*/
- public Page<T> rollbackPage(int numberOfVersions)
+ public Page rollbackPage(int numberOfVersions)
{
// TODO NEEDS IMPL! See SecondLevelCache PageMap impl
return null;
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/AttributeModifierComponentPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/AttributeModifierComponentPage.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/AttributeModifierComponentPage.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/AttributeModifierComponentPage.java Sat Jun 28 22:50:41 2008
@@ -27,7 +27,7 @@
* @see AttributeModifierComponentTest
* @author Chris Turner
*/
-public class AttributeModifierComponentPage extends WebPage<Void>
+public class AttributeModifierComponentPage extends WebPage
{
private static final long serialVersionUID = 1L;
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/AuthorizationTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/AuthorizationTest.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/AuthorizationTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/AuthorizationTest.java Sat Jun 28 22:50:41 2008
@@ -190,7 +190,7 @@
{
tester.submitForm("form");
Component component = tester.getComponentFromLastRenderedPage("form:stringInput");
- assertEquals("", component.getModelObjectAsString());
+ assertEquals("", component.getDefaultModelObjectAsString());
}
catch (WicketRuntimeException e)
{
@@ -224,7 +224,7 @@
/**
* Test page for authentication tests.
*/
- public static class AuthTestPage1 extends WebPage<Void>
+ public static class AuthTestPage1 extends WebPage
{
private static final long serialVersionUID = 1L;
@@ -275,7 +275,7 @@
public TestForm(String id)
{
super(id);
- setModel(new CompoundPropertyModel(input = new Input()));
+ setDefaultModel(new CompoundPropertyModel(input = new Input()));
add(new TextField("stringInput"));
}
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/DisabledComponentPage1.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/DisabledComponentPage1.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/DisabledComponentPage1.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/DisabledComponentPage1.java Sat Jun 28 22:50:41 2008
@@ -25,7 +25,7 @@
*
* @author Chris Turner
*/
-public class DisabledComponentPage1 extends WebPage<Void>
+public class DisabledComponentPage1 extends WebPage
{
private static final long serialVersionUID = 1L;
Link link;
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/DisabledComponentPage2.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/DisabledComponentPage2.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/DisabledComponentPage2.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/DisabledComponentPage2.java Sat Jun 28 22:50:41 2008
@@ -21,7 +21,7 @@
/**
* @author jcompagner
*/
-public class DisabledComponentPage2 extends WebPage<Void>
+public class DisabledComponentPage2 extends WebPage
{
private static final long serialVersionUID = 1L;
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/LocalizerTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/LocalizerTest.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/LocalizerTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/LocalizerTest.java Sat Jun 28 22:50:41 2008
@@ -43,7 +43,7 @@
public class LocalizerTest extends WicketTestCase
{
- private static class MyMockPage extends WebPage<Void>
+ private static class MyMockPage extends WebPage
{
private static final long serialVersionUID = 1L;
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/LoginPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/LoginPage.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/LoginPage.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/LoginPage.java Sat Jun 28 22:50:41 2008
@@ -1,35 +1,35 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.wicket;
-
-import org.apache.wicket.markup.html.WebPage;
-
-/**
- * @author jcompagner
- */
-public class LoginPage extends WebPage<Void>
-{
- private static final long serialVersionUID = 1L;
-
- /**
- * Construct.
- */
- public LoginPage()
- {
- }
-
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.wicket;
+
+import org.apache.wicket.markup.html.WebPage;
+
+/**
+ * @author jcompagner
+ */
+public class LoginPage extends WebPage
+{
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * Construct.
+ */
+ public LoginPage()
+ {
+ }
+
+}
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/MockPageWithForm.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/MockPageWithForm.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/MockPageWithForm.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/MockPageWithForm.java Sat Jun 28 22:50:41 2008
@@ -28,7 +28,7 @@
/**
* Tests drop down choice.
*/
-public class MockPageWithForm extends WebPage<Void>
+public class MockPageWithForm extends WebPage
{
private final class MyForm extends Form
{
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/MockPageWithLink.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/MockPageWithLink.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/MockPageWithLink.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/MockPageWithLink.java Sat Jun 28 22:50:41 2008
@@ -34,7 +34,7 @@
*
* @author Frank Bille
*/
-public class MockPageWithLink extends WebPage<Void>
+public class MockPageWithLink extends WebPage
{
private static final long serialVersionUID = 1L;
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/MockPageWithLinkAndComponent.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/MockPageWithLinkAndComponent.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/MockPageWithLinkAndComponent.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/MockPageWithLinkAndComponent.java Sat Jun 28 22:50:41 2008
@@ -38,7 +38,7 @@
*
* @author Frank Bille
*/
-public class MockPageWithLinkAndComponent extends WebPage<Void>
+public class MockPageWithLinkAndComponent extends WebPage
{
private static final long serialVersionUID = 1L;
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/MockPageWithOneComponent.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/MockPageWithOneComponent.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/MockPageWithOneComponent.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/MockPageWithOneComponent.java Sat Jun 28 22:50:41 2008
@@ -22,7 +22,7 @@
*
* @author Frank Bille
*/
-public class MockPageWithOneComponent extends WebPage<Void>
+public class MockPageWithOneComponent extends WebPage
{
private static final long serialVersionUID = 1L;
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/MyPage0.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/MyPage0.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/MyPage0.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/MyPage0.java Sat Jun 28 22:50:41 2008
@@ -21,7 +21,7 @@
/**
* Dummy Page with no constructor at all
*/
-public class MyPage0 extends WebPage<Void>
+public class MyPage0 extends WebPage
{
private static final long serialVersionUID = 1L;
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/MyPage1.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/MyPage1.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/MyPage1.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/MyPage1.java Sat Jun 28 22:50:41 2008
@@ -21,7 +21,7 @@
/**
* Dummy Page with default constructor
*/
-public class MyPage1 extends WebPage<Void>
+public class MyPage1 extends WebPage
{
private static final long serialVersionUID = 1L;
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/MyPage2.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/MyPage2.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/MyPage2.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/MyPage2.java Sat Jun 28 22:50:41 2008
@@ -21,7 +21,7 @@
/**
* Dummy Page with PageParameters
*/
-public class MyPage2 extends WebPage<Void>
+public class MyPage2 extends WebPage
{
private static final long serialVersionUID = 1L;
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/MyPage3.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/MyPage3.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/MyPage3.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/MyPage3.java Sat Jun 28 22:50:41 2008
@@ -21,7 +21,7 @@
/**
* Dummy Page with Page parameter
*/
-public class MyPage3 extends WebPage<Void>
+public class MyPage3 extends WebPage
{
private static final long serialVersionUID = 1L;
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/MyPage4.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/MyPage4.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/MyPage4.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/MyPage4.java Sat Jun 28 22:50:41 2008
@@ -21,7 +21,7 @@
/**
* Dummy Page with String parameter
*/
-public class MyPage4 extends WebPage<Void>
+public class MyPage4 extends WebPage
{
private static final long serialVersionUID = 1L;
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/MyPage5.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/MyPage5.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/MyPage5.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/MyPage5.java Sat Jun 28 22:50:41 2008
@@ -21,7 +21,7 @@
/**
* Dummy Page with PageParameter constructor and default constructor
*/
-public class MyPage5 extends WebPage<Void>
+public class MyPage5 extends WebPage
{
private static final long serialVersionUID = 1L;
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/PageMarkupLoadingTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/PageMarkupLoadingTest.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/PageMarkupLoadingTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/PageMarkupLoadingTest.java Sat Jun 28 22:50:41 2008
@@ -1,116 +1,116 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.wicket;
-
-import java.util.Locale;
-
-import org.apache.wicket.markup.html.WebPage;
-import org.apache.wicket.protocol.http.WebRequestCycle;
-
-/**
- * Tests markup loading.
- */
-public class PageMarkupLoadingTest extends WicketTestCase
-{
- /**
- * Test default locale loaded page.
- *
- * @throws Exception
- */
- public void testDefault() throws Exception
- {
- tester.setupRequestAndResponse();
- WebRequestCycle cycle = tester.createRequestCycle();
- cycle.getSession().setLocale(Locale.ENGLISH);
- tester.startPage(Page1.class);
- tester.assertRenderedPage(Page1.class);
- tester.assertResultPage(getClass(), "PageMarkupLoadingTest$Page1_expected.html");
- }
-
- /**
- * Test Dutch locale loaded page.
- *
- * @throws Exception
- */
- public void testDutch() throws Exception
- {
- tester.setupRequestAndResponse();
- WebRequestCycle cycle = tester.createRequestCycle();
- cycle.getSession().setLocale(new Locale("nl"));
- tester.startPage(Page1.class);
- tester.assertRenderedPage(Page1.class);
- tester.assertResultPage(getClass(), "PageMarkupLoadingTest$Page1_nl_expected.html");
- }
-
- /**
- * Test Dutch/ my style locale loaded page.
- *
- * @throws Exception
- */
- public void testDutchMyStyle() throws Exception
- {
- tester.setupRequestAndResponse();
- WebRequestCycle cycle = tester.createRequestCycle();
- cycle.getSession().setLocale(new Locale("nl"));
- cycle.getSession().setStyle("mystyle");
- tester.startPage(Page1.class);
- tester.assertRenderedPage(Page1.class);
- tester.assertResultPage(getClass(), "PageMarkupLoadingTest$Page1_mystyle_nl_expected.html");
- }
-
- /**
- * Test Dutch/ my style locale loaded page.
- *
- * @throws Exception
- */
- public void testDutchMyStyleMyVar() throws Exception
- {
- tester.setupRequestAndResponse();
- WebRequestCycle cycle = tester.createRequestCycle();
- cycle.getSession().setLocale(new Locale("nl"));
- cycle.getSession().setStyle("mystyle");
- tester.startPage(Page2.class);
- tester.assertRenderedPage(Page2.class);
- tester.assertResultPage(getClass(),
- "PageMarkupLoadingTest$Page2_myvar_mystyle_nl_expected.html");
- }
-
- /** simple test page */
- public static class Page1 extends WebPage<Void> {
- private static final long serialVersionUID = 1L;
-
- /** Construct. */
- public Page1()
- {
- }
- }
-
- /** simple test page */
- public static class Page2 extends WebPage<Void> {
- private static final long serialVersionUID = 1L;
-
- /** Construct. */
- public Page2()
- {
- }
-
- public String getVariation()
- {
- return "myvar";
- }
- }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.wicket;
+
+import java.util.Locale;
+
+import org.apache.wicket.markup.html.WebPage;
+import org.apache.wicket.protocol.http.WebRequestCycle;
+
+/**
+ * Tests markup loading.
+ */
+public class PageMarkupLoadingTest extends WicketTestCase
+{
+ /**
+ * Test default locale loaded page.
+ *
+ * @throws Exception
+ */
+ public void testDefault() throws Exception
+ {
+ tester.setupRequestAndResponse();
+ WebRequestCycle cycle = tester.createRequestCycle();
+ cycle.getSession().setLocale(Locale.ENGLISH);
+ tester.startPage(Page1.class);
+ tester.assertRenderedPage(Page1.class);
+ tester.assertResultPage(getClass(), "PageMarkupLoadingTest$Page1_expected.html");
+ }
+
+ /**
+ * Test Dutch locale loaded page.
+ *
+ * @throws Exception
+ */
+ public void testDutch() throws Exception
+ {
+ tester.setupRequestAndResponse();
+ WebRequestCycle cycle = tester.createRequestCycle();
+ cycle.getSession().setLocale(new Locale("nl"));
+ tester.startPage(Page1.class);
+ tester.assertRenderedPage(Page1.class);
+ tester.assertResultPage(getClass(), "PageMarkupLoadingTest$Page1_nl_expected.html");
+ }
+
+ /**
+ * Test Dutch/ my style locale loaded page.
+ *
+ * @throws Exception
+ */
+ public void testDutchMyStyle() throws Exception
+ {
+ tester.setupRequestAndResponse();
+ WebRequestCycle cycle = tester.createRequestCycle();
+ cycle.getSession().setLocale(new Locale("nl"));
+ cycle.getSession().setStyle("mystyle");
+ tester.startPage(Page1.class);
+ tester.assertRenderedPage(Page1.class);
+ tester.assertResultPage(getClass(), "PageMarkupLoadingTest$Page1_mystyle_nl_expected.html");
+ }
+
+ /**
+ * Test Dutch/ my style locale loaded page.
+ *
+ * @throws Exception
+ */
+ public void testDutchMyStyleMyVar() throws Exception
+ {
+ tester.setupRequestAndResponse();
+ WebRequestCycle cycle = tester.createRequestCycle();
+ cycle.getSession().setLocale(new Locale("nl"));
+ cycle.getSession().setStyle("mystyle");
+ tester.startPage(Page2.class);
+ tester.assertRenderedPage(Page2.class);
+ tester.assertResultPage(getClass(),
+ "PageMarkupLoadingTest$Page2_myvar_mystyle_nl_expected.html");
+ }
+
+ /** simple test page */
+ public static class Page1 extends WebPage {
+ private static final long serialVersionUID = 1L;
+
+ /** Construct. */
+ public Page1()
+ {
+ }
+ }
+
+ /** simple test page */
+ public static class Page2 extends WebPage {
+ private static final long serialVersionUID = 1L;
+
+ /** Construct. */
+ public Page2()
+ {
+ }
+
+ public String getVariation()
+ {
+ return "myvar";
+ }
+ }
+}
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/ParentResourceEscapePathTestPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/ParentResourceEscapePathTestPage.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/ParentResourceEscapePathTestPage.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/ParentResourceEscapePathTestPage.java Sat Jun 28 22:50:41 2008
@@ -18,7 +18,7 @@
import org.apache.wicket.markup.html.WebPage;
-public class ParentResourceEscapePathTestPage extends WebPage<Void>
+public class ParentResourceEscapePathTestPage extends WebPage
{
private static final long serialVersionUID = 4852841584683061902L;