Author: thrantal
Date: Tue Sep 16 20:02:42 2008
New Revision: 696140
URL: http://svn.apache.org/viewvc?rev=696140&view=rev
Log:
WICKET-1745 : adding missing generic type parameters to IModel usage
- and to some generified component usage as well
- and added some missing @Overrides too
- no functional changes
Added:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/tree/WicketTreeModel.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/model/util/GenericBaseModel.java
- copied, changed from r695336,
wicket/trunk/wicket/src/main/java/org/apache/wicket/model/util/AbstractCollectionModel.java
Removed:
wicket/trunk/wicket/src/main/java/org/apache/wicket/model/util/AbstractCollectionModel.java
Modified:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/OnChangeAjaxBehaviorPage.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/RatingsPage.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/compref/SelectPage.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/frames/BodyFrame.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/stockquote/StockQuoteLabel.java
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/basic/SmartLinkLabel.java
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/basic/SmartLinkMultiLineLabel.java
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/SelectOptions.java
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTable.java
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/PropertyColumn.java
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterForm.java
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tabs/TabbedPanel.java
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/DefaultAbstractTree.java
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/rating/RatingPanel.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/tree/LabelTree.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/tree/LinkTree.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/model/util/CollectionModel.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/model/util/ListModel.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/model/util/MapModel.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/model/util/SetModel.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/model/util/WildcardCollectionModel.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/model/util/WildcardListModel.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/model/util/WildcardSetModel.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/request/target/coding/StatelessPage.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/util/lang/ObjectsTest.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/apps_1/CreateBook.java
Modified:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/OnChangeAjaxBehaviorPage.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/OnChangeAjaxBehaviorPage.java?rev=696140&r1=696139&r2=696140&view=diff
==============================================================================
---
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/OnChangeAjaxBehaviorPage.java
(original)
+++
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/OnChangeAjaxBehaviorPage.java
Tue Sep 16 20:02:42 2008
@@ -63,13 +63,13 @@
*/
public OnChangeAjaxBehaviorPage()
{
- Form form = new Form("form");
+ Form<Void> form = new Form<Void>("form");
add(form);
- final TextField field = new TextField("field", new Model(""));
+ final TextField<String> field = new TextField<String>("field",
new Model<String>(""));
form.add(field);
- final Label label = new Label("selectedValue", new Model(""));
+ final Label label = new Label("selectedValue", new
Model<String>(""));
label.setOutputMarkupId(true);
form.add(label);
Modified:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/RatingsPage.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/RatingsPage.java?rev=696140&r1=696139&r2=696140&view=diff
==============================================================================
---
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/RatingsPage.java
(original)
+++
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/RatingsPage.java
Tue Sep 16 20:02:42 2008
@@ -51,7 +51,7 @@
/**
* Link to reset the ratings.
*/
- private final class ResetRatingLink extends Link
+ private final class ResetRatingLink extends Link<RatingModel>
{
/** For serialization. */
private static final long serialVersionUID = 1L;
@@ -64,7 +64,7 @@
* @param object
* the model to reset.
*/
- public ResetRatingLink(String id, IModel object)
+ public ResetRatingLink(String id, IModel<RatingModel> object)
{
super(id, object);
}
@@ -72,9 +72,10 @@
/**
* @see Link#onClick()
*/
+ @Override
public void onClick()
{
- RatingModel rating =
(RatingModel)getDefaultModelObject();
+ RatingModel rating = getModelObject();
rating.nrOfVotes = 0;
rating.rating = 0;
rating.sumOfRatings = 0;
@@ -167,38 +168,44 @@
*/
public RatingsPage()
{
- add(new RatingPanel("rating1", new PropertyModel(rating1,
"rating"), 5, new PropertyModel(
+ add(new RatingPanel("rating1", new
PropertyModel<Integer>(rating1, "rating"), 5, new PropertyModel<Integer>(
rating1, "nrOfVotes"), true)
{
+ @Override
protected boolean onIsStarActive(int star)
{
return RatingsPage.rating1.isActive(star);
}
+ @Override
protected void onRated(int rating, AjaxRequestTarget
target)
{
RatingsPage.rating1.addRating(rating);
}
});
- add(new RatingPanel("rating2", new PropertyModel(rating2,
"rating"),
- new Model(5), new
PropertyModel(rating2, "nrOfVotes"),
- new PropertyModel(this,
"hasVoted"), true)
+ add(new RatingPanel("rating2", new
PropertyModel<Integer>(rating2, "rating"),
+ new Model<Integer>(5),
new PropertyModel<Integer>(rating2, "nrOfVotes"),
+ new
PropertyModel<Boolean>(this, "hasVoted"), true)
{
+ @Override
protected String getActiveStarUrl(int iteration)
{
return
getRequestCycle().urlFor(WICKETSTAR1).toString();
}
+ @Override
protected String getInactiveStarUrl(int iteration)
{
return
getRequestCycle().urlFor(WICKETSTAR0).toString();
}
+ @Override
protected boolean onIsStarActive(int star)
{
return RatingsPage.rating2.isActive(star);
}
+ @Override
protected void onRated(int rating, AjaxRequestTarget
target)
{
// make sure the user can't vote again
@@ -206,8 +213,8 @@
RatingsPage.rating2.addRating(rating);
}
});
- add(new ResetRatingLink("reset1", new Model(rating1)));
- add(new ResetRatingLink("reset2", new Model(rating2)));
+ add(new ResetRatingLink("reset1", new
Model<RatingModel>(rating1)));
+ add(new ResetRatingLink("reset2", new
Model<RatingModel>(rating2)));
}
/**
Modified:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/compref/SelectPage.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/compref/SelectPage.java?rev=696140&r1=696139&r2=696140&view=diff
==============================================================================
---
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/compref/SelectPage.java
(original)
+++
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/compref/SelectPage.java
Tue Sep 16 20:02:42 2008
@@ -16,11 +16,7 @@
*/
package org.apache.wicket.examples.compref;
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.List;
+import java.util.*;
import org.apache.wicket.IClusterable;
import org.apache.wicket.examples.WicketExamplePage;
@@ -33,6 +29,7 @@
import org.apache.wicket.model.CompoundPropertyModel;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
+import org.apache.wicket.model.util.WildcardCollectionModel;
/**
@@ -44,12 +41,11 @@
public class SelectPage extends WicketExamplePage
{
/** available sites for selection. */
- private static final List<String> SITES = Arrays.asList(new String[] {
"The Server Side",
- "Java Lobby", "Java.Net" });
+ private static final List<String> SITES = Arrays.asList("The Server
Side", "Java Lobby", "Java.Net");
/** available choices for large selection box. */
- private static final List<String> MANY_CHOICES = Arrays.asList(new
String[] { "Choice1",
- "Choice2", "Choice3", "Choice4", "Choice5", "Choice6",
"Choice7", "Choice8", "Choice9", });
+ private static final List<? extends String> MANY_CHOICES =
Arrays.asList("Choice1",
+ "Choice2", "Choice3", "Choice4", "Choice5", "Choice6",
"Choice7", "Choice8", "Choice9");
/**
* Constructor
@@ -83,7 +79,7 @@
Select choices = new Select("choices");
form.add(choices);
- IOptionRenderer renderer = new IOptionRenderer()
+ IOptionRenderer<String> renderer = new IOptionRenderer<String>()
{
public String getDisplayValue(Object object)
@@ -91,14 +87,14 @@
return object.toString();
}
- public IModel<Serializable> getModel(Object value)
+ public IModel<String> getModel(Object value)
{
- return new
Model<Serializable>((Serializable)value);
+ return new Model<String>((String) value);
}
};
- choices.add(new SelectOptions("manychoices", new
Model((Serializable)MANY_CHOICES),
- renderer));
+ IModel<Collection<? extends String>> model = new
WildcardCollectionModel<String>(MANY_CHOICES);
+ choices.add(new SelectOptions<String>("manychoices", model,
renderer));
}
Modified:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/frames/BodyFrame.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/frames/BodyFrame.java?rev=696140&r1=696139&r2=696140&view=diff
==============================================================================
---
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/frames/BodyFrame.java
(original)
+++
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/frames/BodyFrame.java
Tue Sep 16 20:02:42 2008
@@ -16,8 +16,6 @@
*/
package org.apache.wicket.examples.frames;
-import java.io.Serializable;
-
import org.apache.wicket.AttributeModifier;
import org.apache.wicket.PageMap;
import org.apache.wicket.RequestCycle;
@@ -71,11 +69,11 @@
// create a new page instance, passing this 'master page' as an
argument
LeftFrame leftFrame = new LeftFrame(this);
// get the url to that page
- CharSequence leftFrameSrc =
RequestCycle.get().urlFor(leftFrame);
+ String leftFrameSrc =
RequestCycle.get().urlFor(leftFrame).toString();
// and create a simple component that modifies it's src
attribute to
// hold the url to that frame
WebComponent leftFrameTag = new WebComponent("leftFrame");
- leftFrameTag.add(new AttributeModifier("src", new
Model((Serializable)leftFrameSrc)));
+ leftFrameTag.add(new AttributeModifier("src", new
Model<String>(leftFrameSrc)));
add(leftFrameTag);
// make a simple component for the right frame tag
Modified:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/stockquote/StockQuoteLabel.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/stockquote/StockQuoteLabel.java?rev=696140&r1=696139&r2=696140&view=diff
==============================================================================
---
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/stockquote/StockQuoteLabel.java
(original)
+++
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/stockquote/StockQuoteLabel.java
Tue Sep 16 20:02:42 2008
@@ -47,7 +47,7 @@
}
/**
- * Convenience constructor. Same as StockQuoteLabel(String, new
Model(String))
+ * Convenience constructor. Same as StockQuoteLabel(String, new
Model<String>(String))
*
* @param id
* See Component
Modified:
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/basic/SmartLinkLabel.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/basic/SmartLinkLabel.java?rev=696140&r1=696139&r2=696140&view=diff
==============================================================================
---
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/basic/SmartLinkLabel.java
(original)
+++
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/basic/SmartLinkLabel.java
Tue Sep 16 20:02:42 2008
@@ -43,16 +43,15 @@
/**
* @see Label#Label(String, String)
*/
- @SuppressWarnings("unchecked")
public SmartLinkLabel(String name, String label)
{
- this(name, new Model(label));
+ this(name, new Model<String>(label));
}
/**
* @see Label#Label(String, IModel)
*/
- public SmartLinkLabel(String name, IModel<?> model)
+ public SmartLinkLabel(String name, IModel<String> model)
{
super(name, model);
}
Modified:
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/basic/SmartLinkMultiLineLabel.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/basic/SmartLinkMultiLineLabel.java?rev=696140&r1=696139&r2=696140&view=diff
==============================================================================
---
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/basic/SmartLinkMultiLineLabel.java
(original)
+++
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/basic/SmartLinkMultiLineLabel.java
Tue Sep 16 20:02:42 2008
@@ -43,16 +43,15 @@
/**
* @see MultiLineLabel#MultiLineLabel(String, String)
*/
- @SuppressWarnings("unchecked")
public SmartLinkMultiLineLabel(String name, String label)
{
- this(name, new Model(label));
+ this(name, new Model<String>(label));
}
/**
* @see MultiLineLabel#MultiLineLabel(String, IModel)
*/
- public SmartLinkMultiLineLabel(String name, IModel<?> model)
+ public SmartLinkMultiLineLabel(String name, IModel<String> model)
{
super(name, model);
}
Modified:
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/SelectOptions.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/SelectOptions.java?rev=696140&r1=696139&r2=696140&view=diff
==============================================================================
---
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/SelectOptions.java
(original)
+++
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/SelectOptions.java
Tue Sep 16 20:02:42 2008
@@ -16,8 +16,6 @@
*/
package org.apache.wicket.extensions.markup.html.form.select;
-import java.io.Serializable;
-import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
@@ -27,7 +25,7 @@
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.repeater.RepeatingView;
import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.Model;
+import org.apache.wicket.model.util.WildcardCollectionModel;
/**
@@ -72,11 +70,9 @@
* @param elements
* @param renderer
*/
- @SuppressWarnings("unchecked")
public SelectOptions(String id, Collection<? extends T> elements,
IOptionRenderer<T> renderer)
{
- this(id, new Model((elements instanceof Serializable) ?
(Serializable)elements
- : new ArrayList<T>(elements)), renderer);
+ this(id, new WildcardCollectionModel<T>(elements), renderer);
}
/**
Modified:
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTable.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTable.java?rev=696140&r1=696139&r2=696140&view=diff
==============================================================================
---
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTable.java
(original)
+++
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTable.java
Tue Sep 16 20:02:42 2008
@@ -53,8 +53,8 @@
*
* IColumn[] columns = new IColumn[2];
*
- * columns[0] = new PropertyColumn(new Model("First Name"),
"name.first", "name.first");
- * columns[1] = new PropertyColumn(new Model("Last Name"),
"name.last");
+ * columns[0] = new PropertyColumn(new Model<String>("First
Name"), "name.first", "name.first");
+ * columns[1] = new PropertyColumn(new Model<String>("Last
Name"), "name.last");
*
* DataTable table = new DataTable("datatable", columns, new
UserProvider(), 10);
* table.add(new NavigationToolbar(table));
Modified:
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/PropertyColumn.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/PropertyColumn.java?rev=696140&r1=696139&r2=696140&view=diff
==============================================================================
---
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/PropertyColumn.java
(original)
+++
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/PropertyColumn.java
Tue Sep 16 20:02:42 2008
@@ -31,7 +31,7 @@
* Example
*
* <pre>
- * columns[0] = new PropertyColumn(new Model("First Name"),
"name.first");
+ * columns[0] = new PropertyColumn(new Model<String>("First
Name"), "name.first");
* </pre>
*
* The above will attach a label to the cell with a property model for the
expression
Modified:
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterForm.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterForm.java?rev=696140&r1=696139&r2=696140&view=diff
==============================================================================
---
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterForm.java
(original)
+++
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterForm.java
Tue Sep 16 20:02:42 2008
@@ -54,7 +54,7 @@
this.locator = locator;
// add hidden field used for managing current focus
- hidden = new HiddenField("focus-tracker", new Model());
+ hidden = new HiddenField<String>("focus-tracker", new
Model<String>());
hidden.add(new AbstractBehavior()
{
@@ -109,7 +109,7 @@
* @param fc
* form component
*/
- public final void enableFocusTracking(FormComponent fc)
+ public final void enableFocusTracking(FormComponent<?> fc)
{
fc.add(new AbstractBehavior()
{
Modified:
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tabs/TabbedPanel.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tabs/TabbedPanel.java?rev=696140&r1=696139&r2=696140&view=diff
==============================================================================
---
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tabs/TabbedPanel.java
(original)
+++
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tabs/TabbedPanel.java
Tue Sep 16 20:02:42 2008
@@ -47,7 +47,7 @@
*
* List tabs=new ArrayList();
*
- * tabs.add(new AbstractTab(new Model("first tab")) {
+ * tabs.add(new AbstractTab(new Model<String>("first tab")) {
*
* public Panel getPanel(String panelId)
* {
Modified:
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/DefaultAbstractTree.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/DefaultAbstractTree.java?rev=696140&r1=696139&r2=696140&view=diff
==============================================================================
---
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/DefaultAbstractTree.java
(original)
+++
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/DefaultAbstractTree.java
Tue Sep 16 20:02:42 2008
@@ -16,17 +16,10 @@
*/
package org.apache.wicket.extensions.markup.html.tree;
-import java.io.Serializable;
-
import javax.swing.tree.TreeModel;
import javax.swing.tree.TreeNode;
-import org.apache.wicket.Component;
-import org.apache.wicket.IClusterable;
-import org.apache.wicket.MarkupContainer;
-import org.apache.wicket.RequestCycle;
-import org.apache.wicket.ResourceReference;
-import org.apache.wicket.Response;
+import org.apache.wicket.*;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.AjaxFallbackLink;
import org.apache.wicket.ajax.markup.html.AjaxLink;
@@ -36,8 +29,8 @@
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.markup.html.tree.AbstractTree;
+import org.apache.wicket.markup.html.tree.WicketTreeModel;
import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.Model;
import org.apache.wicket.util.lang.EnumeratedType;
/**
@@ -50,8 +43,7 @@
* use [EMAIL PROTECTED] Tree}
* <p>
* This class allows you to choose between 3 types of links. [EMAIL PROTECTED]
- * DefaultAbstractTree#setLinkType(org
- * .apache.wicket.extensions.markup.html.tree.DefaultAbstractTree.LinkType)}
+ *
DefaultAbstractTree#setLinkType(org.apache.wicket.extensions.markup.html.tree.DefaultAbstractTree.LinkType)}
*
* @author Matej Knopp
*/
@@ -162,7 +154,7 @@
{
super(id, model);
init();
- };
+ }
/**
* Tree constructor.
@@ -175,7 +167,8 @@
@SuppressWarnings("unchecked")
public DefaultAbstractTree(String id, TreeModel model)
{
- super(id, new Model((Serializable)model));
+ super(id, new WicketTreeModel());
+ setModelObject(model);
init();
}
@@ -233,7 +226,7 @@
protected ResourceReference getFolderOpen()
{
return FOLDER_OPEN;
- };
+ }
/**
* Returns the resource reference of default tree item (not folder).
@@ -294,8 +287,7 @@
private static final long serialVersionUID = 1L;
/**
- * @see
org.apache.wicket.MarkupContainer#onComponentTagBody(org.apache.wicket.markup.
- * MarkupStream,
org.apache.wicket.markup.ComponentTag)
+ * @see
org.apache.wicket.MarkupContainer#onComponentTagBody(org.apache.wicket.markup.MarkupStream,
org.apache.wicket.markup.ComponentTag)
*/
@Override
protected void onComponentTagBody(MarkupStream
markupStream, ComponentTag openTag)
@@ -484,8 +476,7 @@
private static final long serialVersionUID = 1L;
/**
- * @see
org.apache.wicket.ajax.markup.html.AjaxLink#onClick(org.apache.wicket.ajax.
- * AjaxRequestTarget)
+ * @see
org.apache.wicket.ajax.markup.html.AjaxLink#onClick(org.apache.wicket.ajax.AjaxRequestTarget)
*/
@Override
public void onClick(AjaxRequestTarget target)
@@ -501,8 +492,7 @@
private static final long serialVersionUID = 1L;
/**
- * @see
org.apache.wicket.ajax.markup.html.AjaxFallbackLink#onClick(org.apache.wicket
- * .ajax.AjaxRequestTarget)
+ * @see
org.apache.wicket.ajax.markup.html.AjaxFallbackLink#onClick(org.apache.wicket.ajax.AjaxRequestTarget)
*/
@Override
public void onClick(AjaxRequestTarget target)
Modified:
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/rating/RatingPanel.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/rating/RatingPanel.java?rev=696140&r1=696139&r2=696140&view=diff
==============================================================================
---
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/rating/RatingPanel.java
(original)
+++
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/rating/RatingPanel.java
Tue Sep 16 20:02:42 2008
@@ -98,19 +98,21 @@
/** For serialization. */
private static final long serialVersionUID = 1L;
- private RatingStarBar(String id, IModel model)
+ private RatingStarBar(String id, IModel<Integer> model)
{
super(id, model);
}
+ @Override
protected void populateItem(LoopItem item)
{
// Use an AjaxFallbackLink for rating to make voting
work even
// without Ajax.
- AjaxFallbackLink link = new AjaxFallbackLink("link")
+ AjaxFallbackLink<Void> link = new
AjaxFallbackLink<Void>("link")
{
private static final long serialVersionUID = 1L;
+ @Override
public void onClick(AjaxRequestTarget target)
{
LoopItem item = (LoopItem)getParent();
@@ -128,9 +130,10 @@
}
}
+ @Override
public boolean isEnabled()
{
- return
!((Boolean)hasVoted.getObject()).booleanValue();
+ return !hasVoted.getObject();
}
};
@@ -164,17 +167,17 @@
/**
* The number of stars that need to be shown, should result in an
Integer object.
*/
- private IModel nrOfStars = new Model(new Integer(5));
+ private IModel<Integer> nrOfStars = new Model<Integer>(5);
/**
* The number of votes that have been cast, should result in an Integer
object.
*/
- private IModel nrOfVotes;
+ private IModel<Integer> nrOfVotes;
/**
* The flag on whether the current user has voted already.
*/
- private IModel hasVoted;
+ private IModel<Boolean> hasVoted;
/**
* Handle to the rating label to set the visibility.
@@ -201,9 +204,9 @@
* @param rating
* the model to get the rating
*/
- public RatingPanel(String id, IModel rating)
+ public RatingPanel(String id, IModel<Integer> rating)
{
- this(id, rating, new Model(new Integer(5)), null, new
Model(Boolean.FALSE), true);
+ this(id, rating, new Model<Integer>(5), null, new
Model<Boolean>(Boolean.FALSE), true);
}
/**
@@ -233,9 +236,9 @@
* @param addDefaultCssStyle
* should this component render its own default CSS style?
*/
- public RatingPanel(String id, IModel rating, int nrOfStars, boolean
addDefaultCssStyle)
+ public RatingPanel(String id, IModel<Integer> rating, int nrOfStars,
boolean addDefaultCssStyle)
{
- this(id, rating, new Model(new Integer(nrOfStars)), null, new
Model(Boolean.FALSE),
+ this(id, rating, new Model<Integer>(nrOfStars), null, new
Model<Boolean>(Boolean.FALSE),
addDefaultCssStyle);
}
@@ -255,10 +258,10 @@
* @param addDefaultCssStyle
* should this component render its own default CSS style?
*/
- public RatingPanel(String id, IModel rating, int nrOfStars, IModel
nrOfVotes,
+ public RatingPanel(String id, IModel<Integer> rating, int nrOfStars,
IModel<Integer> nrOfVotes,
boolean addDefaultCssStyle)
{
- this(id, rating, new Model(new Integer(nrOfStars)), nrOfVotes,
new Model(Boolean.FALSE),
+ this(id, rating, new Model<Integer>(nrOfStars), nrOfVotes, new
Model<Boolean>(Boolean.FALSE),
addDefaultCssStyle);
}
@@ -280,8 +283,8 @@
* @param addDefaultCssStyle
* should this component render its own default CSS style?
*/
- public RatingPanel(String id, IModel rating, IModel nrOfStars, IModel
nrOfVotes,
- IModel hasVoted, boolean addDefaultCssStyle)
+ public RatingPanel(String id, IModel<Integer> rating, IModel<Integer>
nrOfStars, IModel<Integer> nrOfVotes,
+ IModel<Boolean> hasVoted, boolean addDefaultCssStyle)
{
super(id, rating);
@@ -328,7 +331,7 @@
* the number of stars to generate
* @return the bar with rating stars
*/
- protected Component newRatingStarBar(String id, IModel nrOfStars)
+ protected Component newRatingStarBar(String id, IModel<Integer>
nrOfStars)
{
return new RatingStarBar(id, nrOfStars);
}
@@ -344,9 +347,9 @@
* the model containing the number of votes (may be null)
* @return the label component showing the message.
*/
- protected Component newRatingLabel(String id, IModel rating, IModel
nrOfVotes)
+ protected Component newRatingLabel(String id, IModel<Integer> rating,
IModel<Integer> nrOfVotes)
{
- IModel model = null;
+ IModel<String> model;
if (nrOfVotes == null)
{
Object[] parameters = new Object[] { rating };
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/tree/LabelTree.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/tree/LabelTree.java?rev=696140&r1=696139&r2=696140&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/tree/LabelTree.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/tree/LabelTree.java
Tue Sep 16 20:02:42 2008
@@ -16,12 +16,10 @@
*/
package org.apache.wicket.markup.html.tree;
-import java.io.Serializable;
import javax.swing.tree.TreeModel;
import org.apache.wicket.Component;
import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.Model;
/**
* Simple tree component that uses label to render tree node.
@@ -64,7 +62,8 @@
@SuppressWarnings("unchecked")
public LabelTree(String id, TreeModel model)
{
- super(id, new Model((Serializable)model));
+ super(id, new WicketTreeModel());
+ setModelObject(model);
}
/**
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/tree/LinkTree.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/tree/LinkTree.java?rev=696140&r1=696139&r2=696140&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/tree/LinkTree.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/tree/LinkTree.java
Tue Sep 16 20:02:42 2008
@@ -16,15 +16,12 @@
*/
package org.apache.wicket.markup.html.tree;
-import java.io.Serializable;
-
import javax.swing.tree.TreeModel;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.Model;
/**
* Simple tree component that provides node panel with link allowing user to
select individual
@@ -70,7 +67,8 @@
@SuppressWarnings("unchecked")
public LinkTree(String id, TreeModel model)
{
- super(id, new Model((Serializable)model));
+ super(id, new WicketTreeModel());
+ setModelObject(model);
}
/**
Added:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/tree/WicketTreeModel.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/tree/WicketTreeModel.java?rev=696140&view=auto
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/tree/WicketTreeModel.java
(added)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/tree/WicketTreeModel.java
Tue Sep 16 20:02:42 2008
@@ -0,0 +1,33 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.wicket.markup.html.tree;
+
+import javax.swing.tree.TreeModel;
+
+import org.apache.wicket.model.util.GenericBaseModel;
+
+/**
+ * @author Timo Rantalaiho
+ */
+public class WicketTreeModel extends GenericBaseModel<TreeModel>
+{
+ @Override
+ protected TreeModel createSerializableVersionOf(TreeModel object)
+ {
+ return object;
+ }
+}
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/model/util/CollectionModel.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/model/util/CollectionModel.java?rev=696140&r1=696139&r2=696140&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/model/util/CollectionModel.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/model/util/CollectionModel.java
Tue Sep 16 20:02:42 2008
@@ -27,7 +27,7 @@
* @param <T>
* type of object inside collection
*/
-public class CollectionModel<T> extends AbstractCollectionModel<Collection<T>>
+public class CollectionModel<T> extends GenericBaseModel<Collection<T>>
{
private static final long serialVersionUID = 1L;
Copied:
wicket/trunk/wicket/src/main/java/org/apache/wicket/model/util/GenericBaseModel.java
(from r695336,
wicket/trunk/wicket/src/main/java/org/apache/wicket/model/util/AbstractCollectionModel.java)
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/model/util/GenericBaseModel.java?p2=wicket/trunk/wicket/src/main/java/org/apache/wicket/model/util/GenericBaseModel.java&p1=wicket/trunk/wicket/src/main/java/org/apache/wicket/model/util/AbstractCollectionModel.java&r1=695336&r2=696140&rev=696140&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/model/util/AbstractCollectionModel.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/model/util/GenericBaseModel.java
Tue Sep 16 20:02:42 2008
@@ -24,14 +24,15 @@
import org.apache.wicket.util.lang.Objects;
/**
- * Base class for models that contain collection instances. Makes sure that
the object set into the
- * model is stored in a collection that can be serialized.
+ * Base class for models that contain instances that do not appear to be
serializable
+ * and cannot thus use <code>Model</code> directly. Makes sure that the object
set into the
+ * model can be serialized.
*
* @author Timo Rantalaiho
* @param <T>
* type of model object
*/
-public abstract class AbstractCollectionModel<T> implements IModel<T>
+public abstract class GenericBaseModel<T> implements IModel<T>
{
private static final long serialVersionUID = 1L;
/** model object */
@@ -108,11 +109,11 @@
return true;
}
- if (!(obj instanceof AbstractCollectionModel))
+ if (!(obj instanceof GenericBaseModel))
{
return false;
}
- AbstractCollectionModel<?> that =
(AbstractCollectionModel<?>)obj;
+ GenericBaseModel<?> that = (GenericBaseModel<?>)obj;
return Objects.equal(object, that.object);
}
}
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/model/util/ListModel.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/model/util/ListModel.java?rev=696140&r1=696139&r2=696140&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/model/util/ListModel.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/model/util/ListModel.java
Tue Sep 16 20:02:42 2008
@@ -27,7 +27,7 @@
* @param <T>
* type of object inside list
*/
-public class ListModel<T> extends AbstractCollectionModel<List<T>>
+public class ListModel<T> extends GenericBaseModel<List<T>>
{
private static final long serialVersionUID = 1L;
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/model/util/MapModel.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/model/util/MapModel.java?rev=696140&r1=696139&r2=696140&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/model/util/MapModel.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/model/util/MapModel.java
Tue Sep 16 20:02:42 2008
@@ -29,7 +29,7 @@
* @param <V>
* map's value type
*/
-public class MapModel<K, V> extends AbstractCollectionModel<Map<K, V>>
+public class MapModel<K, V> extends GenericBaseModel<Map<K, V>>
{
private static final long serialVersionUID = 1L;
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/model/util/SetModel.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/model/util/SetModel.java?rev=696140&r1=696139&r2=696140&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/model/util/SetModel.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/model/util/SetModel.java
Tue Sep 16 20:02:42 2008
@@ -27,7 +27,7 @@
* @param <T>
* type of object inside set
*/
-public class SetModel<T> extends AbstractCollectionModel<Set<T>>
+public class SetModel<T> extends GenericBaseModel<Set<T>>
{
private static final long serialVersionUID = 1L;
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/model/util/WildcardCollectionModel.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/model/util/WildcardCollectionModel.java?rev=696140&r1=696139&r2=696140&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/model/util/WildcardCollectionModel.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/model/util/WildcardCollectionModel.java
Tue Sep 16 20:02:42 2008
@@ -27,7 +27,7 @@
* @param <T>
* type of object inside collection
*/
-public class WildcardCollectionModel<T> extends
AbstractCollectionModel<Collection<? extends T>>
+public class WildcardCollectionModel<T> extends GenericBaseModel<Collection<?
extends T>>
{
private static final long serialVersionUID = 1L;
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/model/util/WildcardListModel.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/model/util/WildcardListModel.java?rev=696140&r1=696139&r2=696140&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/model/util/WildcardListModel.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/model/util/WildcardListModel.java
Tue Sep 16 20:02:42 2008
@@ -27,7 +27,7 @@
* @param <T>
* type of object inside list
*/
-public class WildcardListModel<T> extends AbstractCollectionModel<List<?
extends T>>
+public class WildcardListModel<T> extends GenericBaseModel<List<? extends T>>
{
private static final long serialVersionUID = 1L;
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/model/util/WildcardSetModel.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/model/util/WildcardSetModel.java?rev=696140&r1=696139&r2=696140&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/model/util/WildcardSetModel.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/model/util/WildcardSetModel.java
Tue Sep 16 20:02:42 2008
@@ -27,7 +27,7 @@
* @param <T>
* type of object inside set
*/
-public class WildcardSetModel<T> extends AbstractCollectionModel<Set<? extends
T>>
+public class WildcardSetModel<T> extends GenericBaseModel<Set<? extends T>>
{
private static final long serialVersionUID = 1L;
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/request/target/coding/StatelessPage.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/request/target/coding/StatelessPage.java?rev=696140&r1=696139&r2=696140&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/request/target/coding/StatelessPage.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/request/target/coding/StatelessPage.java
Tue Sep 16 20:02:42 2008
@@ -39,17 +39,18 @@
public StatelessPage()
{
setStatelessHint(true);
- add(new BookmarkablePageLink("indexLink", Index.class));
- final TextField field = new TextField("textfield", new Model());
+ add(new BookmarkablePageLink<Void>("indexLink", Index.class));
+ final TextField<String> field = new
TextField<String>("textfield", new Model<String>());
field.setRequired(true);
- StatelessForm statelessForm = new StatelessForm("statelessform")
+ StatelessForm<Void> statelessForm = new
StatelessForm<Void>("statelessform")
{
private static final long serialVersionUID = 1L;
/**
* @see
org.apache.wicket.markup.html.form.Form#onSubmit()
*/
+ @Override
protected void onSubmit()
{
info("Submitted text: " +
field.getDefaultModelObject());
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/util/lang/ObjectsTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/util/lang/ObjectsTest.java?rev=696140&r1=696139&r2=696140&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/util/lang/ObjectsTest.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/util/lang/ObjectsTest.java
Tue Sep 16 20:02:42 2008
@@ -104,11 +104,12 @@
/**
* Test method for component cloning
*/
+ @SuppressWarnings({"unchecked"})
public void testComponentClone()
{
- PropertyModel pm = new PropertyModel(new TextField("test", new
Model("test")),
+ PropertyModel<String> pm = new PropertyModel<String>(new
TextField<String>("test", new Model<String>("test")),
"modelObject");
- PropertyModel pm2 = (PropertyModel)Objects.cloneModel(pm);
+ PropertyModel<String> pm2 =
(PropertyModel<String>)Objects.cloneModel(pm);
assertTrue(pm.getObject() == pm2.getObject());
}
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/apps_1/CreateBook.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/apps_1/CreateBook.java?rev=696140&r1=696139&r2=696140&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/apps_1/CreateBook.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/apps_1/CreateBook.java
Tue Sep 16 20:02:42 2008
@@ -45,7 +45,7 @@
*
* @author Juergen Donnerstag
*/
- public class CreateForm extends Form
+ public class CreateForm extends Form<Void>
{
private static final long serialVersionUID = 1L;
@@ -58,21 +58,22 @@
super(id);
// label model here comes from java
- add(new RequiredTextField("id", new PropertyModel(book,
"id"))
- .setLabel(new Model("id")));
+ add(new RequiredTextField<String>("id", new
PropertyModel<String>(book, "id"))
+ .setLabel(new Model<String>("id")));
// label model here comes from CreateBook.properties
- add(new RequiredTextField("name", new
PropertyModel(book, "name")));
+ add(new RequiredTextField<String>("name", new
PropertyModel<String>(book, "name")));
}
/**
* @see org.apache.wicket.markup.html.form.Form#onSubmit()
*/
+ @Override
public void onSubmit()
{
try
{
Page page = new SuccessPage();
- page.info(getString("book.save.success", new
Model(book)));
+ page.info(getString("book.save.success", new
Model<Book>(book)));
setResponsePage(page);
}
finally
