Author: thrantal
Date: Tue Jul 15 20:29:21 2008
New Revision: 677142
URL: http://svn.apache.org/viewvc?rev=677142&view=rev
Log:
Added some missing type parameters.
Modified:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/debug/LiveSessionsPage.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/source/SourcesPage.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/upload/MultiUploadPage.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/upload/UploadPage.java
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/Palette.java
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/component/Recorder.java
Modified:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/debug/LiveSessionsPage.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/debug/LiveSessionsPage.java?rev=677142&r1=677141&r2=677142&view=diff
==============================================================================
---
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/debug/LiveSessionsPage.java
(original)
+++
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/debug/LiveSessionsPage.java
Tue Jul 15 20:29:21 2008
@@ -34,8 +34,8 @@
import org.apache.wicket.model.Model;
import org.apache.wicket.protocol.http.IRequestLogger;
import org.apache.wicket.protocol.http.RequestLogger;
-import org.apache.wicket.protocol.http.WebApplication;
import org.apache.wicket.protocol.http.RequestLogger.SessionData;
+import org.apache.wicket.protocol.http.WebApplication;
import org.apache.wicket.util.lang.Bytes;
@@ -55,7 +55,7 @@
add(new ApplicationView("application", Application.get()));
- Link link = new Link("togglelink")
+ Link<Void> link = new Link<Void>("togglelink")
{
private static final long serialVersionUID = 1L;
@@ -142,7 +142,7 @@
protected void populateItem(ListItem<SessionData> item)
{
final SessionData sd = item.getModelObject();
- Link link = new Link("id")
+ Link<Void> link = new Link<Void>("id")
{
private static final long
serialVersionUID = 1L;
Modified:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/source/SourcesPage.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/source/SourcesPage.java?rev=677142&r1=677141&r2=677142&view=diff
==============================================================================
---
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/source/SourcesPage.java
(original)
+++
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/source/SourcesPage.java
Tue Jul 15 20:29:21 2008
@@ -33,6 +33,8 @@
import java.util.jar.JarEntry;
import java.util.jar.JarFile;
+import com.uwyn.jhighlight.renderer.Renderer;
+import com.uwyn.jhighlight.renderer.XhtmlRendererFactory;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.wicket.Component;
@@ -53,9 +55,6 @@
import org.apache.wicket.util.string.AppendingStringBuffer;
import org.apache.wicket.util.string.Strings;
-import com.uwyn.jhighlight.renderer.Renderer;
-import com.uwyn.jhighlight.renderer.XhtmlRendererFactory;
-
/**
* Displays the resources in a packages directory in a browsable format.
@@ -376,7 +375,7 @@
@Override
protected void populateItem(ListItem<String>
item)
{
- AjaxFallbackLink link = new
AjaxFallbackLink("link", item.getModel())
+ AjaxFallbackLink<String> link = new
AjaxFallbackLink<String>("link", item.getModel())
{
@Override
public void
onClick(AjaxRequestTarget target)
Modified:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/upload/MultiUploadPage.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/upload/MultiUploadPage.java?rev=677142&r1=677141&r2=677142&view=diff
==============================================================================
---
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/upload/MultiUploadPage.java
(original)
+++
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/upload/MultiUploadPage.java
Tue Jul 15 20:29:21 2008
@@ -92,7 +92,7 @@
/**
* Form for uploads.
*/
- private class FileUploadForm extends Form
+ private class FileUploadForm extends Form<Void>
{
// collection that will hold uploaded FileUpload objects
private final Collection<FileUpload> uploads = new
ArrayList<FileUpload>();
Modified:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/upload/UploadPage.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/upload/UploadPage.java?rev=677142&r1=677141&r2=677142&view=diff
==============================================================================
---
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/upload/UploadPage.java
(original)
+++
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/upload/UploadPage.java
Tue Jul 15 20:29:21 2008
@@ -89,7 +89,7 @@
/**
* Form for uploads.
*/
- private class FileUploadForm extends Form
+ private class FileUploadForm extends Form<Void>
{
private FileUploadField fileUploadField;
Modified:
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/Palette.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/Palette.java?rev=677142&r1=677141&r2=677142&view=diff
==============================================================================
---
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/Palette.java
(original)
+++
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/Palette.java
Tue Jul 15 20:29:21 2008
@@ -400,12 +400,12 @@
*/
protected Component newSelectionComponent()
{
- return new Selection("selection", this)
+ return new Selection<T>("selection", this)
{
private static final long serialVersionUID = 1L;
@Override
- protected Map getAdditionalAttributes(Object choice)
+ protected Map<String,String>
getAdditionalAttributes(Object choice)
{
return
Palette.this.getAdditionalAttributesForSelection(choice);
}
@@ -413,9 +413,9 @@
}
/**
- * @see
org.apache.wicket.extensions.markup.html.form.palette.component.Selection#getAdditionalAttributes()
+ * @see
org.apache.wicket.extensions.markup.html.form.palette.component.Selection#getAdditionalAttributes(Object)
*/
- protected Map getAdditionalAttributesForSelection(Object choice)
+ protected Map<String,String> getAdditionalAttributesForSelection(Object
choice)
{
return null;
}
@@ -427,12 +427,12 @@
*/
protected Component newChoicesComponent()
{
- return new Choices("choices", this)
+ return new Choices<T>("choices", this)
{
private static final long serialVersionUID = 1L;
@Override
- protected Map getAdditionalAttributes(Object choice)
+ protected Map<String,String>
getAdditionalAttributes(Object choice)
{
return
Palette.this.getAdditionalAttributesForChoices(choice);
}
@@ -440,9 +440,9 @@
}
/**
- * @see
org.apache.wicket.extensions.markup.html.form.palette.component.Selection#getAdditionalAttributes()
+ * @see
org.apache.wicket.extensions.markup.html.form.palette.component.Selection#getAdditionalAttributes(Object)
*/
- protected Map getAdditionalAttributesForChoices(Object choice)
+ protected Map<String,String> getAdditionalAttributesForChoices(Object
choice)
{
return null;
}
Modified:
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/component/Recorder.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/component/Recorder.java?rev=677142&r1=677141&r2=677142&view=diff
==============================================================================
---
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/component/Recorder.java
(original)
+++
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/component/Recorder.java
Tue Jul 15 20:29:21 2008
@@ -16,6 +16,7 @@
*/
package org.apache.wicket.extensions.markup.html.form.palette.component;
+import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
@@ -71,7 +72,7 @@
{
super(id);
this.palette = palette;
- setDefaultModel(new Model());
+ setDefaultModel(new Model<Serializable>());
setOutputMarkupId(true);
}
@@ -137,7 +138,7 @@
List<T> selected = new ArrayList<T>(ids.length);
for (int i = 0; i < ids.length; i++)
{
- Iterator<T> it = getPalette().getChoices().iterator();
+ Iterator<? extends T> it =
getPalette().getChoices().iterator();
while (it.hasNext())
{
final T choice = it.next();
@@ -154,7 +155,6 @@
/**
* @return iterator over unselected choices
*/
- @SuppressWarnings("unchecked")
public Iterator<T> getUnselectedChoices()
{
IChoiceRenderer<T> renderer = getPalette().getChoiceRenderer();
@@ -162,7 +162,7 @@
if (choices.size() - ids.length == 0)
{
- return Collections.EMPTY_LIST.iterator();
+ return Collections.<T>emptyList().iterator();
}
List<T> unselected = new ArrayList<T>(Math.max(1,
choices.size() - ids.length));
