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/19 18:53:19 UTC
svn commit: r669560 [7/8] - in /wicket/sandbox/ivaynberg/generics:
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/mai...
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/protocol/http/MockWebApplication.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/protocol/http/MockWebApplication.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/protocol/http/MockWebApplication.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/protocol/http/MockWebApplication.java Thu Jun 19 09:52:58 2008
@@ -90,10 +90,10 @@
private static final Logger log = LoggerFactory.getLogger(MockWebApplication.class);
/** The last rendered page. */
- private Page<?> lastRenderedPage;
+ private Page lastRenderedPage;
/** The previously rendered page */
- private Page<?> previousRenderedPage;
+ private Page previousRenderedPage;
/** Mock http servlet request. */
private final MockHttpServletRequest servletRequest;
@@ -263,7 +263,7 @@
*
* @return The last rendered page
*/
- public Page<?> getLastRenderedPage()
+ public Page getLastRenderedPage()
{
return lastRenderedPage;
}
@@ -273,7 +273,7 @@
*
* @return The last rendered page
*/
- public Page<?> getPreviousRenderedPage()
+ public Page getPreviousRenderedPage()
{
return previousRenderedPage;
}
@@ -343,7 +343,7 @@
*
* @param component
*/
- public void processRequestCycle(final Component<?> component)
+ public void processRequestCycle(final Component component)
{
setupRequestAndResponse();
final WebRequestCycle cycle = createRequestCycle();
@@ -351,7 +351,7 @@
if (component instanceof Page)
{
- lastRenderedPage = (Page<?>)component;
+ lastRenderedPage = (Page)component;
}
postProcessRequestCycle(cycle);
}
@@ -363,7 +363,7 @@
*
* @param pageClass
*/
- public <C extends Page<?>> void processRequestCycle(final Class<C> pageClass)
+ public <C extends Page> void processRequestCycle(final Class<C> pageClass)
{
processRequestCycle(pageClass, null);
}
@@ -376,7 +376,7 @@
* @param pageClass
* @param params
*/
- public <C extends Page<?>> void processRequestCycle(final Class<C> pageClass,
+ public <C extends Page> void processRequestCycle(final Class<C> pageClass,
PageParameters params)
{
setupRequestAndResponse();
@@ -400,7 +400,7 @@
IRequestTarget currentTarget = cycle.getRequestTarget();
if (currentTarget instanceof IPageRequestTarget)
{
- Page<?> currentPage = ((IPageRequestTarget)currentTarget).getPage();
+ Page currentPage = ((IPageRequestTarget)currentTarget).getPage();
final IPageMap pageMap = currentPage.getPageMap();
if (pageMap.isDefault())
{
@@ -544,12 +544,12 @@
* @param cycle
* @return Last page
*/
- private Page<?> generateLastRenderedPage(WebRequestCycle cycle)
+ private Page generateLastRenderedPage(WebRequestCycle cycle)
{
- Page<?> newLastRenderedPage = cycle.getResponsePage();
+ Page newLastRenderedPage = cycle.getResponsePage();
if (newLastRenderedPage == null)
{
- Class<? extends Page<?>> responseClass = cycle.getResponsePageClass();
+ Class<? extends Page> responseClass = cycle.getResponsePageClass();
if (responseClass != null)
{
Session.set(cycle.getSession());
@@ -563,7 +563,7 @@
// create a new request cycle for the newPage call
createRequestCycle();
IBookmarkablePageRequestTarget pageClassRequestTarget = (IBookmarkablePageRequestTarget)target;
- Class<? extends Page<?>> pageClass = pageClassRequestTarget.getPageClass();
+ Class<? extends Page> pageClass = pageClassRequestTarget.getPageClass();
PageParameters parameters = pageClassRequestTarget.getPageParameters();
if (parameters == null || parameters.size() == 0)
{
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/protocol/http/RequestLogger.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/protocol/http/RequestLogger.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/protocol/http/RequestLogger.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/protocol/http/RequestLogger.java Thu Jun 19 09:52:58 2008
@@ -340,7 +340,7 @@
RequestData rd = getCurrentRequest();
if (value instanceof Page)
{
- Page<?> page = (Page<?>)value;
+ Page page = (Page)value;
rd.addEntry("Page removed, id: " + page.getId() + ", class:" + page.getClass());
}
else if (value instanceof IPageMap)
@@ -367,7 +367,7 @@
RequestData rd = getCurrentRequest();
if (value instanceof Page)
{
- Page<?> page = (Page<?>)value;
+ Page page = (Page)value;
rd.addEntry("Page updated, id: " + page.getId() + ", class:" + page.getClass());
}
else if (value instanceof IPageMap)
@@ -399,7 +399,7 @@
}
else if (value instanceof Page)
{
- Page<?> page = (Page<?>)value;
+ Page page = (Page)value;
rd.addEntry("Page created, id: " + page.getId() + ", class:" + page.getClass());
}
else if (value instanceof IPageMap)
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/protocol/http/SecondLevelCacheSessionStore.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/protocol/http/SecondLevelCacheSessionStore.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/protocol/http/SecondLevelCacheSessionStore.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/protocol/http/SecondLevelCacheSessionStore.java Thu Jun 19 09:52:58 2008
@@ -85,7 +85,7 @@
* @param ajaxVersionNumber
* @return The page
*/
- <T> Page<T> getPage(String sessionId, String pagemap, int id, int versionNumber,
+ <T> Page getPage(String sessionId, String pagemap, int id, int versionNumber,
int ajaxVersionNumber);
/**
@@ -96,7 +96,7 @@
* @param sessionId
* @param page
*/
- void pageAccessed(String sessionId, Page<?> page);
+ void pageAccessed(String sessionId, Page page);
/**
* Removes a page from the persistent layer.
@@ -117,7 +117,7 @@
* @param sessionId
* @param page
*/
- void storePage(String sessionId, Page<?> page);
+ void storePage(String sessionId, Page page);
/**
* The pagestore should cleanup all the pages for that sessionid.
@@ -185,7 +185,7 @@
* @param page
* @return page
*/
- public Page<?> convertToPage(Object page);
+ public Page convertToPage(Object page);
};
/**
@@ -218,12 +218,12 @@
}
}
- private Page<?> getLastPage()
+ private Page getLastPage()
{
- Page<?> result = null;
+ Page result = null;
if (lastPage instanceof Page)
{
- result = (Page<?>)lastPage;
+ result = (Page)lastPage;
}
else if (lastPage != null)
{
@@ -236,7 +236,7 @@
return result;
}
- private void setLastPage(Page<?> lastPage)
+ private void setLastPage(Page lastPage)
{
this.lastPage = lastPage;
}
@@ -257,7 +257,7 @@
public boolean containsPage(int id, int versionNumber)
{
- Page<?> lastPage = this.lastPage instanceof Page ? (Page<?>)this.lastPage : null;
+ Page lastPage = this.lastPage instanceof Page ? (Page)this.lastPage : null;
if (lastPage != null && lastPage.getNumericId() == id &&
lastPage.getCurrentVersionNumber() == versionNumber)
{
@@ -273,14 +273,14 @@
* @see org.apache.wicket.PageMap#get(int, int)
*/
@Override
- public Page<?> get(int id, int versionNumber)
+ public Page get(int id, int versionNumber)
{
- IntHashMap<Page<?>> pages = getUsedPages(getName());
+ IntHashMap<Page> pages = getUsedPages(getName());
// for now i only get by id.
// does it really make any sense that there are multiply instances
// of the
// same page are alive in one session??
- Page<?> page = (Page<?>)pages.get(id);
+ Page page = (Page)pages.get(id);
if (page != null)
{
return page;
@@ -314,7 +314,7 @@
* @see org.apache.wicket.PageMap#put(org.apache.wicket.Page)
*/
@Override
- public void put(Page<?> page)
+ public void put(Page page)
{
if (!page.isPageStateless())
{
@@ -428,7 +428,7 @@
private short lastAjaxVersionNumber;
- private final Page<T> page;
+ private final Page page;
private transient boolean versionStarted;
@@ -437,7 +437,7 @@
*
* @param page
*/
- public SecondLevelCachePageVersionManager(Page<T> page)
+ public SecondLevelCachePageVersionManager(Page page)
{
this.page = page;
}
@@ -476,21 +476,21 @@
/**
* @see org.apache.wicket.version.IPageVersionManager#componentAdded(org.apache.wicket.Component)
*/
- public void componentAdded(Component<?> component)
+ public void componentAdded(Component component)
{
}
/**
* @see org.apache.wicket.version.IPageVersionManager#componentModelChanging(org.apache.wicket.Component)
*/
- public void componentModelChanging(Component<?> component)
+ public void componentModelChanging(Component component)
{
}
/**
* @see org.apache.wicket.version.IPageVersionManager#componentRemoved(org.apache.wicket.Component)
*/
- public void componentRemoved(Component<?> component)
+ public void componentRemoved(Component component)
{
}
@@ -540,7 +540,7 @@
/**
* @see org.apache.wicket.version.IPageVersionManager#getVersion(int)
*/
- public Page<T> getVersion(int versionNumber)
+ public Page getVersion(int versionNumber)
{
if (currentVersionNumber == versionNumber)
{
@@ -570,7 +570,7 @@
/**
* @see org.apache.wicket.version.IPageVersionManager#rollbackPage(int)
*/
- public Page<T> rollbackPage(int numberOfVersions)
+ public Page rollbackPage(int numberOfVersions)
{
String sessionId = page.getSession().getId();
if (sessionId != null)
@@ -630,7 +630,7 @@
}
}
- private static MetaDataKey<Map<String, IntHashMap<Page<?>>>> USED_PAGES = new MetaDataKey<Map<String, IntHashMap<Page<?>>>>()
+ private static MetaDataKey<Map<String, IntHashMap<Page>>> USED_PAGES = new MetaDataKey<Map<String, IntHashMap<Page>>>()
{
private static final long serialVersionUID = 1L;
};
@@ -639,18 +639,18 @@
* @param pageMapName
* @return used pages map
*/
- public static IntHashMap<Page<?>> getUsedPages(String pageMapName)
+ public static IntHashMap<Page> getUsedPages(String pageMapName)
{
- Map<String, IntHashMap<Page<?>>> usedPages = RequestCycle.get().getMetaData(USED_PAGES);
+ Map<String, IntHashMap<Page>> usedPages = RequestCycle.get().getMetaData(USED_PAGES);
if (usedPages == null)
{
- usedPages = new HashMap<String, IntHashMap<Page<?>>>();
+ usedPages = new HashMap<String, IntHashMap<Page>>();
RequestCycle.get().setMetaData(USED_PAGES, usedPages);
}
- IntHashMap<Page<?>> intHashMap = usedPages.get(pageMapName);
+ IntHashMap<Page> intHashMap = usedPages.get(pageMapName);
if (intHashMap == null)
{
- intHashMap = new IntHashMap<Page<?>>();
+ intHashMap = new IntHashMap<Page>();
usedPages.put(pageMapName, intHashMap);
}
return intHashMap;
@@ -724,7 +724,7 @@
* @see org.apache.wicket.protocol.http.HttpSessionStore#newVersionManager(org.apache.wicket.Page)
*/
@Override
- public <T> IPageVersionManager<T> newVersionManager(Page<T> page)
+ public <T> IPageVersionManager<T> newVersionManager(Page page)
{
return new SecondLevelCachePageVersionManager<T>(page);
}
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/protocol/http/TestFilePageStore.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/protocol/http/TestFilePageStore.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/protocol/http/TestFilePageStore.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/protocol/http/TestFilePageStore.java Thu Jun 19 09:52:58 2008
@@ -87,13 +87,13 @@
private final String pageMap;
private final String pageClassName;
- SessionPageKey(String sessionId, Page<?> page)
+ SessionPageKey(String sessionId, Page page)
{
this(sessionId, page.getNumericId(), page.getCurrentVersionNumber(),
page.getAjaxVersionNumber(), page.getPageMapName(), page.getClass());
}
- <T extends Page<?>> SessionPageKey(String sessionId, int id, int versionNumber,
+ <T extends Page> SessionPageKey(String sessionId, int id, int versionNumber,
int ajaxVersionNumber, String pagemap, Class<T> pageClass)
{
this.sessionId = sessionId;
@@ -143,7 +143,7 @@
}
- public <T> Page<T> getPage(String sessionId, String pagemap, int id, int versionNumber,
+ public <T> Page getPage(String sessionId, String pagemap, int id, int versionNumber,
int ajaxVersionNumber)
{
SessionPageKey currentKey = new SessionPageKey(sessionId, id, versionNumber,
@@ -171,7 +171,7 @@
bb.get(pageData);
}
long t2 = System.currentTimeMillis();
- Page<?> page = (Page<?>)Objects.byteArrayToObject(pageData);
+ Page page = (Page)Objects.byteArrayToObject(pageData);
page = page.getVersion(versionNumber);
if (page != null && log.isDebugEnabled())
{
@@ -182,7 +182,7 @@
" miliseconds to read in and " + (t3 - t2) + " miliseconds to deserialize");
}
@SuppressWarnings("unchecked")
- final Page<T> ret = (Page<T>)page;
+ final Page ret = (Page)page;
return ret;
}
catch (Exception e)
@@ -193,7 +193,7 @@
return null;
}
- public void pageAccessed(String sessionId, Page<?> page)
+ public void pageAccessed(String sessionId, Page page)
{
}
@@ -202,7 +202,7 @@
{
}
- public void storePage(String sessionId, Page<?> page)
+ public void storePage(String sessionId, Page page)
{
SessionPageKey key = new SessionPageKey(sessionId, page);
byte[] serialized = Objects.objectToByteArray(page);
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/protocol/http/WebApplication.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/protocol/http/WebApplication.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/protocol/http/WebApplication.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/protocol/http/WebApplication.java Thu Jun 19 09:52:58 2008
@@ -320,7 +320,7 @@
* @param bookmarkablePageClass
* the bookmarkable page class to mount
*/
- public final <T extends Page<?>> void mountBookmarkablePage(final String path,
+ public final <T extends Page> void mountBookmarkablePage(final String path,
final Class<T> bookmarkablePageClass)
{
mount(new BookmarkablePageRequestTargetUrlCodingStrategy(path, bookmarkablePageClass, null));
@@ -339,7 +339,7 @@
* @param bookmarkablePageClass
* the bookmarkable page class to mount
*/
- public final <T extends Page<?>> void mountBookmarkablePage(final String path,
+ public final <T extends Page> void mountBookmarkablePage(final String path,
final String pageMapName, final Class<T> bookmarkablePageClass)
{
mount(new BookmarkablePageRequestTargetUrlCodingStrategy(path, bookmarkablePageClass,
@@ -657,7 +657,7 @@
* page on which ajax response is made
* @return non-null ajax request target instance
*/
- public AjaxRequestTarget newAjaxRequestTarget(final Page<?> page)
+ public AjaxRequestTarget newAjaxRequestTarget(final Page page)
{
return new AjaxRequestTarget(page);
}
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/protocol/http/WebRequestCycle.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/protocol/http/WebRequestCycle.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/protocol/http/WebRequestCycle.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/protocol/http/WebRequestCycle.java Thu Jun 19 09:52:58 2008
@@ -126,7 +126,7 @@
* The page to redirect to
*/
@Override
- public final void redirectTo(final Page<?> page)
+ public final void redirectTo(final Page page)
{
String redirectUrl = null;
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/protocol/http/pagestore/AbstractPageStore.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/protocol/http/pagestore/AbstractPageStore.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/protocol/http/pagestore/AbstractPageStore.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/protocol/http/pagestore/AbstractPageStore.java Thu Jun 19 09:52:58 2008
@@ -80,7 +80,7 @@
*
* @param page
*/
- public SerializedPage(Page<?> page)
+ public SerializedPage(Page page)
{
pageId = page.getNumericId();
pageMapName = page.getPageMapName();
@@ -261,7 +261,7 @@
private final List<SerializedPage> completed = new ArrayList<SerializedPage>();
- public Object getPageReplacementObject(Page<?> callingPage)
+ public Object getPageReplacementObject(Page callingPage)
{
SerializedPage calling = new SerializedPage(callingPage);
@@ -314,16 +314,16 @@
* java.io.ObjectOutputStream)
*/
- public void serializePage(Page<?> page, ObjectOutputStream stream) throws IOException
+ public void serializePage(Page page, ObjectOutputStream stream) throws IOException
{
stream.defaultWriteObject();
}
- public void deserializePage(int id, String pageMapName, Page<?> page,
+ public void deserializePage(int id, String pageMapName, Page page,
ObjectInputStream stream) throws IOException, ClassNotFoundException
{
// get the page instance registry
- IntHashMap<Page<?>> pages = SecondLevelCacheSessionStore.getUsedPages(pageMapName);
+ IntHashMap<Page> pages = SecondLevelCacheSessionStore.getUsedPages(pageMapName);
// register the new page instance so that when the same page is being deserialized
// (curricular page references) we can use existing page instance (otherwise deadlock
// would happen)
@@ -345,7 +345,7 @@
private final int pageid;
private final String pagemap;
- PageHolder(Page<?> page)
+ PageHolder(Page page)
{
pageid = page.getNumericId();
pagemap = page.getPageMapName();
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/protocol/http/pagestore/DiskPageStore.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/protocol/http/pagestore/DiskPageStore.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/protocol/http/pagestore/DiskPageStore.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/protocol/http/pagestore/DiskPageStore.java Thu Jun 19 09:52:58 2008
@@ -679,7 +679,7 @@
* java.lang.String, int, int, int)
*/
- public <T> Page<T> getPage(String sessionId, String pagemap, int id, int versionNumber,
+ public <T> Page getPage(String sessionId, String pagemap, int id, int versionNumber,
int ajaxVersionNumber)
{
SessionEntry entry = getSessionEntry(sessionId, false);
@@ -706,7 +706,7 @@
if (data != null)
{
@SuppressWarnings("unchecked")
- final Page<T> ret = deserializePage(data, versionNumber);
+ final Page ret = deserializePage(data, versionNumber);
return ret;
}
}
@@ -718,7 +718,7 @@
* @see org.apache.wicket.protocol.http.SecondLevelCacheSessionStore.IPageStore#pageAccessed(java.lang.String,
* org.apache.wicket.Page)
*/
- public void pageAccessed(String sessionId, Page<?> page)
+ public void pageAccessed(String sessionId, Page page)
{
}
@@ -809,7 +809,7 @@
* @see org.apache.wicket.protocol.http.SecondLevelCacheSessionStore.IPageStore#storePage(java.lang.String,
* org.apache.wicket.Page)
*/
- public void storePage(String sessionId, Page<?> page)
+ public void storePage(String sessionId, Page page)
{
List<SerializedPage> pages = serializePage(page);
@@ -1151,11 +1151,11 @@
SerializedPageWithSession result = null;
if (page instanceof Page)
{
- result = serializedPagesCache.getPage((Page<?>)page);
+ result = serializedPagesCache.getPage((Page)page);
if (result == null)
{
- List<SerializedPage> serialized = serializePage((Page<?>)page);
- result = serializedPagesCache.storePage(sessionId, (Page<?>)page, serialized);
+ List<SerializedPage> serialized = serializePage((Page)page);
+ result = serializedPagesCache.storePage(sessionId, (Page)page, serialized);
}
}
else if (page instanceof SerializedPageWithSession)
@@ -1216,11 +1216,11 @@
}
}
- public Page<?> convertToPage(Object page)
+ public Page convertToPage(Object page)
{
if (page instanceof Page)
{
- return (Page<?>)page;
+ return (Page)page;
}
else if (page instanceof SerializedPageWithSession)
{
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/protocol/http/request/WebRequestCodingStrategy.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/protocol/http/request/WebRequestCodingStrategy.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/protocol/http/request/WebRequestCodingStrategy.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/protocol/http/request/WebRequestCodingStrategy.java Thu Jun 19 09:52:58 2008
@@ -721,7 +721,7 @@
final AppendingStringBuffer url = new AppendingStringBuffer(64);
// Get page Class
- final Class<? extends Page<?>> pageClass = requestTarget.getPageClass();
+ final Class<? extends Page> pageClass = requestTarget.getPageClass();
final Application application = Application.get();
// Find pagemap name
@@ -731,7 +731,7 @@
IRequestTarget currentTarget = requestCycle.getRequestTarget();
if (currentTarget instanceof IPageRequestTarget)
{
- Page<?> currentPage = ((IPageRequestTarget)currentTarget).getPage();
+ Page currentPage = ((IPageRequestTarget)currentTarget).getPage();
final IPageMap pageMap = currentPage.getPageMap();
if (pageMap.isDefault())
{
@@ -869,8 +869,8 @@
url.append('=');
// Get component and page for request target
- final Component<?> component = requestTarget.getTarget();
- final Page<?> page = component.getPage();
+ final Component component = requestTarget.getTarget();
+ final Page page = component.getPage();
// Add pagemap
final IPageMap pageMap = page.getPageMap();
@@ -938,7 +938,7 @@
protected CharSequence encode(RequestCycle requestCycle, IPageRequestTarget requestTarget)
{
// Get the page we want a url from:
- Page<?> page = requestTarget.getPage();
+ Page page = requestTarget.getPage();
// A url to a page is the IRedirectListener interface:
CharSequence urlRedirect = page.urlFor(IRedirectListener.INTERFACE);
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/request/AbstractRequestCycleProcessor.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/request/AbstractRequestCycleProcessor.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/request/AbstractRequestCycleProcessor.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/request/AbstractRequestCycleProcessor.java Thu Jun 19 09:52:58 2008
@@ -317,7 +317,7 @@
try
{
// Get the home page class
- Class<? extends Page<?>> homePageClass = application.getHomePage();
+ Class<? extends Page> homePageClass = application.getHomePage();
PageParameters parameters = new PageParameters(requestParameters.getParameters());
// and create a dummy target for looking up whether the home page is
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/request/target/coding/BookmarkablePageRequestTargetUrlCodingStrategy.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/request/target/coding/BookmarkablePageRequestTargetUrlCodingStrategy.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/request/target/coding/BookmarkablePageRequestTargetUrlCodingStrategy.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/request/target/coding/BookmarkablePageRequestTargetUrlCodingStrategy.java Thu Jun 19 09:52:58 2008
@@ -37,7 +37,7 @@
AbstractRequestTargetUrlCodingStrategy
{
/** bookmarkable page class. */
- protected final WeakReference<Class<? extends Page<?>>> bookmarkablePageClassRef;
+ protected final WeakReference<Class<? extends Page>> bookmarkablePageClassRef;
/** page map name. */
private final String pageMapName;
@@ -55,7 +55,7 @@
* @param pageMapName
* the page map name if any
*/
- public <C extends Page<?>> BookmarkablePageRequestTargetUrlCodingStrategy(
+ public <C extends Page> BookmarkablePageRequestTargetUrlCodingStrategy(
final String mountPath, final Class<C> bookmarkablePageClass, String pageMapName)
{
super(mountPath);
@@ -65,7 +65,7 @@
throw new IllegalArgumentException("Argument bookmarkablePageClass must be not null");
}
- bookmarkablePageClassRef = new WeakReference<Class<? extends Page<?>>>(
+ bookmarkablePageClassRef = new WeakReference<Class<? extends Page>>(
bookmarkablePageClass);
this.pageMapName = pageMapName;
}
@@ -117,7 +117,7 @@
else
{
return new BookmarkablePageRequestTarget(requestParameters.getPageMapName(),
- (Class<? extends Page<?>>)bookmarkablePageClassRef.get(), parameters);
+ (Class<? extends Page>)bookmarkablePageClassRef.get(), parameters);
}
}
@@ -158,7 +158,7 @@
if (requestTarget instanceof IBookmarkablePageRequestTarget)
{
IBookmarkablePageRequestTarget target = (IBookmarkablePageRequestTarget)requestTarget;
- if (((Class<? extends Page<?>>)bookmarkablePageClassRef.get()).equals(target.getPageClass()))
+ if (((Class<? extends Page>)bookmarkablePageClassRef.get()).equals(target.getPageClass()))
{
if (pageMapName == null)
{
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/request/target/component/BookmarkablePageRequestTarget.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/request/target/component/BookmarkablePageRequestTarget.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/request/target/component/BookmarkablePageRequestTarget.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/request/target/component/BookmarkablePageRequestTarget.java Thu Jun 19 09:52:58 2008
@@ -36,10 +36,10 @@
public class BookmarkablePageRequestTarget implements IBookmarkablePageRequestTarget
{
/** the page that was created in response for cleanup */
- private Page<?> page;
+ private Page page;
/** the class of the page. */
- private final WeakReference<Class<? extends Page<?>>> pageClassRef;
+ private final WeakReference<Class<? extends Page>> pageClassRef;
/** optional page map name. */
private final String pageMapName;
@@ -55,7 +55,7 @@
* @param pageClass
* the class of the page
*/
- public <C extends Page<?>> BookmarkablePageRequestTarget(Class<C> pageClass)
+ public <C extends Page> BookmarkablePageRequestTarget(Class<C> pageClass)
{
this(null, pageClass);
}
@@ -70,7 +70,7 @@
* @param pageParameters
* optional page parameters
*/
- public <C extends Page<?>> BookmarkablePageRequestTarget(Class<C> pageClass,
+ public <C extends Page> BookmarkablePageRequestTarget(Class<C> pageClass,
PageParameters pageParameters)
{
this(null, pageClass, pageParameters);
@@ -87,7 +87,7 @@
* @param pageClass
* the class of the page
*/
- public <C extends Page<?>> BookmarkablePageRequestTarget(String pageMapName, Class<C> pageClass)
+ public <C extends Page> BookmarkablePageRequestTarget(String pageMapName, Class<C> pageClass)
{
this(pageMapName, pageClass, null);
}
@@ -105,7 +105,7 @@
* @param pageParameters
* optional page parameters
*/
- public <C extends Page<?>> BookmarkablePageRequestTarget(String pageMapName,
+ public <C extends Page> BookmarkablePageRequestTarget(String pageMapName,
Class<C> pageClass, PageParameters pageParameters)
{
if (pageClass == null)
@@ -118,7 +118,7 @@
throw new IllegalArgumentException("Argument pageClass must be an instance of " +
Page.class.getName());
}
- pageClassRef = new WeakReference<Class<? extends Page<?>>>(pageClass);
+ pageClassRef = new WeakReference<Class<? extends Page>>(pageClass);
this.pageParameters = (pageParameters == null) ? new PageParameters() : pageParameters;
this.pageMapName = pageMapName;
}
@@ -166,12 +166,12 @@
/**
* @return The page that was created, null if the response did not happen yet
*/
- public final Page<?> getPage()
+ public final Page getPage()
{
return page;
}
- protected final void setPage(Page<?> page)
+ protected final void setPage(Page page)
{
this.page = page;
}
@@ -180,7 +180,7 @@
/**
* @see org.apache.wicket.request.target.component.IBookmarkablePageRequestTarget#getPageClass()
*/
- public final Class<? extends Page<?>> getPageClass()
+ public final Class<? extends Page> getPageClass()
{
return pageClassRef.get();
}
@@ -269,7 +269,7 @@
* request cycle
* @return new instance of page
*/
- protected <C extends Page<?>> Page<?> newPage(final Class<C> pageClass,
+ protected <C extends Page> Page newPage(final Class<C> pageClass,
final RequestCycle requestCycle)
{
// Construct a new instance using the default page factory
@@ -297,7 +297,7 @@
* the request cycle
* @return the page
*/
- protected final Page<?> getPage(RequestCycle requestCycle)
+ protected final Page getPage(RequestCycle requestCycle)
{
if (page == null && !requestCycle.isRedirect())
{
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/request/target/component/IBookmarkablePageRequestTarget.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/request/target/component/IBookmarkablePageRequestTarget.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/request/target/component/IBookmarkablePageRequestTarget.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/request/target/component/IBookmarkablePageRequestTarget.java Thu Jun 19 09:52:58 2008
@@ -34,7 +34,7 @@
*
* @return the page class
*/
- Class<? extends Page<?>> getPageClass();
+ Class<? extends Page> getPageClass();
/**
* Gets the optional page parameters.
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/request/target/component/listener/IListenerInterfaceRequestTarget.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/request/target/component/listener/IListenerInterfaceRequestTarget.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/request/target/component/listener/IListenerInterfaceRequestTarget.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/request/target/component/listener/IListenerInterfaceRequestTarget.java Thu Jun 19 09:52:58 2008
@@ -34,7 +34,7 @@
*
* @return the target component
*/
- Component<?> getTarget();
+ Component getTarget();
/**
* Gets listener method.
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/resource/loader/BundleStringResourceLoader.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/resource/loader/BundleStringResourceLoader.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/resource/loader/BundleStringResourceLoader.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/resource/loader/BundleStringResourceLoader.java Thu Jun 19 09:52:58 2008
@@ -89,7 +89,7 @@
* The key to obtain the string for
* @return The string resource value or null if resource not found
*/
- public final String loadStringResource(final Component< ? > component, final String key)
+ public final String loadStringResource(final Component component, final String key)
{
final Locale locale = (component != null) ? component.getLocale() : null;
return loadStringResource(null, key, locale, null);
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/resource/loader/ClassStringResourceLoader.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/resource/loader/ClassStringResourceLoader.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/resource/loader/ClassStringResourceLoader.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/resource/loader/ClassStringResourceLoader.java Thu Jun 19 09:52:58 2008
@@ -70,7 +70,7 @@
* java.lang.String)
*/
@Override
- public String loadStringResource(Component< ? > component, String key)
+ public String loadStringResource(Component component, String key)
{
if (component == null)
{
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/resource/loader/ComponentStringResourceLoader.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/resource/loader/ComponentStringResourceLoader.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/resource/loader/ComponentStringResourceLoader.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/resource/loader/ComponentStringResourceLoader.java Thu Jun 19 09:52:58 2008
@@ -170,7 +170,7 @@
* @see org.apache.wicket.resource.loader.IStringResourceLoader#loadStringResource(org.apache.wicket.Component,
* java.lang.String)
*/
- public String loadStringResource(final Component< ? > component, final String key)
+ public String loadStringResource(final Component component, final String key)
{
if (component == null)
{
@@ -226,7 +226,7 @@
* The component to evaluate
* @return The stack of classes
*/
- private List<Class< ? >> getComponentStack(final Component< ? > component)
+ private List<Class< ? >> getComponentStack(final Component component)
{
// Build the search stack
final List<Class< ? >> searchStack = new ArrayList<Class< ? >>();
@@ -235,7 +235,7 @@
if (!(component instanceof Page))
{
// Add all the component on the way to the Page
- MarkupContainer< ? > container = component.getParent();
+ MarkupContainer container = component.getParent();
while (container != null)
{
searchStack.add(container.getClass());
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/resource/loader/IStringResourceLoader.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/resource/loader/IStringResourceLoader.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/resource/loader/IStringResourceLoader.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/resource/loader/IStringResourceLoader.java Thu Jun 19 09:52:58 2008
@@ -77,5 +77,5 @@
* The key should be a String containing a lookup key into a resource bundle
* @return The string resource value or null if the resource could not be loaded by this loader
*/
- String loadStringResource(Component< ? > component, String key);
+ String loadStringResource(Component component, String key);
}
\ No newline at end of file
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/resource/loader/PackageStringResourceLoader.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/resource/loader/PackageStringResourceLoader.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/resource/loader/PackageStringResourceLoader.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/resource/loader/PackageStringResourceLoader.java Thu Jun 19 09:52:58 2008
@@ -119,7 +119,7 @@
* @see org.apache.wicket.resource.loader.IStringResourceLoader#loadStringResource(org.apache.wicket.Component,
* java.lang.String)
*/
- public String loadStringResource(final Component<?> component, final String key)
+ public String loadStringResource(final Component component, final String key)
{
if (component == null)
{
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/session/DefaultPageFactory.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/session/DefaultPageFactory.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/session/DefaultPageFactory.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/session/DefaultPageFactory.java Thu Jun 19 09:52:58 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/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/session/ISessionStore.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/session/ISessionStore.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/session/ISessionStore.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/session/ISessionStore.java Thu Jun 19 09:52:58 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/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/session/pagemap/AbstractPageMapEntry.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/session/pagemap/AbstractPageMapEntry.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/session/pagemap/AbstractPageMapEntry.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/session/pagemap/AbstractPageMapEntry.java Thu Jun 19 09:52:58 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/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/session/pagemap/IPageMapEntry.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/session/pagemap/IPageMapEntry.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/session/pagemap/IPageMapEntry.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/session/pagemap/IPageMapEntry.java Thu Jun 19 09:52:58 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/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/session/pagemap/LeastRecentlyAccessedEvictionStrategy.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/session/pagemap/LeastRecentlyAccessedEvictionStrategy.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/session/pagemap/LeastRecentlyAccessedEvictionStrategy.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/session/pagemap/LeastRecentlyAccessedEvictionStrategy.java Thu Jun 19 09:52:58 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/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/settings/IApplicationSettings.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/settings/IApplicationSettings.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/settings/IApplicationSettings.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/settings/IApplicationSettings.java Thu Jun 19 09:52:58 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/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/settings/Settings.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/settings/Settings.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/settings/Settings.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/settings/Settings.java Thu Jun 19 09:52:58 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/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/util/io/SerializableChecker.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/util/io/SerializableChecker.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/util/io/SerializableChecker.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/util/io/SerializableChecker.java Thu Jun 19 09:52:58 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/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/util/lang/Objects.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/util/lang/Objects.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/util/lang/Objects.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/util/lang/Objects.java Thu Jun 19 09:52:58 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/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/util/string/Strings.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/util/string/Strings.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/util/string/Strings.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/util/string/Strings.java Thu Jun 19 09:52:58 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/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java Thu Jun 19 09:52:58 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;
}
@@ -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();
@@ -375,7 +375,7 @@
{
private static final long serialVersionUID = 1L;
- public Page<?> getTestPage()
+ public Page getTestPage()
{
return new DummyPanelPage(testPanelSource);
}
@@ -397,7 +397,7 @@
{
private static final long serialVersionUID = 1L;
- public Page<?> getTestPage()
+ public Page getTestPage()
{
return new DummyPanelPage(new TestPanelSource()
{
@@ -449,11 +449,11 @@
*
* @param component
*/
- public void startComponent(Component<?> component)
+ public void startComponent(Component component)
{
if (component instanceof FormComponent)
{
- ((FormComponent<?>)component).processInput();
+ ((FormComponent)component).processInput();
}
component.beforeRender();
}
@@ -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: " +
@@ -521,7 +521,7 @@
* 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);
try
@@ -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
@@ -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");
@@ -836,7 +836,7 @@
if (c instanceof FormComponent)
{
- getParametersForNextRequest().put(((FormComponent<?>)c).getInputName(),
+ getParametersForNextRequest().put(((FormComponent)c).getInputName(),
new String[] { value.toString() });
}
else
@@ -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);
@@ -1242,7 +1242,7 @@
form.visitFormComponents(new FormComponent.AbstractVisitor()
{
@Override
- public void onFormComponent(FormComponent<?> formComponent)
+ public void onFormComponent(FormComponent formComponent)
{
// !(formComponent instanceof Button) &&
if (!(formComponent instanceof RadioGroup) &&
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/util/tester/FormTester.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/util/tester/FormTester.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/util/tester/FormTester.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/util/tester/FormTester.java Thu Jun 19 09:52:58 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)
{
@@ -97,7 +97,7 @@
}
}
- private final FormComponent<?> formComponent;
+ private final FormComponent formComponent;
/**
* Constructor.
@@ -105,7 +105,7 @@
* @param formComponent
* a <code>FormComponent</code>
*/
- protected ChoiceSelector(FormComponent<?> formComponent)
+ protected ChoiceSelector(FormComponent formComponent)
{
this.formComponent = formComponent;
}
@@ -118,7 +118,7 @@
* @param value
* a <code>String</code> value
*/
- protected abstract void assignValueToFormComponent(FormComponent<?> formComponent,
+ protected abstract void assignValueToFormComponent(FormComponent formComponent,
String value);
/**
@@ -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
{
@@ -229,7 +229,7 @@
* @param formComponent
* a <code>FormComponent</code>
*/
- protected MultipleChoiceSelector(FormComponent<?> formComponent)
+ protected MultipleChoiceSelector(FormComponent formComponent)
{
super(formComponent);
if (!allowMultipleChoice(formComponent))
@@ -245,7 +245,7 @@
* java.lang.String)
*/
@Override
- protected void assignValueToFormComponent(FormComponent<?> formComponent, String value)
+ protected void assignValueToFormComponent(FormComponent formComponent, String value)
{
// multiple selectable should retain selected option
addFormComponentValue(formComponent, value);
@@ -263,7 +263,7 @@
* @param formComponent
* a <code>FormComponent</code>
*/
- protected SingleChoiceSelector(FormComponent<?> formComponent)
+ protected SingleChoiceSelector(FormComponent formComponent)
{
super(formComponent);
}
@@ -273,7 +273,7 @@
* java.lang.String)
*/
@Override
- protected void assignValueToFormComponent(FormComponent<?> formComponent, String value)
+ protected void assignValueToFormComponent(FormComponent formComponent, String value)
{
// single selectable should overwrite already selected option
setFormComponentValue(formComponent, value);
@@ -287,7 +287,7 @@
* a <code>FormComponent</code>
* @return ChoiceSelector a <code>ChoiceSelector</code>
*/
- protected ChoiceSelector create(FormComponent<?> formComponent)
+ protected ChoiceSelector create(FormComponent formComponent)
{
if (formComponent == null)
{
@@ -318,7 +318,7 @@
* a <code>FormComponent</code>
* @return ChoiceSelector a <code>ChoiceSelector</code>
*/
- protected ChoiceSelector createForMultiple(FormComponent<?> formComponent)
+ protected ChoiceSelector createForMultiple(FormComponent formComponent)
{
return new MultipleChoiceSelector(formComponent);
}
@@ -330,7 +330,7 @@
* a <code>FormComponent</code>
* @return <code>true</code> if the given FormComponent allows multiple choice
*/
- private boolean allowMultipleChoice(FormComponent<?> formComponent)
+ private boolean allowMultipleChoice(FormComponent formComponent)
{
return formComponent instanceof CheckGroup ||
formComponent instanceof ListMultipleChoice;
@@ -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())
@@ -421,9 +421,9 @@
else if (formComponent instanceof CheckGroup)
{
final Collection<?> checkGroupValues = (Collection<?>)formComponent.getDefaultModelObject();
- formComponent.visitChildren(Check.class, new IVisitor<Component<?>>()
+ formComponent.visitChildren(Check.class, new IVisitor<Component>()
{
- public Object component(Component<?> component)
+ public Object component(Component component)
{
if (checkGroupValues.contains(component.getDefaultModelObject()))
{
@@ -442,9 +442,9 @@
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.getDefaultModelObject()))
{
@@ -481,10 +481,10 @@
*/
public String getTextComponentValue(String id)
{
- Component<?> c = getForm().get(id);
+ Component c = getForm().get(id);
if (c instanceof AbstractTextComponent)
{
- return ((AbstractTextComponent<?>)c).getValue();
+ return ((AbstractTextComponent)c).getValue();
}
return null;
}
@@ -506,7 +506,7 @@
public void select(String formComponentId, int index)
{
checkClosed();
- FormComponent<?> component = (FormComponent<?>)workingForm.get(formComponentId);
+ FormComponent component = (FormComponent)workingForm.get(formComponentId);
ChoiceSelector choiceSelector = choiceSelectorFactory.create(component);
choiceSelector.doSelect(index);
@@ -547,7 +547,7 @@
{
checkClosed();
- ChoiceSelector choiceSelector = choiceSelectorFactory.createForMultiple((FormComponent<?>)workingForm.get(formComponentId));
+ ChoiceSelector choiceSelector = choiceSelectorFactory.createForMultiple((FormComponent)workingForm.get(formComponentId));
for (int i = 0; i < indexes.length; i++)
{
@@ -568,14 +568,14 @@
{
checkClosed();
- Component<?> component = workingForm.get(formComponentId);
+ Component component = workingForm.get(formComponentId);
if (component instanceof IFormSubmittingComponent)
{
setFormSubmittingComponentValue((IFormSubmittingComponent)component, value);
}
else if (component instanceof FormComponent)
{
- setFormComponentValue((FormComponent<?>)component, value);
+ setFormComponentValue((FormComponent)component, value);
}
}
@@ -595,7 +595,7 @@
{
checkClosed();
- FormComponent<?> formComponent = (FormComponent<?>)workingForm.get(formComponentId);
+ FormComponent formComponent = (FormComponent)workingForm.get(formComponentId);
if (formComponent instanceof FileUploadField == false)
{
@@ -681,7 +681,7 @@
* @param value
* a value to add
*/
- private void addFormComponentValue(FormComponent<?> formComponent, String value)
+ private void addFormComponentValue(FormComponent formComponent, String value)
{
if (parameterExist(formComponent))
{
@@ -720,7 +720,7 @@
* a <code>FormComponent</code>
* @return <code>true</code> if the parameter exists in the <code>FormComponent</code>
*/
- private boolean parameterExist(FormComponent<?> formComponent)
+ private boolean parameterExist(FormComponent formComponent)
{
String parameter = baseWicketTester.getServletRequest().getParameter(
formComponent.getInputName());
@@ -735,7 +735,7 @@
* @param value
* a value to add
*/
- private void setFormComponentValue(FormComponent<?> formComponent, String value)
+ private void setFormComponentValue(FormComponent formComponent, String value)
{
baseWicketTester.getServletRequest().setParameter(formComponent.getInputName(), value);
}
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/util/tester/WicketTester.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/util/tester/WicketTester.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/util/tester/WicketTester.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/util/tester/WicketTester.java Thu Jun 19 09:52:58 2008
@@ -161,7 +161,7 @@
* @see org.apache.wicket.Application#getHomePage()
*/
@Override
- public Class< ? extends Page< ? >> getHomePage()
+ public Class< ? extends Page> getHomePage()
{
return DummyHomePage.class;
}
@@ -262,7 +262,7 @@
* @see org.apache.wicket.Application#getHomePage()
*/
@Override
- public Class< ? extends Page< ? >> getHomePage()
+ public Class< ? extends Page> getHomePage()
{
return homePage;
}
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/validation/IValidatorAddListener.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/validation/IValidatorAddListener.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/validation/IValidatorAddListener.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/validation/IValidatorAddListener.java Thu Jun 19 09:52:58 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/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/validation/validator/AbstractValidator.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/validation/validator/AbstractValidator.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/validation/validator/AbstractValidator.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/validation/validator/AbstractValidator.java Thu Jun 19 09:52:58 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/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/version/IPageVersionManager.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/version/IPageVersionManager.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/version/IPageVersionManager.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/version/IPageVersionManager.java Thu Jun 19 09:52:58 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/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/version/undo/Add.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/version/undo/Add.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/version/undo/Add.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/version/undo/Add.java Thu Jun 19 09:52:58 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/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/version/undo/ChangeList.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/version/undo/ChangeList.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/version/undo/ChangeList.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/version/undo/ChangeList.java Thu Jun 19 09:52:58 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));
}
@@ -61,7 +61,7 @@
* @param component
* the <code>Component</code> for which the <code>IModel</code> changed
*/
- <T> void componentModelChanging(Component<T> component)
+ <T> void componentModelChanging(Component component)
{
changes.add(new ModelChange<T>(component));
}
@@ -88,7 +88,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/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/version/undo/ModelChange.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/version/undo/ModelChange.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/version/undo/ModelChange.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/version/undo/ModelChange.java Thu Jun 19 09:52:58 2008
@@ -42,7 +42,7 @@
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;
@@ -54,7 +54,7 @@
* the subject <code>Component</code>
*/
@SuppressWarnings("unchecked")
- ModelChange(final Component<T> component)
+ ModelChange(final Component component)
{
if (component == null)
{
@@ -79,7 +79,7 @@
if (component instanceof FormComponent)
{
// and it's using the same model as the form
- if (((FormComponent<T>)component).getForm().getDefaultModel() == model)
+ if (((FormComponent)component).getForm().getDefaultModel() == model)
{
// we don't need to clone the model, because it will
// be re-initialized using initModel()