You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by gs...@apache.org on 2008/05/07 00:53:27 UTC
svn commit: r653947 - in /wicket/trunk/wicket-extensions/src:
main/java/org/apache/wicket/extensions/wizard/
main/java/org/apache/wicket/extensions/wizard/dynamic/
test/java/org/apache/wicket/extensions/ajax/markup/html/
Author: gseitz
Date: Tue May 6 15:53:26 2008
New Revision: 653947
URL: http://svn.apache.org/viewvc?rev=653947&view=rev
Log:
generics
Modified:
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/AbstractWizardModel.java
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/IWizardModel.java
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/IWizardStep.java
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/StaticContentStep.java
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/Wizard.java
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/WizardButton.java
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/WizardButtonBar.java
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/WizardModel.java
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/WizardStep.java
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/dynamic/DynamicWizardModel.java
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/dynamic/DynamicWizardStep.java
wicket/trunk/wicket-extensions/src/test/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabelPage.java
wicket/trunk/wicket-extensions/src/test/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableTest.java
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/AbstractWizardModel.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/AbstractWizardModel.java?rev=653947&r1=653946&r2=653947&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/AbstractWizardModel.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/AbstractWizardModel.java Tue May 6 15:53:26 2008
@@ -17,7 +17,6 @@
package org.apache.wicket.extensions.wizard;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
/**
@@ -43,7 +42,8 @@
private boolean lastVisible = false;
/** Listeners for {@link IWizardModelListener model events}. */
- private final List wizardModelListeners = new ArrayList(1);
+ private final List<IWizardModelListener> wizardModelListeners = new ArrayList<IWizardModelListener>(
+ 1);
/**
* Construct.
@@ -149,9 +149,8 @@
*/
protected final void fireActiveStepChanged(IWizardStep step)
{
- for (Iterator i = wizardModelListeners.iterator(); i.hasNext();)
+ for (IWizardModelListener listener : wizardModelListeners)
{
- IWizardModelListener listener = (IWizardModelListener)i.next();
listener.onActiveStepChanged(step);
}
}
@@ -161,9 +160,8 @@
*/
protected final void fireWizardCancelled()
{
- for (Iterator i = wizardModelListeners.iterator(); i.hasNext();)
+ for (IWizardModelListener listener : wizardModelListeners)
{
- IWizardModelListener listener = (IWizardModelListener)i.next();
listener.onCancel();
}
}
@@ -173,9 +171,8 @@
*/
protected final void fireWizardFinished()
{
- for (Iterator i = wizardModelListeners.iterator(); i.hasNext();)
+ for (IWizardModelListener listener : wizardModelListeners)
{
- IWizardModelListener listener = (IWizardModelListener)i.next();
listener.onFinish();
}
}
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/IWizardModel.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/IWizardModel.java?rev=653947&r1=653946&r2=653947&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/IWizardModel.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/IWizardModel.java Tue May 6 15:53:26 2008
@@ -172,5 +172,5 @@
*
* @return an iterator over all the steps of the model or null if the wizard model is not static
*/
- Iterator stepIterator();
+ Iterator<IWizardStep> stepIterator();
}
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/IWizardStep.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/IWizardStep.java?rev=653947&r1=653946&r2=653947&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/IWizardStep.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/IWizardStep.java Tue May 6 15:53:26 2008
@@ -56,7 +56,7 @@
* The wizard component the header will be placed on
* @return The header component
*/
- Component getHeader(String id, Component parent, IWizard wizard);
+ Component< ? > getHeader(String id, Component< ? > parent, IWizard wizard);
/**
* Returns the current view this step is displaying. This component will be displayed in the
@@ -71,7 +71,7 @@
* The wizard component the header will be placed on
* @return The current view of the step.
*/
- Component getView(String id, Component parent, IWizard wizard);
+ Component< ? > getView(String id, Component< ? > parent, IWizard wizard);
/**
* Initializes this step with the model it will belong to.
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/StaticContentStep.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/StaticContentStep.java?rev=653947&r1=653946&r2=653947&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/StaticContentStep.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/StaticContentStep.java Tue May 6 15:53:26 2008
@@ -25,7 +25,7 @@
*
* @author eelcohillenius
*/
-public class StaticContentStep extends WizardStep
+public class StaticContentStep extends WizardStep<Void>
{
private static final long serialVersionUID = 1L;
@@ -35,7 +35,7 @@
private final boolean allowHtml;
/** The model that provided the actual content. */
- private IModel content;
+ private IModel< ? > content;
/**
* Constructor for if you want to set all the properties yourself.
@@ -47,12 +47,15 @@
public StaticContentStep(boolean allowHtml)
{
this.allowHtml = allowHtml;
- add(new Label("content", ""));
+ add(new Label<String>("content", ""));
}
/**
* Construct.
*
+ * @param <T>
+ * The model object type of the static content model
+ *
* @param title
* The title of this step
* @param summary
@@ -63,12 +66,13 @@
* If true, any html of the content will be rendered as is. Otherwise, it will be
* escaped.
*/
- public StaticContentStep(IModel title, IModel summary, IModel content, boolean allowHtml)
+ public <T> StaticContentStep(IModel<String> title, IModel<String> summary, IModel<T> content,
+ boolean allowHtml)
{
super(title, summary);
this.content = content;
this.allowHtml = allowHtml;
- add(new Label("content", content).setEscapeModelStrings(!allowHtml));
+ add(new Label<T>("content", content).setEscapeModelStrings(!allowHtml));
}
/**
@@ -84,9 +88,10 @@
* If true, any html of the content will be rendered as is. Otherwise, it will be
* escaped.
*/
- public StaticContentStep(IModel title, IModel summary, String content, boolean allowHtml)
+ public StaticContentStep(IModel<String> title, IModel<String> summary, String content,
+ boolean allowHtml)
{
- this(title, summary, new Model(content), allowHtml);
+ this(title, summary, new Model<String>(content), allowHtml);
}
/**
@@ -102,9 +107,9 @@
* If true, any html of the content will be rendered as is. Otherwise, it will be
* escaped.
*/
- public StaticContentStep(String title, String summary, IModel content, boolean allowHtml)
+ public StaticContentStep(String title, String summary, IModel< ? > content, boolean allowHtml)
{
- this(new Model(title), new Model(summary), content, allowHtml);
+ this(new Model<String>(title), new Model<String>(summary), content, allowHtml);
}
/**
@@ -122,7 +127,7 @@
*/
public StaticContentStep(String title, String summary, String content, boolean allowHtml)
{
- this(title, summary, new Model(content), allowHtml);
+ this(title, summary, new Model<String>(content), allowHtml);
}
/**
@@ -150,7 +155,7 @@
*
* @return The content model
*/
- public final IModel getContentModel()
+ public final IModel< ? > getContentModel()
{
return content;
}
@@ -158,12 +163,15 @@
/**
* Sets the content model.
*
+ * @param <T>
+ * The model object type
+ *
* @param content
* The content model
*/
- public final void setContentModel(IModel content)
+ public final <T> void setContentModel(IModel<T> content)
{
this.content = content;
- replace(new Label("content", content).setEscapeModelStrings(!allowHtml));
+ replace(new Label<T>("content", content).setEscapeModelStrings(!allowHtml));
}
}
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/Wizard.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/Wizard.java?rev=653947&r1=653946&r2=653947&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/Wizard.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/Wizard.java Tue May 6 15:53:26 2008
@@ -46,7 +46,7 @@
*
* @author Eelco Hillenius
*/
-public class Wizard extends Panel implements IWizardModelListener, IWizard
+public class Wizard extends Panel<Void> implements IWizardModelListener, IWizard
{
/** Component id of the buttons panel as used by the default wizard panel. */
public static final String BUTTONS_ID = "buttons";
@@ -74,7 +74,7 @@
/**
* The form in which the view is nested, and on which the wizard buttons work.
*/
- private Form form;
+ private Form< ? > form;
/** The wizard model. */
private IWizardModel wizardModel;
@@ -189,7 +189,7 @@
*
* @return The wizard form
*/
- public Form getForm()
+ public Form< ? > getForm()
{
return form;
}
@@ -209,6 +209,7 @@
* @return False
* @see org.apache.wicket.Component#isVersioned()
*/
+ @Override
public boolean isVersioned()
{
return false;
@@ -224,7 +225,7 @@
}
/**
- * Called when the wizard is cancelled.
+ * Called when the wizard is canceled.
*/
public void onCancel()
{
@@ -258,21 +259,21 @@
form = newForm(FORM_ID);
addOrReplace(form);
// dummy view to be replaced
- form.addOrReplace(new WebMarkupContainer(HEADER_ID));
+ form.addOrReplace(new WebMarkupContainer<Void>(HEADER_ID));
form.addOrReplace(newFeedbackPanel(FEEDBACK_ID));
// add dummy view; will be replaced on initialization
- form.addOrReplace(new WebMarkupContainer(VIEW_ID));
+ form.addOrReplace(new WebMarkupContainer<Void>(VIEW_ID));
form.addOrReplace(newButtonBar(BUTTONS_ID));
form.addOrReplace(newOverviewBar(OVERVIEW_ID));
wizardModel.addListener(this);
- Iterator stepsIterator = wizardModel.stepIterator();
+ Iterator<IWizardStep> stepsIterator = wizardModel.stepIterator();
if (stepsIterator != null)
{
while (stepsIterator.hasNext())
{
- ((IWizardStep)stepsIterator.next()).init(wizardModel);
+ (stepsIterator.next()).init(wizardModel);
}
}
@@ -288,7 +289,7 @@
*
* @return A new button bar
*/
- protected Component newButtonBar(String id)
+ protected Component< ? > newButtonBar(String id)
{
return new WizardButtonBar(id, this);
}
@@ -310,19 +311,23 @@
/**
* Create a new form. Clients can override this method to provide a custom {@link Form}.
*
+ * @param <T>
+ * The form's model object type
+ *
* @param id
* The id to be used to construct the component
* @return a new form
*/
- protected Form newForm(String id)
+ protected <T> Form<T> newForm(String id)
{
- return new Form(id);
+ return new Form<T>(id);
}
+ @Override
protected void onBeforeRender()
{
super.onBeforeRender();
- Component buttonBar = form.get(BUTTONS_ID);
+ Component< ? > buttonBar = form.get(BUTTONS_ID);
if (buttonBar instanceof IDefaultButtonProvider)
{
IFormSubmittingComponent defaultButton = ((IDefaultButtonProvider)buttonBar).getDefaultButton(wizardModel);
@@ -333,15 +338,18 @@
/**
* Create a new overview bar. Clients can override this method to provide a custom bar.
*
+ * @param <T>
+ * The overview bar's model object type
+ *
* @param id
* The id to be used to construct the component
*
- * @return A new ovewview bar
+ * @return A new overview bar
*/
- protected Component newOverviewBar(String id)
+ protected <T> Component<T> newOverviewBar(String id)
{
// return a dummy component by default as we don't have an overview
// component
- return new WebMarkupContainer(id).setVisible(false);
+ return new WebMarkupContainer<T>(id).setVisible(false);
}
}
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/WizardButton.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/WizardButton.java?rev=653947&r1=653946&r2=653947&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/WizardButton.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/WizardButton.java Tue May 6 15:53:26 2008
@@ -29,7 +29,7 @@
*
* @author Eelco Hillenius
*/
-public abstract class WizardButton extends Button
+public abstract class WizardButton extends Button<String>
{
/**
*
@@ -84,6 +84,7 @@
/**
* @see org.apache.wicket.markup.html.form.Button#onSubmit()
*/
+ @Override
public final void onSubmit()
{
onClick();
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/WizardButtonBar.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/WizardButtonBar.java?rev=653947&r1=653946&r2=653947&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/WizardButtonBar.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/WizardButtonBar.java Tue May 6 15:53:26 2008
@@ -32,7 +32,7 @@
*
* @author Eelco Hillenius
*/
-public class WizardButtonBar extends Panel implements IDefaultButtonProvider
+public class WizardButtonBar extends Panel<Void> implements IDefaultButtonProvider
{
private static final long serialVersionUID = 1L;
@@ -61,15 +61,15 @@
{
if (model.isNextAvailable())
{
- return (Button)get("next");
+ return (Button< ? >)get("next");
}
else if (model.isLastAvailable())
{
- return (Button)get("last");
+ return (Button< ? >)get("last");
}
else if (model.isLastStep(model.getActiveStep()))
{
- return (Button)get("finish");
+ return (Button< ? >)get("finish");
}
return null;
}
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/WizardModel.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/WizardModel.java?rev=653947&r1=653946&r2=653947&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/WizardModel.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/WizardModel.java Tue May 6 15:53:26 2008
@@ -82,13 +82,13 @@
private IWizardStep activeStep;
/** Conditions with steps. */
- private List conditions = new ArrayList();
+ private final List<ICondition> conditions = new ArrayList<ICondition>();
/** State history. */
- private final ArrayListStack history = new ArrayListStack();
+ private final ArrayListStack<IWizardStep> history = new ArrayListStack<IWizardStep>();
/** The wizard steps. */
- private List steps = new ArrayList();
+ private final List<IWizardStep> steps = new ArrayList<IWizardStep>();
/**
* Construct.
@@ -202,7 +202,7 @@
*/
public void previous()
{
- IWizardStep step = (IWizardStep)history.pop();
+ IWizardStep step = history.pop();
setActiveStep(step);
}
@@ -212,7 +212,7 @@
public void reset()
{
history.clear();
- this.activeStep = null;
+ activeStep = null;
setActiveStep(findNextVisibleStep());
}
@@ -224,12 +224,12 @@
*/
public void setActiveStep(IWizardStep step)
{
- if (this.activeStep != null && step != null && activeStep.equals(step))
+ if (activeStep != null && step != null && activeStep.equals(step))
{
return;
}
- this.activeStep = step;
+ activeStep = step;
fireActiveStepChanged(step);
}
@@ -237,7 +237,7 @@
/**
* @see IWizardModel#stepIterator()
*/
- public final Iterator stepIterator()
+ public final Iterator<IWizardStep> stepIterator()
{
return steps.iterator();
}
@@ -252,9 +252,9 @@
*/
protected final boolean allStepsComplete()
{
- for (Iterator iterator = stepIterator(); iterator.hasNext();)
+ for (IWizardStep step : steps)
{
- if (!((IWizardStep)iterator.next()).isComplete())
+ if (!step.isComplete())
{
return false;
}
@@ -272,10 +272,10 @@
{
for (int i = conditions.size() - 1; i >= 0; i--)
{
- ICondition condition = (ICondition)conditions.get(i);
+ ICondition condition = conditions.get(i);
if (condition.evaluate())
{
- return (IWizardStep)steps.get(i);
+ return steps.get(i);
}
}
@@ -293,10 +293,10 @@
for (int i = startIndex; i < conditions.size(); i++)
{
- ICondition condition = (ICondition)conditions.get(i);
+ ICondition condition = conditions.get(i);
if (condition.evaluate())
{
- return (IWizardStep)steps.get(i);
+ return steps.get(i);
}
}
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/WizardStep.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/WizardStep.java?rev=653947&r1=653946&r2=653947&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/WizardStep.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/WizardStep.java Tue May 6 15:53:26 2008
@@ -18,7 +18,6 @@
import java.util.ArrayList;
import java.util.HashSet;
-import java.util.Iterator;
import java.util.List;
import java.util.Set;
@@ -75,10 +74,11 @@
*
* </p>
*
+ * @param <T>
*
* @author Eelco Hillenius
*/
-public class WizardStep extends Panel implements IWizardStep
+public class WizardStep<T> extends Panel<T> implements IWizardStep
{
/**
* Adds form validators. We don't need this in 2.0 as the hierarchy is know at construction time
@@ -93,7 +93,7 @@
void execute()
{
- Form form = (Form)findParent(Form.class);
+ Form< ? > form = findParent(Form.class);
form.add(formValidatorWrapper);
}
}
@@ -107,7 +107,7 @@
private static final long serialVersionUID = 1L;
- private final List validators = new ArrayList();
+ private final List<IFormValidator> validators = new ArrayList<IFormValidator>();
/**
* Adds a form validator.
@@ -123,15 +123,14 @@
/**
* @see org.apache.wicket.markup.html.form.validation.IFormValidator#getDependentFormComponents()
*/
- public FormComponent[] getDependentFormComponents()
+ public FormComponent< ? >[] getDependentFormComponents()
{
if (isActiveStep())
{
- Set components = new HashSet();
- for (Iterator i = validators.iterator(); i.hasNext();)
+ Set<Component< ? >> components = new HashSet<Component< ? >>();
+ for (IFormValidator v : validators)
{
- IFormValidator v = (IFormValidator)i.next();
- FormComponent[] dependentComponents = v.getDependentFormComponents();
+ FormComponent< ? >[] dependentComponents = v.getDependentFormComponents();
if (dependentComponents != null)
{
int len = dependentComponents.length;
@@ -141,7 +140,7 @@
}
}
}
- return (FormComponent[])components.toArray(new FormComponent[components.size()]);
+ return components.toArray(new FormComponent[components.size()]);
}
return null;
}
@@ -149,13 +148,12 @@
/**
* @see org.apache.wicket.markup.html.form.validation.IFormValidator#validate(org.apache.wicket.markup.html.form.Form)
*/
- public void validate(Form form)
+ public void validate(Form< ? > form)
{
if (isActiveStep())
{
- for (Iterator i = validators.iterator(); i.hasNext();)
+ for (IFormValidator v : validators)
{
- IFormValidator v = (IFormValidator)i.next();
v.validate(form);
}
}
@@ -173,7 +171,7 @@
/**
* Default header for wizards.
*/
- private final class Header extends Panel
+ private final class Header extends Panel<IWizard>
{
private static final long serialVersionUID = 1L;
@@ -188,21 +186,23 @@
public Header(final String id, final IWizard wizard)
{
super(id);
- setModel(new CompoundPropertyModel(wizard));
- add(new Label("title", new AbstractReadOnlyModel()
+ setModel(new CompoundPropertyModel<IWizard>(wizard));
+ add(new Label<String>("title", new AbstractReadOnlyModel<String>()
{
private static final long serialVersionUID = 1L;
- public Object getObject()
+ @Override
+ public String getObject()
{
return getTitle();
}
}).setEscapeModelStrings(false));
- add(new Label("summary", new AbstractReadOnlyModel()
+ add(new Label<String>("summary", new AbstractReadOnlyModel<String>()
{
private static final long serialVersionUID = 1L;
- public Object getObject()
+ @Override
+ public String getObject()
{
return getSummary();
}
@@ -225,12 +225,12 @@
/**
* A summary of this step, or some usage advice.
*/
- private IModel summary;
+ private IModel<String> summary;
/**
* The title of this step.
*/
- private IModel title;
+ private IModel<String> title;
/**
* The wizard model.
@@ -255,7 +255,7 @@
* @param summary
* a brief summary of this step or some usage guidelines.
*/
- public WizardStep(IModel title, IModel summary)
+ public WizardStep(IModel<String> title, IModel<String> summary)
{
this(title, summary, null);
}
@@ -271,7 +271,7 @@
* @param model
* Any model which is to be used for this step
*/
- public WizardStep(IModel title, IModel summary, IModel model)
+ public WizardStep(IModel<String> title, IModel<String> summary, IModel<T> model)
{
super(Wizard.VIEW_ID, model);
@@ -304,9 +304,9 @@
* @param model
* Any model which is to be used for this step
*/
- public WizardStep(String title, String summary, IModel model)
+ public WizardStep(String title, String summary, IModel<T> model)
{
- this(new Model(title), new Model(summary), model);
+ this(new Model<String>(title), new Model<String>(summary), model);
}
/**
@@ -334,7 +334,7 @@
* @see org.apache.wicket.extensions.wizard.IWizardStep#getHeader(java.lang.String,
* org.apache.wicket.Component, org.apache.wicket.extensions.wizard.IWizard)
*/
- public Component getHeader(String id, Component parent, IWizard wizard)
+ public Component< ? > getHeader(String id, Component< ? > parent, IWizard wizard)
{
return new Header(id, wizard);
}
@@ -348,7 +348,7 @@
*/
public String getSummary()
{
- return (summary != null) ? (String)summary.getObject() : (String)null;
+ return (summary != null) ? summary.getObject() : null;
}
/**
@@ -358,14 +358,14 @@
*/
public String getTitle()
{
- return (title != null) ? (String)title.getObject() : (String)null;
+ return (title != null) ? title.getObject() : null;
}
/**
* @see org.apache.wicket.extensions.wizard.IWizardStep#getView(java.lang.String,
* org.apache.wicket.Component, org.apache.wicket.extensions.wizard.IWizard)
*/
- public Component getView(String id, Component parent, IWizard wizard)
+ public Component< ? > getView(String id, Component< ? > parent, IWizard wizard)
{
return this;
}
@@ -425,7 +425,7 @@
* @param summary
* summary
*/
- public void setSummaryModel(IModel summary)
+ public void setSummaryModel(IModel<String> summary)
{
this.summary = wrap(summary);
}
@@ -436,7 +436,7 @@
* @param title
* title
*/
- public void setTitleModel(IModel title)
+ public void setTitleModel(IModel<String> title)
{
this.title = wrap(title);
}
@@ -444,6 +444,7 @@
/**
* @see org.apache.wicket.Component#detachModel()
*/
+ @Override
protected void detachModel()
{
super.detachModel();
@@ -462,6 +463,7 @@
*
* @see org.apache.wicket.Component#onBeforeRender()
*/
+ @Override
protected void onBeforeRender()
{
if (onAttachAction != null)
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/dynamic/DynamicWizardModel.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/dynamic/DynamicWizardModel.java?rev=653947&r1=653946&r2=653947&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/dynamic/DynamicWizardModel.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/dynamic/DynamicWizardModel.java Tue May 6 15:53:26 2008
@@ -140,7 +140,7 @@
/**
* @see org.apache.wicket.extensions.wizard.IWizardModel#stepIterator()
*/
- public Iterator stepIterator()
+ public Iterator<IWizardStep> stepIterator()
{
return null;
}
@@ -159,7 +159,7 @@
}
step.init(this);
- this.activeStep = step;
+ activeStep = step;
fireActiveStepChanged(step);
}
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/dynamic/DynamicWizardStep.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/dynamic/DynamicWizardStep.java?rev=653947&r1=653946&r2=653947&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/dynamic/DynamicWizardStep.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/dynamic/DynamicWizardStep.java Tue May 6 15:53:26 2008
@@ -24,9 +24,11 @@
/**
* Default implementation of a {@link IDynamicWizardStep dynamic wizard step}.
*
+ * @param <T>
+ *
* @author eelcohillenius
*/
-public abstract class DynamicWizardStep extends WizardStep implements IDynamicWizardStep
+public abstract class DynamicWizardStep<T> extends WizardStep<T> implements IDynamicWizardStep
{
/**
*
@@ -36,7 +38,7 @@
/**
* Construct without a title and a summary. Useful for when you provide a custom header by
- * overiding {@link #getHeader(String, Component, IWizard)}.
+ * overriding {@link #getHeader(String, Component, IWizard)}.
*
* @param previousStep
* The previous step. May be null if this is the first step in the wizard
@@ -58,7 +60,8 @@
* @param summary
* a brief summary of this step or some usage guidelines.
*/
- public DynamicWizardStep(IDynamicWizardStep previousStep, IModel title, IModel summary)
+ public DynamicWizardStep(IDynamicWizardStep previousStep, IModel<String> title,
+ IModel<String> summary)
{
super(title, summary);
this.previousStep = previousStep;
@@ -77,8 +80,8 @@
* @param model
* Any model which is to be used for this step
*/
- public DynamicWizardStep(IDynamicWizardStep previousStep, IModel title, IModel summary,
- IModel model)
+ public DynamicWizardStep(IDynamicWizardStep previousStep, IModel<String> title,
+ IModel<String> summary, IModel<T> model)
{
super(title, summary, model);
this.previousStep = previousStep;
@@ -115,7 +118,7 @@
* Any model which is to be used for this step
*/
public DynamicWizardStep(IDynamicWizardStep previousStep, String title, String summary,
- IModel model)
+ IModel<T> model)
{
super(title, summary, model);
this.previousStep = previousStep;
@@ -151,7 +154,7 @@
public IDynamicWizardStep last()
{
throw new IllegalStateException("if the last button is available, this step "
- + "has to override the last() method and let it return a step");
+ + "has to override the last() method and let it return a step");
}
/**
Modified: wicket/trunk/wicket-extensions/src/test/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabelPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/test/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabelPage.java?rev=653947&r1=653946&r2=653947&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/test/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabelPage.java (original)
+++ wicket/trunk/wicket-extensions/src/test/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabelPage.java Tue May 6 15:53:26 2008
@@ -24,7 +24,7 @@
/**
* @author Gerolf Seitz
*/
-public class AjaxEditableLabelPage extends WebPage
+public class AjaxEditableLabelPage extends WebPage<Void>
{
private static final long serialVersionUID = 1L;
@@ -33,13 +33,14 @@
*/
public AjaxEditableLabelPage()
{
- final AjaxEditableLabel ajaxLabel = new AjaxEditableLabel("ajaxLabel",
- new Model("ajaxTest"));
+ final AjaxEditableLabel<String> ajaxLabel = new AjaxEditableLabel<String>("ajaxLabel",
+ new Model<String>("ajaxTest"));
add(ajaxLabel);
- add(new AjaxLink("toggle")
+ add(new AjaxLink<Void>("toggle")
{
private static final long serialVersionUID = 1L;
+ @Override
public void onClick(AjaxRequestTarget target)
{
ajaxLabel.setEnabled(!ajaxLabel.isEnabled());
Modified: wicket/trunk/wicket-extensions/src/test/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/test/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableTest.java?rev=653947&r1=653946&r2=653947&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/test/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableTest.java (original)
+++ wicket/trunk/wicket-extensions/src/test/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableTest.java Tue May 6 15:53:26 2008
@@ -29,6 +29,7 @@
public class AjaxEditableTest extends WicketTestCase
{
+ @Override
protected void setUp() throws Exception
{
super.setUp();
@@ -43,8 +44,8 @@
*/
public void testAjaxEditableLabel()
{
- Page page = tester.getLastRenderedPage();
- AjaxEditableLabel ajaxLabel = (AjaxEditableLabel)page.get("ajaxLabel");
+ Page< ? > page = tester.getLastRenderedPage();
+ AjaxEditableLabel< ? > ajaxLabel = (AjaxEditableLabel< ? >)page.get("ajaxLabel");
AbstractAjaxBehavior labelBehavior = (AbstractAjaxBehavior)ajaxLabel.get("label")
.getBehaviors()
@@ -70,9 +71,9 @@
*/
public void testDisabledAjaxEditableLabel()
{
- Page page = tester.getLastRenderedPage();
- AjaxEditableLabel ajaxLabel = (AjaxEditableLabel)page.get("ajaxLabel");
- AjaxLink toggle = (AjaxLink)page.get("toggle");
+ Page< ? > page = tester.getLastRenderedPage();
+ AjaxEditableLabel< ? > ajaxLabel = (AjaxEditableLabel< ? >)page.get("ajaxLabel");
+ AjaxLink< ? > toggle = (AjaxLink< ? >)page.get("toggle");
AbstractAjaxBehavior toggleBehavior = (AbstractAjaxBehavior)toggle.getBehaviors().get(0);