Author: ivaynberg
Date: Sun May 4 08:55:22 2008
New Revision: 653237
URL: http://svn.apache.org/viewvc?rev=653237&view=rev
Log:
WICKET-1574 + some generics cleanup
Modified:
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/Palette.java
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=653237&r1=653236&r2=653237&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
Sun May 4 08:55:22 2008
@@ -50,20 +50,29 @@
* <strong>Ajaxifying the palette</strong>: The palette itself cannot be
ajaxified because it is a
* panel and therefore does not receive any javascript events. Instead ajax
behaviors can be
* attached to the recorder component which supports the javascript
<code>onchange</code> event.
- * The recorder component can be retrieved via a call to [EMAIL PROTECTED]
#getRecorderComponent()}.
+ * The behavior should be attached by overriding [EMAIL PROTECTED]
#newRecorderComponent()}
*
* Example:
*
* <pre>
- * Form form=new Form(...);
- * Palette palette=new Palette(...);
- * palette.getRecorderComponent().add(new
AjaxFormComponentUpdatingBehavior("onchange") {...});
+ * Form form=new Form(...);
+ * Palette palette=new Palette(...) {
+ * protected Recorder newRecorderComponent()
+ * {
+ * Recorder recorder=super.newRecorderComponent();
+ * recorder.add(new
AjaxFormComponentUpdatingBehavior("onchange") {...});
+ * return recorder;
+ * }
+ * }
+ *
* </pre>
*
* @author Igor Vaynberg ( ivaynberg )
+ * @param <T>
+ * Type of model object
*
*/
-public class Palette extends Panel implements IHeaderContributor
+public class Palette<T> extends Panel<Collection<T>> implements
IHeaderContributor
{
private static final String SELECTED_HEADER_ID = "selectedHeader";
@@ -72,12 +81,12 @@
private static final long serialVersionUID = 1L;
/** collection containing all available choices */
- private final IModel choicesModel;
+ private final IModel<Collection< ? extends T>> choicesModel;
/**
* choice render used to render the choices in both available and
selected collections
*/
- private final IChoiceRenderer choiceRenderer;
+ private final IChoiceRenderer<T> choiceRenderer;
/** number of rows to show in the select boxes */
private final int rows;
@@ -138,8 +147,8 @@
* @param allowOrder
* Allow user to move selections up and down
*/
- public Palette(String id, IModel choicesModel, IChoiceRenderer
choiceRenderer, int rows,
- boolean allowOrder)
+ public Palette(String id, IModel<Collection< ? extends T>> choicesModel,
+ IChoiceRenderer<T> choiceRenderer, int rows, boolean allowOrder)
{
this(id, null, choicesModel, choiceRenderer, rows, allowOrder);
}
@@ -159,8 +168,9 @@
* @param allowOrder
* Allow user to move selections up and down
*/
- public Palette(String id, IModel model, IModel choicesModel,
IChoiceRenderer choiceRenderer,
- int rows, boolean allowOrder)
+ public Palette(String id, IModel<Collection<T>> model,
+ IModel<Collection< ? extends T>> choicesModel,
IChoiceRenderer<T> choiceRenderer, int rows,
+ boolean allowOrder)
{
super(id, model);
@@ -170,6 +180,7 @@
this.allowOrder = allowOrder;
}
+ @Override
protected void onBeforeRender()
{
if (!hasBeenRendered())
@@ -266,6 +277,7 @@
{
private static final long serialVersionUID = 1L;
+ @Override
public void updateModel()
{
super.updateModel();
@@ -312,6 +324,7 @@
{
private static final long serialVersionUID = 1L;
+ @Override
protected void onComponentTag(ComponentTag tag)
{
super.onComponentTag(tag);
@@ -331,6 +344,7 @@
{
private static final long serialVersionUID = 1L;
+ @Override
protected void onComponentTag(ComponentTag tag)
{
super.onComponentTag(tag);
@@ -350,6 +364,7 @@
{
private static final long serialVersionUID = 1L;
+ @Override
protected void onComponentTag(ComponentTag tag)
{
super.onComponentTag(tag);
@@ -369,6 +384,7 @@
{
private static final long serialVersionUID = 1L;
+ @Override
protected void onComponentTag(ComponentTag tag)
{
super.onComponentTag(tag);
@@ -388,6 +404,7 @@
{
private static final long serialVersionUID = 1L;
+ @Override
protected Map getAdditionalAttributes(Object choice)
{
return
Palette.this.getAdditionalAttributesForSelection(choice);
@@ -414,6 +431,7 @@
{
private static final long serialVersionUID = 1L;
+ @Override
protected Map getAdditionalAttributes(Object choice)
{
return
Palette.this.getAdditionalAttributesForChoices(choice);
@@ -456,7 +474,7 @@
*/
public Collection getChoices()
{
- return (Collection)choicesModel.getObject();
+ return choicesModel.getObject();
}
/**
@@ -464,7 +482,7 @@
*/
public Collection getModelCollection()
{
- return (Collection)getModelObject();
+ return getModelObject();
}
/**
@@ -495,15 +513,15 @@
protected final void updateModel()
{
// prepare model
- Collection model = (Collection)getModelObject();
+ Collection<T> model = getModelObject();
model.clear();
// update model
- Iterator it = getRecorderComponent().getSelectedChoices();
+ Iterator<T> it = getRecorderComponent().getSelectedChoices();
while (it.hasNext())
{
- final Object selectedChoice = it.next();
+ final T selectedChoice = it.next();
model.add(selectedChoice);
}
@@ -578,6 +596,7 @@
return buildJSCall("Wicket.Palette.moveDown");
}
+ @Override
protected void onDetach()
{
// we need to manually detach the choices model since it is not
attached
@@ -604,6 +623,7 @@
}
+ @Override
protected void onComponentTag(ComponentTag tag)
{
if (!isPaletteEnabled())
