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/09/14 08:34:02 UTC
svn commit: r695125 - in
/wicket/trunk/wicket/src/main/java/org/apache/wicket:
protocol/http/pagestore/ protocol/http/request/
protocol/http/request/urlcompressing/ protocol/http/servlet/ request/
request/target/component/ session/pagemap/ util/io/ uti...
Author: ivaynberg
Date: Sat Sep 13 23:34:01 2008
New Revision: 695125
URL: http://svn.apache.org/viewvc?rev=695125&view=rev
Log:
more boring warnings cleanup
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/pagestore/AbstractPageStore.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/pagestore/DiskPageStore.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/pagestore/FileChannelPool.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/pagestore/PageWindowManager.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/pagestore/SerializedPagesCache.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/pagestore/SimpleSynchronousFilePageStore.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/request/WebRequestCodingStrategy.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/request/urlcompressing/UrlCompressor.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/MultipartServletWebRequest.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/AbstractRequestCycleProcessor.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/component/BookmarkableListenerInterfaceRequestTarget.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/session/pagemap/AbstractPageMapEntry.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/io/WicketObjectOutputStream.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/lang/PropertyResolverConverter.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/template/TextTemplateLink.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/DummyHomePage.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/WicketTester.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/WicketTesterHelper.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/value/IValueMap.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/version/IPageVersionManager.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/version/undo/ModelChange.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/version/undo/UndoPageVersionManager.java
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/pagestore/AbstractPageStore.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/pagestore/AbstractPageStore.java?rev=695125&r1=695124&r2=695125&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/pagestore/AbstractPageStore.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/pagestore/AbstractPageStore.java Sat Sep 13 23:34:01 2008
@@ -176,7 +176,6 @@
* page to be serialized
* @return list of {@link SerializedPage}s
*/
- @SuppressWarnings("unchecked")
protected List<SerializedPage> serializePage(Page page)
{
final List<SerializedPage> result = new ArrayList<SerializedPage>();
@@ -218,7 +217,6 @@
* kept
* @return page instance
*/
- @SuppressWarnings("unchecked")
protected Page deserializePage(byte[] data, int versionNumber)
{
boolean set = Page.serializer.get() == null;
@@ -319,8 +317,8 @@
stream.defaultWriteObject();
}
- public void deserializePage(int id, String pageMapName, Page page,
- ObjectInputStream stream) throws IOException, ClassNotFoundException
+ 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);
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/pagestore/DiskPageStore.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/pagestore/DiskPageStore.java?rev=695125&r1=695124&r2=695125&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/pagestore/DiskPageStore.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/pagestore/DiskPageStore.java Sat Sep 13 23:34:01 2008
@@ -705,7 +705,6 @@
if (data != null)
{
- @SuppressWarnings("unchecked")
final Page ret = deserializePage(data, versionNumber);
return ret;
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/pagestore/FileChannelPool.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/pagestore/FileChannelPool.java?rev=695125&r1=695124&r2=695125&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/pagestore/FileChannelPool.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/pagestore/FileChannelPool.java Sat Sep 13 23:34:01 2008
@@ -83,7 +83,7 @@
* @param createIfDoesNotExist
* in case the file does not exist this parameter determines if the file should be
* created
- * @return
+ * @return file channel or null
*/
private FileChannel newFileChannel(String fileName, boolean createIfDoesNotExist)
{
@@ -159,7 +159,7 @@
*
* @param fileName
* @param createIfDoesNotExist
- * @return
+ * @return file channel
*/
public synchronized FileChannel getFileChannel(String fileName, boolean createIfDoesNotExist)
{
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/pagestore/PageWindowManager.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/pagestore/PageWindowManager.java?rev=695125&r1=695124&r2=695125&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/pagestore/PageWindowManager.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/pagestore/PageWindowManager.java Sat Sep 13 23:34:01 2008
@@ -179,7 +179,7 @@
* @param pageId
* @param versionNumber
* @param ajaxVersionNumber
- * @return
+ * @return window index
*/
private int getWindowIndex(int pageId, int versionNumber, int ajaxVersionNumber)
{
@@ -205,7 +205,7 @@
* Increments the {@link #indexPointer}. If the maximum file size has been reached, the
* {@link #indexPointer} is set to 0.
*
- * @return
+ * @return new index pointer
*/
private int incrementIndexPointer()
{
@@ -225,7 +225,7 @@
* previous page offset and adding the previous page size to it.
*
* @param index
- * @return
+ * @return window file offset
*/
private int getWindowFileOffset(int index)
{
@@ -346,7 +346,7 @@
*
* @param index
* @param size
- * @return
+ * @return page window
*/
private PageWindowInternal allocatePageWindow(int index, int size)
{
@@ -445,7 +445,7 @@
* @param versionNumber
* @param ajaxVersionNumber
* @param size
- * @return
+ * @return page window
*/
public PageWindow createPageWindow(int pageId, int versionNumber, int ajaxVersionNumber,
int size)
@@ -560,7 +560,7 @@
* Returns last n saved page windows.
*
* @param count
- * @return
+ * @return list of page windows
*/
public synchronized List<PageWindow> getLastPageWindows(int count)
{
@@ -608,7 +608,7 @@
/**
* Returns the size of all saved pages
*
- * @return
+ * @return total size
*/
public int getTotalSize()
{
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/pagestore/SerializedPagesCache.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/pagestore/SerializedPagesCache.java?rev=695125&r1=695124&r2=695125&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/pagestore/SerializedPagesCache.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/pagestore/SerializedPagesCache.java Sat Sep 13 23:34:01 2008
@@ -128,7 +128,7 @@
/**
* Store the serialized page in cache
*
- * @return
+ * @return serialized page
* @param sessionId
* @param page
* @param pagesList
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/pagestore/SimpleSynchronousFilePageStore.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/pagestore/SimpleSynchronousFilePageStore.java?rev=695125&r1=695124&r2=695125&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/pagestore/SimpleSynchronousFilePageStore.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/pagestore/SimpleSynchronousFilePageStore.java Sat Sep 13 23:34:01 2008
@@ -100,7 +100,7 @@
* @param pageId
* @param versionNumber
* @param ajaxVersionNumber
- * @return
+ * @return page file
*/
private File getPageFile(File sessionDir, String pageMapName, int pageId, int versionNumber,
int ajaxVersionNumber)
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/request/WebRequestCodingStrategy.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/request/WebRequestCodingStrategy.java?rev=695125&r1=695124&r2=695125&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/request/WebRequestCodingStrategy.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/request/WebRequestCodingStrategy.java Sat Sep 13 23:34:01 2008
@@ -154,14 +154,13 @@
* map of path mounts for mount encoders on paths.
* <p>
* mountsOnPath is sorted by longest paths first to improve resolution of possible path
- * conflicts. <br />
- * For example: <br/> we mount Page1 on /page and Page2 on /page/test <br />
- * Page1 uses a parameters encoder that only encodes parameter values <br />
- * now suppose we want to access Page1 with a single parameter param="test". we have a url
- * collision since both pages can be access with /page/test <br />
- * the sorting by longest path first guarantees that the iterator will return the mount
- * /page/test before it returns mount /page therefore giving deterministic behavior to path
- * resolution by always trying to match the longest possible path first.
+ * conflicts. <br /> For example: <br/> we mount Page1 on /page and Page2 on /page/test <br />
+ * Page1 uses a parameters encoder that only encodes parameter values <br /> now suppose we want
+ * to access Page1 with a single parameter param="test". we have a url collision since both
+ * pages can be access with /page/test <br /> the sorting by longest path first guarantees that
+ * the iterator will return the mount /page/test before it returns mount /page therefore giving
+ * deterministic behavior to path resolution by always trying to match the longest possible path
+ * first.
* </p>
*/
private final MountsMap mountsOnPath;
@@ -206,11 +205,11 @@
parameters.setOnlyProcessIfPathActive(true);
}
- Map map = request.getParameterMap();
- Iterator iterator = map.keySet().iterator();
+ Map<String, String[]> map = request.getParameterMap();
+ Iterator<String> iterator = map.keySet().iterator();
while (iterator.hasNext())
{
- String key = (String)iterator.next();
+ String key = iterator.next();
if (key.startsWith(NAME_SPACE))
{
iterator.remove();
@@ -225,9 +224,9 @@
* Encode the given request target. If a mount is found, that mounted url will be returned.
* Otherwise, one of the delegation methods will be called. In case you are using custom targets
* that are not part of the default target hierarchy, you need to override
- * {@link #doEncode(RequestCycle, IRequestTarget)}, which will be called after the defaults
- * have been tried. When that doesn't provide a url either, an exception will be thrown saying
- * that encoding could not be done.
+ * {@link #doEncode(RequestCycle, IRequestTarget)}, which will be called after the defaults have
+ * been tried. When that doesn't provide a url either, an exception will be thrown saying that
+ * encoding could not be done.
*
* @see org.apache.wicket.request.IRequestCodingStrategy#encode(org.apache.wicket.RequestCycle,
* org.apache.wicket.IRequestTarget)
@@ -409,8 +408,7 @@
}
/**
- * @see org.apache.wicket.request.IRequestTargetMounter#mount(
- * org.apache.wicket.request.target.coding.IRequestTargetUrlCodingStrategy)
+ * @see org.apache.wicket.request.IRequestTargetMounter#mount(org.apache.wicket.request.target.coding.IRequestTargetUrlCodingStrategy)
*/
public final void mount(IRequestTargetUrlCodingStrategy encoder)
{
@@ -771,10 +769,10 @@
final PageParameters parameters = requestTarget.getPageParameters();
if (parameters != null)
{
- final Iterator iterator;
+ final Iterator<String> iterator;
if (UnitTestSettings.getSortUrlParameters())
{
- iterator = new TreeSet(parameters.keySet()).iterator();
+ iterator = new TreeSet<String>(parameters.keySet()).iterator();
}
else
{
@@ -782,7 +780,7 @@
}
while (iterator.hasNext())
{
- final String key = (String)iterator.next();
+ final String key = iterator.next();
final String values[] = parameters.getStringArray(key);
if (values != null)
{
@@ -827,10 +825,10 @@
if (map != null && map.size() > 0)
{
buffer.append('?');
- Iterator it = map.entrySet().iterator();
+ Iterator<Entry<String, String[]>> it = map.entrySet().iterator();
while (it.hasNext())
{
- Map.Entry entry = (Entry)it.next();
+ Map.Entry<String, String[]> entry = it.next();
buffer.append(entry.getKey());
buffer.append('=');
buffer.append(entry.getValue());
@@ -1151,8 +1149,8 @@
* Makes page map name url safe.
*
* Since the default page map name in wicket is null and null does not encode well into urls
- * this method will substitute null for a known token. If the <code>pageMapName</code> passed
- * in is not null it is returned without modification.
+ * this method will substitute null for a known token. If the <code>pageMapName</code> passed in
+ * is not null it is returned without modification.
*
* @param pageMapName
* page map name
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/request/urlcompressing/UrlCompressor.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/request/urlcompressing/UrlCompressor.java?rev=695125&r1=695124&r2=695125&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/request/urlcompressing/UrlCompressor.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/request/urlcompressing/UrlCompressor.java Sat Sep 13 23:34:01 2008
@@ -24,7 +24,6 @@
import org.apache.wicket.Component;
import org.apache.wicket.IClusterable;
import org.apache.wicket.util.collections.IntHashMap;
-import org.apache.wicket.util.collections.IntHashMap.Entry;
/**
@@ -82,7 +81,7 @@
}
}
- private static class IntKeyWeakReference extends WeakReference
+ private static class IntKeyWeakReference extends WeakReference<Object>
{
private final int uid;
@@ -91,7 +90,7 @@
* @param referent
* @param q
*/
- public IntKeyWeakReference(int uid, Object referent, ReferenceQueue q)
+ public IntKeyWeakReference(int uid, Object referent, ReferenceQueue<Object> q)
{
super(referent, q);
this.uid = uid;
@@ -100,9 +99,14 @@
private static final long serialVersionUID = 1L;
- private transient ReferenceQueue queue = new ReferenceQueue();
+ private transient ReferenceQueue<Object> queue = new ReferenceQueue<Object>();
- private transient IntHashMap directComponentRefs = new IntHashMap(); // uid->component/interface
+ private transient IntHashMap<ComponentAndInterface> directComponentRefs = new IntHashMap<ComponentAndInterface>(); // uid
+ // -
+ // >
+ // component
+ // /
+ // interface
private int uid = 1;
@@ -120,7 +124,7 @@
directComponentRefs.remove(ref.uid);
}
int uid = Integer.parseInt(uidString);
- ComponentAndInterface cai = (ComponentAndInterface)directComponentRefs.get(uid);
+ ComponentAndInterface cai = directComponentRefs.get(uid);
return cai;
}
@@ -145,11 +149,12 @@
public int getUIDForComponentAndInterface(Component component, String interfaceName)
{
int uid = 0;
- Iterator it = directComponentRefs.entrySet().iterator();
+ Iterator<IntHashMap.Entry<ComponentAndInterface>> it = directComponentRefs.entrySet()
+ .iterator();
while (it.hasNext())
{
- IntHashMap.Entry entry = (IntHashMap.Entry)it.next();
- ComponentAndInterface cai = (ComponentAndInterface)entry.getValue();
+ IntHashMap.Entry<ComponentAndInterface> entry = it.next();
+ ComponentAndInterface cai = entry.getValue();
if (cai.getInterfaceName().equals(interfaceName) && cai.getComponent() == component)
{
uid = entry.getKey();
@@ -170,8 +175,8 @@
s.defaultReadObject();
int size = s.readInt();
- queue = new ReferenceQueue();
- directComponentRefs = new IntHashMap((int)(size * 1.25));
+ queue = new ReferenceQueue<Object>();
+ directComponentRefs = new IntHashMap<ComponentAndInterface>((int)(size * 1.25));
while (--size >= 0)
{
@@ -197,13 +202,14 @@
s.writeInt(directComponentRefs.size());
- Iterator it = directComponentRefs.entrySet().iterator();
+ Iterator<IntHashMap.Entry<ComponentAndInterface>> it = directComponentRefs.entrySet()
+ .iterator();
while (it.hasNext())
{
- IntHashMap.Entry entry = (Entry)it.next();
+ IntHashMap.Entry<ComponentAndInterface> entry = it.next();
s.writeInt(entry.getKey());
- ComponentAndInterface cai = (ComponentAndInterface)entry.getValue();
+ ComponentAndInterface cai = entry.getValue();
s.writeObject(cai.getComponent());
s.writeUTF(cai.getInterfaceName());
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/MultipartServletWebRequest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/MultipartServletWebRequest.java?rev=695125&r1=695124&r2=695125&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/MultipartServletWebRequest.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/MultipartServletWebRequest.java Sat Sep 13 23:34:01 2008
@@ -19,6 +19,7 @@
import java.io.IOException;
import java.io.InputStream;
import java.io.UnsupportedEncodingException;
+import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -48,7 +49,7 @@
public class MultipartServletWebRequest extends ServletWebRequest implements IMultipartWebRequest
{
/** Map of file items. */
- private final ValueMap files = new ValueMap();
+ private final Map<String, FileItem> files = new HashMap<String, FileItem>();
/** Map of parameters. */
private final ValueMap parameters = new ValueMap();
@@ -74,7 +75,7 @@
* Thrown if something goes wrong with upload
*/
public MultipartServletWebRequest(HttpServletRequest request, Bytes maxSize)
- throws FileUploadException
+ throws FileUploadException
{
super(request);
@@ -108,12 +109,13 @@
upload.setSizeMax(maxSize.bytes());
- final List items;
+ final List<FileItem> items;
if (wantUploadProgressUpdates())
{
ServletRequestContext ctx = new ServletRequestContext(request)
{
+ @Override
public InputStream getInputStream() throws IOException
{
return new CountingInputStream(super.getInputStream());
@@ -132,10 +134,10 @@
}
// Loop through items
- for (Iterator i = items.iterator(); i.hasNext();)
+ for (Iterator<FileItem> i = items.iterator(); i.hasNext();)
{
// Get next item
- final FileItem item = (FileItem)i.next();
+ final FileItem item = i.next();
// If item is a form field
if (item.isFormField())
@@ -200,7 +202,7 @@
/**
* @return Returns the files.
*/
- public Map getFiles()
+ public Map<String, FileItem> getFiles()
{
return files;
}
@@ -214,12 +216,13 @@
*/
public FileItem getFile(final String fieldName)
{
- return (FileItem)files.get(fieldName);
+ return files.get(fieldName);
}
/**
* @see org.apache.wicket.protocol.http.WebRequest#getParameter(java.lang.String)
*/
+ @Override
public String getParameter(final String key)
{
String[] val = (String[])parameters.get(key);
@@ -229,7 +232,8 @@
/**
* @see org.apache.wicket.protocol.http.WebRequest#getParameterMap()
*/
- public Map getParameterMap()
+ @Override
+ public Map<String, Object> getParameterMap()
{
return parameters;
}
@@ -237,6 +241,7 @@
/**
* @see org.apache.wicket.protocol.http.WebRequest#getParameters(java.lang.String)
*/
+ @Override
public String[] getParameters(final String key)
{
return (String[])parameters.get(key);
@@ -305,6 +310,7 @@
/**
* @see java.io.InputStream#read()
*/
+ @Override
public int read() throws IOException
{
int read = in.read();
@@ -316,6 +322,7 @@
/**
* @see java.io.InputStream#read(byte[])
*/
+ @Override
public int read(byte[] b) throws IOException
{
int read = in.read(b);
@@ -327,6 +334,7 @@
/**
* @see java.io.InputStream#read(byte[], int, int)
*/
+ @Override
public int read(byte[] b, int off, int len) throws IOException
{
int read = in.read(b, off, len);
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/AbstractRequestCycleProcessor.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/AbstractRequestCycleProcessor.java?rev=695125&r1=695124&r2=695125&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/request/AbstractRequestCycleProcessor.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/AbstractRequestCycleProcessor.java Sat Sep 13 23:34:01 2008
@@ -127,14 +127,14 @@
// render?
// else we need to make a page (see below) or set it hard to a
// redirect.
- Class accessDeniedPageClass = application.getApplicationSettings()
+ Class<? extends Page> accessDeniedPageClass = application.getApplicationSettings()
.getAccessDeniedPage();
throw new RestartResponseAtInterceptPageException(accessDeniedPageClass);
}
else if (e instanceof PageExpiredException)
{
- Class pageExpiredErrorPageClass = application.getApplicationSettings()
+ Class<? extends Page> pageExpiredErrorPageClass = application.getApplicationSettings()
.getPageExpiredErrorPage();
boolean mounted = isPageMounted(pageExpiredErrorPageClass);
RequestCycle.get().setRedirect(mounted);
@@ -148,9 +148,10 @@
requestCycle.setRedirect(false);
// figure out which error page to show
- Class internalErrorPageClass = application.getApplicationSettings()
+ Class<? extends Page> internalErrorPageClass = application.getApplicationSettings()
.getInternalErrorPage();
- Class responseClass = responsePage != null ? responsePage.getClass() : null;
+ Class<? extends Page> responseClass = responsePage != null ? responsePage.getClass()
+ : null;
if (responseClass != internalErrorPageClass &&
settings.getUnexpectedExceptionDisplay() == IExceptionSettings.SHOW_INTERNAL_ERROR_PAGE)
@@ -183,7 +184,7 @@
* the <code>Class</code> of the <code>Page</code> to be checked
* @return true if the given <code>pageClass</code> is mounted, false otherwise
*/
- private boolean isPageMounted(Class /* <? extends Page> */pageClass)
+ private boolean isPageMounted(Class<? extends Page> pageClass)
{
RequestCycle cycle = RequestCycle.get();
CharSequence path = getRequestCodingStrategy().pathForTarget(
@@ -226,15 +227,17 @@
* the request parameters object
* @return the bookmarkable page as a request target
*/
+ @SuppressWarnings("unchecked")
protected IRequestTarget resolveBookmarkablePage(final RequestCycle requestCycle,
final RequestParameters requestParameters)
{
String bookmarkablePageClass = requestParameters.getBookmarkablePageClass();
Session session = requestCycle.getSession();
- Class pageClass;
+ Class<? extends Page> pageClass;
try
{
- pageClass = session.getClassResolver().resolveClass(bookmarkablePageClass);
+ pageClass = (Class<? extends Page>)session.getClassResolver().resolveClass(
+ bookmarkablePageClass);
}
catch (ClassNotFoundException e)
{
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/component/BookmarkableListenerInterfaceRequestTarget.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/component/BookmarkableListenerInterfaceRequestTarget.java?rev=695125&r1=695124&r2=695125&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/component/BookmarkableListenerInterfaceRequestTarget.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/component/BookmarkableListenerInterfaceRequestTarget.java Sat Sep 13 23:34:01 2008
@@ -52,8 +52,9 @@
* @param interfaceName
* @param versionNumber
*/
- public BookmarkableListenerInterfaceRequestTarget(String pageMapName, Class pageClass,
- PageParameters pageParameters, String componentPath, String interfaceName, int versionNumber)
+ public BookmarkableListenerInterfaceRequestTarget(String pageMapName,
+ Class<? extends Page> pageClass, PageParameters pageParameters, String componentPath,
+ String interfaceName, int versionNumber)
{
super(pageMapName, pageClass, pageParameters);
this.componentPath = componentPath;
@@ -73,8 +74,8 @@
* @param component
* @param listenerInterface
*/
- public BookmarkableListenerInterfaceRequestTarget(String pageMapName, Class pageClass,
- PageParameters pageParameters, Component component,
+ public BookmarkableListenerInterfaceRequestTarget(String pageMapName,
+ Class<? extends Page> pageClass, PageParameters pageParameters, Component component,
RequestListenerInterface listenerInterface)
{
this(pageMapName, pageClass, pageParameters, component.getPath(),
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=695125&r1=695124&r2=695125&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 Sep 13 23:34:01 2008
@@ -52,10 +52,9 @@
*
* @see org.apache.wicket.session.pagemap.IPageMapEntry#getPageClass()
*/
- @SuppressWarnings("unchecked")
public Class<? extends Page> getPageClass()
{
- return (Class<? extends Page>)getPage().getClass();
+ return getPage().getClass();
}
/**
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/util/io/WicketObjectOutputStream.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/io/WicketObjectOutputStream.java?rev=695125&r1=695124&r2=695125&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/util/io/WicketObjectOutputStream.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/util/io/WicketObjectOutputStream.java Sat Sep 13 23:34:01 2008
@@ -625,6 +625,7 @@
/**
* @see java.io.ObjectOutputStream#writeFields()
*/
+ @SuppressWarnings("deprecation")
@Override
public void writeFields() throws IOException
{
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/util/lang/PropertyResolverConverter.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/lang/PropertyResolverConverter.java?rev=695125&r1=695124&r2=695125&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/util/lang/PropertyResolverConverter.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/util/lang/PropertyResolverConverter.java Sat Sep 13 23:34:01 2008
@@ -51,7 +51,8 @@
* @param clz
* @return The converted object
*/
- public Object convert(Object object, Class/* <?> */clz)
+ @SuppressWarnings("unchecked")
+ public Object convert(Object object, Class<?> clz)
{
if (object == null)
{
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=695125&r1=695124&r2=695125&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 Sep 13 23:34:01 2008
@@ -26,9 +26,11 @@
* useful for creating dynamic JNLP descriptors, among other things.
*
* @author Jonathan Locke
+ * @param <T>
+ * type of model object
* @since 1.2.6
*/
-public class TextTemplateLink extends ResourceLink
+public class TextTemplateLink<T> extends ResourceLink<T>
{
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=695125&r1=695124&r2=695125&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 Sep 13 23:34:01 2008
@@ -72,8 +72,8 @@
/**
* A helper class to ease unit testing of Wicket applications without the need for a servlet
- * container. See javadoc of <code>WicketTester</code> for example usage. This class can be used
- * as is, but JUnit users should use derived class <code>WicketTester</code>.
+ * container. See javadoc of <code>WicketTester</code> for example usage. This class can be used as
+ * is, but JUnit users should use derived class <code>WicketTester</code>.
*
* @see WicketTester
*
@@ -139,8 +139,8 @@
}
/**
- * Creates <code>WicketTester</code> and automatically create a <code>WebApplication</code>,
- * but the tester will have no home page.
+ * Creates <code>WicketTester</code> and automatically create a <code>WebApplication</code>, but
+ * the tester will have no home page.
*/
public BaseWicketTester()
{
@@ -202,8 +202,8 @@
* @param application
* a <code>WicketTester</code> <code>WebApplication</code> object
* @param path
- * the absolute path on disk to the <code>WebApplication</code>'s contents (e.g.
- * war root) - may be <code>null</code>
+ * 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)
@@ -214,9 +214,9 @@
}
/**
- * Renders a <code>Page</code> defined in <code>TestPageSource</code>. This is usually used
- * when a page does not have default constructor. For example, a <code>ViewBook</code> page
- * requires a <code>Book</code> instance:
+ * Renders a <code>Page</code> defined in <code>TestPageSource</code>. This is usually used when
+ * a page does not have default constructor. For example, a <code>ViewBook</code> page requires
+ * a <code>Book</code> instance:
*
* <pre>
* tester.startPage(new TestPageSource()
@@ -350,9 +350,9 @@
}
/**
- * 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.
+ * 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()
@@ -523,7 +523,7 @@
*/
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");
@@ -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();
@@ -769,7 +769,7 @@
*/
if (link instanceof BookmarkablePageLink)
{
- BookmarkablePageLink bookmarkablePageLink = (BookmarkablePageLink)link;
+ BookmarkablePageLink<?> bookmarkablePageLink = (BookmarkablePageLink<?>)link;
try
{
Field parametersField = BookmarkablePageLink.class.getDeclaredField("parameters");
@@ -810,8 +810,8 @@
}
/**
- * Sets a parameter for the <code>Component</code> with the given path to be used with the
- * next request.
+ * Sets a parameter for the <code>Component</code> with the given path to be used with the next
+ * request.
* <p>
* NOTE: this method only works when a <code>Page</code> was rendered first.
*
@@ -875,8 +875,8 @@
/**
* Asserts last rendered <code>Page</code> against an expected HTML document.
* <p>
- * Use <code>-Dwicket.replace.expected.results=true</code> to automatically replace the
- * expected output file.
+ * Use <code>-Dwicket.replace.expected.results=true</code> to automatically replace the expected
+ * output file.
* </p>
*
* @param pageClass
@@ -978,8 +978,8 @@
}
/**
- * Dumps the <code>Component</code> trees to log. Show only the <code>Component</code>s
- * whose paths contain the filter <code>String</code>.
+ * Dumps the <code>Component</code> trees to log. Show only the <code>Component</code>s whose
+ * paths contain the filter <code>String</code>.
*
* @param filter
* a filter <code>String</code>
@@ -999,13 +999,13 @@
}
/**
- * Tests that a <code>Component</code> has been added to a <code>AjaxRequestTarget</code>,
- * using {@link AjaxRequestTarget#addComponent(Component)}. This method actually tests that a
+ * Tests that a <code>Component</code> has been added to a <code>AjaxRequestTarget</code>, using
+ * {@link AjaxRequestTarget#addComponent(Component)}. This method actually tests that a
* <code>Component</code> is on the Ajax response sent back to the client.
* <p>
- * PLEASE NOTE! This method doesn't actually insert the <code>Component</code> in the client
- * DOM tree, using Javascript. But it shouldn't be needed because you have to trust that the
- * Wicket Ajax Javascript just works.
+ * PLEASE NOTE! This method doesn't actually insert the <code>Component</code> in the client DOM
+ * tree, using Javascript. But it shouldn't be needed because you have to trust that the Wicket
+ * Ajax Javascript just works.
*
* @param component
* the <code>Component</code> to test
@@ -1092,8 +1092,8 @@
* ...
* </pre>
*
- * You can then test that the code inside <code>onEvent</code> actually does what it's
- * supposed to, using the <code>WicketTester</code>:
+ * You can then test that the code inside <code>onEvent</code> actually does what it's supposed
+ * to, using the <code>WicketTester</code>:
*
* <pre>
* ...
@@ -1105,17 +1105,16 @@
* This also works with <code>AjaxFormSubmitBehavior</code>, where it will "submit" the
* <code>Form</code> before executing the command.
* <p>
- * PLEASE NOTE! This method doesn't actually insert the <code>Component</code> in the client
- * DOM tree, using Javascript.
+ * PLEASE NOTE! This method doesn't actually insert the <code>Component</code> in the client DOM
+ * tree, using Javascript.
*
*
* @param component
- * the <code>Component</code> that has the <code>AjaxEventBehavior</code> we want
- * to test. If the <code>Component</code> is <code>null</code>, the test will
- * fail.
+ * the <code>Component</code> that has the <code>AjaxEventBehavior</code> we want to
+ * test. If the <code>Component</code> is <code>null</code>, the test will fail.
* @param event
- * the event to simulate being fired. If <code>event</code> is <code>null</code>,
- * the test will fail.
+ * 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)
{
@@ -1187,8 +1186,8 @@
/**
* Retrieves a <code>TagTester</code> based on a <code>wicket:id</code>. If more
- * <code>Component</code>s exist with the same <code>wicket:id</code> in the markup, only
- * the first one is returned.
+ * <code>Component</code>s exist with the same <code>wicket:id</code> in the markup, only the
+ * first one is returned.
*
* @param wicketId
* the <code>wicket:id</code> to search for
@@ -1201,8 +1200,8 @@
}
/**
- * Retrieves a <code>TagTester</code> based on an DOM id. If more <code>Component</code>s
- * exist with the same id in the markup, only the first one is returned.
+ * Retrieves a <code>TagTester</code> based on an DOM id. If more <code>Component</code>s exist
+ * with the same id in the markup, only the first one is returned.
*
* @param id
* the DOM id to search for.
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=695125&r1=695124&r2=695125&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 Sep 13 23:34:01 2008
@@ -31,7 +31,7 @@
private transient ITestPageSource testPageSource;
- private final Link testPageLink;
+ private final Link<?> testPageLink;
/**
* Constructor.
@@ -59,7 +59,7 @@
*
* @return the test page <code>Link</code>
*/
- public Link getTestPageLink()
+ public Link<?> getTestPageLink()
{
return testPageLink;
}
@@ -67,7 +67,7 @@
/**
* <code>TestLink</code> class.
*/
- public class TestLink extends Link
+ public class TestLink extends Link<Void>
{
private static final long serialVersionUID = 1L;
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=695125&r1=695124&r2=695125&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 Sep 13 23:34:01 2008
@@ -114,8 +114,8 @@
* </pre>
*
* <code>tester.clickLink(path);</code> will simulate user click on the component (in this case,
- * it's a <code>Link</code>) and render the response page <code>YourPage</code>. Ok, unit test
- * of <code>MyPage</code> is completed. Now we test <code>YourPage</code> standalone:
+ * it's a <code>Link</code>) and render the response page <code>YourPage</code>. Ok, unit test of
+ * <code>MyPage</code> is completed. Now we test <code>YourPage</code> standalone:
*
* <pre>
* //test code
@@ -140,8 +140,8 @@
* {@link org.apache.wicket.util.tester.ITestPageSource} to provide testing page instance for
* <code>WicketTester</code>. This is necessary because <code>YourPage</code> uses a custom
* constructor, which is very common for transferring model data, but cannot be instantiated by
- * reflection. Finally, we use <code>assertInfoMessages</code> to assert there is a feedback
- * message "Wicket Rocks ;-)" at the INFO level.
+ * reflection. Finally, we use <code>assertInfoMessages</code> to assert there is a feedback message
+ * "Wicket Rocks ;-)" at the INFO level.
*
* TODO General: Example usage of FormTester
*
@@ -310,8 +310,8 @@
* the absolute path on disk to the web application'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 WicketTester(final WebApplication application, final String path)
{
@@ -361,13 +361,13 @@
}
/**
- * Tests that a <code>Component</code> has been added to a <code>AjaxRequestTarget</code>,
- * using {@link AjaxRequestTarget#addComponent(Component)}. This method actually tests that a
+ * Tests that a <code>Component</code> has been added to a <code>AjaxRequestTarget</code>, using
+ * {@link AjaxRequestTarget#addComponent(Component)}. This method actually tests that a
* <code>Component</code> is on the Ajax response sent back to the client.
* <p>
- * PLEASE NOTE! This method doesn't actually insert the <code>Component</code> in the client
- * DOM tree, using Javascript. But it shouldn't be needed because you just have to trust that
- * Wicket Ajax Javascript works.
+ * PLEASE NOTE! This method doesn't actually insert the <code>Component</code> in the client DOM
+ * tree, using Javascript. But it shouldn't be needed because you just have to trust that Wicket
+ * Ajax Javascript works.
*
* @param component
* a <code>Component</code> to be tested
@@ -379,13 +379,13 @@
}
/**
- * Tests that a <code>Component</code> has been added to a <code>AjaxRequestTarget</code>,
- * using {@link AjaxRequestTarget#addComponent(Component)}. This method actually tests that a
+ * Tests that a <code>Component</code> has been added to a <code>AjaxRequestTarget</code>, using
+ * {@link AjaxRequestTarget#addComponent(Component)}. This method actually tests that a
* <code>Component</code> is on the Ajax response sent back to the client.
* <p>
- * PLEASE NOTE! This method doesn't actually insert the <code>Component</code> in the client
- * DOM tree, using Javascript. But it shouldn't be needed because you just have to trust that
- * Wicket Ajax Javascript works.
+ * PLEASE NOTE! This method doesn't actually insert the <code>Component</code> in the client DOM
+ * tree, using Javascript. But it shouldn't be needed because you just have to trust that Wicket
+ * Ajax Javascript works.
*
* @param componentPath
* a <code>Component</code> path to test
@@ -485,7 +485,7 @@
@Override
public void assertListView(String path, List<?> expectedList)
{
- ListView listView = (ListView)getComponentFromLastRenderedPage(path);
+ ListView<?> listView = (ListView<?>)getComponentFromLastRenderedPage(path);
WicketTesterHelper.assertEquals(expectedList, listView.getList());
}
@@ -494,7 +494,7 @@
*/
public void assertNoErrorMessage()
{
- List messages = getMessages(FeedbackMessage.ERROR);
+ List<Serializable> messages = getMessages(FeedbackMessage.ERROR);
Assert.assertTrue("expect no error message, but contains\n" +
WicketTesterHelper.asLined(messages), messages.isEmpty());
}
@@ -504,7 +504,7 @@
*/
public void assertNoInfoMessage()
{
- List messages = getMessages(FeedbackMessage.INFO);
+ List<Serializable> messages = getMessages(FeedbackMessage.INFO);
Assert.assertTrue("expect no info message, but contains\n" +
WicketTesterHelper.asLined(messages), messages.isEmpty());
}
@@ -517,7 +517,7 @@
* @param expectedPageClass
* expected <code>Page</code> class to link
*/
- public void assertPageLink(String path, Class expectedPageClass)
+ public void assertPageLink(String path, Class<? extends Page> expectedPageClass)
{
assertResult(isPageLink(path, expectedPageClass));
}
@@ -528,7 +528,7 @@
* @param expectedRenderedPageClass
* expected class of last rendered <code>Page</code>
*/
- public void assertRenderedPage(Class expectedRenderedPageClass)
+ public void assertRenderedPage(Class<? extends Page> expectedRenderedPageClass)
{
assertResult(isRenderedPage(expectedRenderedPageClass));
}
@@ -536,18 +536,17 @@
/**
* Asserts last-rendered <code>Page</code> against an expected HTML document.
* <p>
- * Use <code>-Dwicket.replace.expected.results=true</code> to automatically replace the
- * expected output file.
+ * Use <code>-Dwicket.replace.expected.results=true</code> to automatically replace the expected
+ * output file.
*
* @param clazz
- * <code>Class</code> used to load the file (relative to <code>clazz</code>
- * package)
+ * <code>Class</code> used to load the file (relative to <code>clazz</code> package)
* @param filename
* expected output filename <code>String</code>
* @throws Exception
*/
@Override
- public void assertResultPage(final Class clazz, final String filename) throws Exception
+ public void assertResultPage(final Class<?> clazz, final String filename) throws Exception
{
String document = getServletResponse().getDocument();
setupRequestAndResponse();
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=695125&r1=695124&r2=695125&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 Sep 13 23:34:01 2008
@@ -67,11 +67,11 @@
*/
public static List<WicketTesterHelper.ComponentData> getComponentData(final Page page)
{
- final List data = new ArrayList();
+ final List<ComponentData> data = new ArrayList<ComponentData>();
if (page != null)
{
- page.visitChildren(new IVisitor()
+ page.visitChildren(new IVisitor<Component>()
{
public Object component(final Component component)
{
@@ -114,7 +114,7 @@
* @param actuals
* a <code>Collection</code> object
*/
- public static void assertEquals(final Collection expects, final Collection actuals)
+ public static void assertEquals(final Collection<?> expects, final Collection<?> actuals)
{
if (!expects.containsAll(actuals) || !actuals.containsAll(expects))
{
@@ -130,7 +130,8 @@
* @param actuals
* a <code>Collection</code> object
*/
- public static void failWithVerboseMessage(final Collection expects, final Collection actuals)
+ public static void failWithVerboseMessage(final Collection<?> expects,
+ final Collection<?> actuals)
{
Assert.fail("\nexpect (" + expects.size() + "):\n" + asLined(expects) + "\nbut was (" +
actuals.size() + "):\n" + asLined(actuals));
@@ -143,10 +144,10 @@
* a <code>Collection</code> object
* @return a <code>String</code> representation of the <code>Collection</code>
*/
- public static String asLined(final Collection objects)
+ public static String asLined(final Collection<?> objects)
{
StringBuffer lined = new StringBuffer();
- for (Iterator iter = objects.iterator(); iter.hasNext();)
+ for (Iterator<?> iter = objects.iterator(); iter.hasNext();)
{
String objectString = iter.next().toString();
lined.append(" ");
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/util/value/IValueMap.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/value/IValueMap.java?rev=695125&r1=695124&r2=695125&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/util/value/IValueMap.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/util/value/IValueMap.java Sat Sep 13 23:34:01 2008
@@ -190,19 +190,19 @@
boolean isImmutable();
/**
- * Makes this <code>IValueMap</code> immutable by changing the underlying map representation
- * to a <code>Collections.unmodifiableMap</code>. After calling this method, any attempt to
- * modify this <code>IValueMap</code> will result in a <code>RuntimeException</code> being
- * thrown by the <code>Collections</code> framework.
+ * Makes this <code>IValueMap</code> immutable by changing the underlying map representation to
+ * a <code>Collections.unmodifiableMap</code>. After calling this method, any attempt to modify
+ * this <code>IValueMap</code> will result in a <code>RuntimeException</code> being thrown by
+ * the <code>Collections</code> framework.
*
* @return this <code>IValueMap</code>
*/
IValueMap makeImmutable();
/**
- * Provided that the hash key is a <code>String</code> and you need to access the value
- * ignoring the key's case (upper- or lowercase letters), then you may use this method to get
- * the correct writing.
+ * Provided that the hash key is a <code>String</code> and you need to access the value ignoring
+ * the key's case (upper- or lowercase letters), then you may use this method to get the correct
+ * writing.
*
* @param key
* the key
@@ -379,6 +379,9 @@
/**
* Retrieves an <code>Enum</code> value by key.
*
+ * @param <T>
+ * type of enum
+ *
* @param key
* the key
*
@@ -394,6 +397,9 @@
/**
* Retrieves an <code>Enum</code> value by key.
*
+ * @param <T>
+ * type of enum
+ *
* @param key
* the key
*
@@ -409,6 +415,9 @@
/**
* Retrieves an <code>Enum</code> value by key.
*
+ * @param <T>
+ * type of enum
+ *
* @param key
* the key
*
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=695125&r1=695124&r2=695125&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 Sep 13 23:34:01 2008
@@ -42,8 +42,6 @@
* retrieved by calling <code>getCurrentVersionNumber</code>.
*
* @author Jonathan Locke
- * @param <T>
- * type of page
* @since 1.2.6
*/
public interface IPageVersionManager extends IClusterable
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=695125&r1=695124&r2=695125&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 Sep 13 23:34:01 2008
@@ -30,8 +30,6 @@
* An <code>IModel</code> change operation.
*
* @author Jonathan Locke
- * @param <T>
- * type of component's model object
* @since 1.2.6
*/
class ModelChange extends Change
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=695125&r1=695124&r2=695125&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 Sep 13 23:34:01 2008
@@ -30,8 +30,6 @@
* managed.
*
* @author Jonathan Locke
- * @param <T>
- * Type of Page
* @since 1.2.6
*/
public class UndoPageVersionManager implements IPageVersionManager