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/06/29 07:51:39 UTC
svn commit: r672603 [11/18] - in /wicket/trunk:
testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app1/
testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app2/
wicket-auth-roles/src/main/java/org/apache/w...
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/ImageButton.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/ImageButton.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/ImageButton.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/ImageButton.java Sat Jun 28 22:50:41 2008
@@ -37,7 +37,7 @@
* @param <T>
* The model object type, can be only of type Resource, ResouceReference or a String
*/
-public class ImageButton<T> extends Button<T> implements IResourceListener
+public class ImageButton extends Button implements IResourceListener
{
private static final long serialVersionUID = 1L;
@@ -45,10 +45,10 @@
private final LocalizedImageResource localizedImageResource = new LocalizedImageResource(this);
/**
- * This constructor can be used if you have an <code>img</code> tag that has a
- * <code>src</code> that points to a <code>PackageResource</code> (which will be created and
- * bind to the shared resources) or if you have a <code>value</code> attribute in your tag for
- * which the image factory can make an image.
+ * This constructor can be used if you have an <code>img</code> tag that has a <code>src</code>
+ * that points to a <code>PackageResource</code> (which will be created and bind to the shared
+ * resources) or if you have a <code>value</code> attribute in your tag for which the image
+ * factory can make an image.
*
* @see org.apache.wicket.Component#Component(String)
*/
@@ -63,9 +63,9 @@
*
* If you are using non sticky session clustering and the resource reference is pointing to a
* <code>Resource</code> that isn't guaranteed to be on every server, for example a dynamic
- * image or resources that aren't added with a <code>IInitializer</code> at application
- * startup. Then if only that resource is requested from another server, without the rendering
- * of the page, the image won't be there and will result in a broken link.
+ * image or resources that aren't added with a <code>IInitializer</code> at application startup.
+ * Then if only that resource is requested from another server, without the rendering of the
+ * page, the image won't be there and will result in a broken link.
*
* @param id
* See Component
@@ -83,9 +83,9 @@
*
* If you are using non sticky session clustering and the resource reference is pointing to a
* <code>Resource</code> that isn't guaranteed to be on every server, for example a dynamic
- * image or resources that aren't added with a <code>IInitializer</code> at application
- * startup. Then if only that resource is requested from another server, without the rendering
- * of the page, the image won't be there and will result in a broken link.
+ * image or resources that aren't added with a <code>IInitializer</code> at application startup.
+ * Then if only that resource is requested from another server, without the rendering of the
+ * page, the image won't be there and will result in a broken link.
*
* @param id
* See Component
@@ -123,7 +123,7 @@
/**
* @see org.apache.wicket.Component#Component(String, IModel)
*/
- public ImageButton(final String id, final IModel<T> model)
+ public ImageButton(final String id, final IModel<String> model)
{
super(id, model);
}
@@ -181,17 +181,17 @@
}
/**
- * @see org.apache.wicket.Component#setModel(org.apache.wicket.model.IModel)
+ * @see org.apache.wicket.Component#setDefaultModel(org.apache.wicket.model.IModel)
*/
@SuppressWarnings("unchecked")
@Override
- public ImageButton<T> setModel(IModel<T> model)
+ public ImageButton setDefaultModel(IModel<?> model)
{
// Null out the image resource, so we reload it (otherwise we'll be
// stuck with the old model.
localizedImageResource.setResourceReference(null);
localizedImageResource.setResource(null);
- return (ImageButton)super.setModel(model);
+ return (ImageButton)super.setDefaultModel(model);
}
/**
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/LabeledWebMarkupContainer.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/LabeledWebMarkupContainer.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/LabeledWebMarkupContainer.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/LabeledWebMarkupContainer.java Sat Jun 28 22:50:41 2008
@@ -25,10 +25,8 @@
*
* @author almaw
*
- * @param <T>
- * The model object type
*/
-public abstract class LabeledWebMarkupContainer<T> extends WebMarkupContainer<T>
+public abstract class LabeledWebMarkupContainer extends WebMarkupContainer
implements
ILabelProvider<String>
{
@@ -67,7 +65,7 @@
/**
* @see org.apache.wicket.Component#Component(String, IModel)
*/
- public LabeledWebMarkupContainer(final String id, final IModel<T> model)
+ public LabeledWebMarkupContainer(final String id, final IModel<?> model)
{
super(id, model);
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/ListMultipleChoice.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/ListMultipleChoice.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/ListMultipleChoice.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/ListMultipleChoice.java Sat Jun 28 22:50:41 2008
@@ -140,7 +140,7 @@
/**
* @see org.apache.wicket.markup.html.form.AbstractChoice#AbstractChoice(String, IModel)
*/
- public ListMultipleChoice(String id, IModel<List< ? extends T>> choices)
+ public ListMultipleChoice(String id, IModel<List<? extends T>> choices)
{
super(id, choices);
}
@@ -149,7 +149,7 @@
* @see org.apache.wicket.markup.html.form.AbstractChoice#AbstractChoice(String, IModel,IModel)
*/
public ListMultipleChoice(String id, IModel<Collection<T>> model,
- IModel<List< ? extends T>> choices)
+ IModel<List<? extends T>> choices)
{
super(id, model, choices);
}
@@ -158,7 +158,7 @@
* @see org.apache.wicket.markup.html.form.AbstractChoice#AbstractChoice(String,
* IModel,IChoiceRenderer)
*/
- public ListMultipleChoice(String id, IModel<List< ? extends T>> choices,
+ public ListMultipleChoice(String id, IModel<List<? extends T>> choices,
IChoiceRenderer<T> renderer)
{
super(id, choices, renderer);
@@ -170,7 +170,7 @@
* IModel,IChoiceRenderer)
*/
public ListMultipleChoice(String id, IModel<Collection<T>> model,
- IModel<List< ? extends T>> choices, IChoiceRenderer<T> renderer)
+ IModel<List<? extends T>> choices, IChoiceRenderer<T> renderer)
{
super(id, model, choices, renderer);
}
@@ -199,7 +199,7 @@
final AppendingStringBuffer buffer = new AppendingStringBuffer();
if (selectedValues != null)
{
- final List< ? extends T> choices = getChoices();
+ final List<? extends T> choices = getChoices();
for (T object : selectedValues)
{
int index = choices.indexOf(object);
@@ -279,7 +279,7 @@
if (ids != null && ids.length > 0 && !Strings.isEmpty(ids[0]))
{
// Get values that could be selected
- final List< ? extends T> choices = getChoices();
+ final List<? extends T> choices = getChoices();
// Loop through selected indices
for (int i = 0; i < ids.length; i++)
@@ -316,7 +316,7 @@
Collection<T> selectedValues = getModelObject();
if (selectedValues != null)
{
- if (getModelObject() != selectedValues)
+ if (getDefaultModelObject() != selectedValues)
{
throw new WicketRuntimeException(
"Updating a ListMultipleChoice works by modifying the underlying model object in-place, so please make sure that getObject() always returns the same Collection instance!");
@@ -341,7 +341,7 @@
else
{
selectedValues = getConvertedInput();
- setModelObject(selectedValues);
+ setDefaultModelObject(selectedValues);
}
}
}
\ No newline at end of file
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/Radio.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/Radio.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/Radio.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/Radio.java Sat Jun 28 22:50:41 2008
@@ -38,7 +38,7 @@
* @param <T>
* The model object type
*/
-public class Radio<T> extends LabeledWebMarkupContainer<T>
+public class Radio<T> extends LabeledWebMarkupContainer
{
private static final long serialVersionUID = 1L;
private static final String ATTR_DISABLED = "disabled";
@@ -123,7 +123,7 @@
tag.put("checked", "checked");
}
}
- else if (Objects.equal(group.getModelObject(), getModelObject()))
+ else if (Objects.equal(group.getDefaultModelObject(), getDefaultModelObject()))
{
tag.put("checked", "checked");
}
@@ -177,4 +177,49 @@
setLabelInternal(labelModel);
return this;
}
+
+
+ /**
+ * Gets model
+ *
+ * @return model
+ */
+ @SuppressWarnings("unchecked")
+ public final IModel<T> getModel()
+ {
+ return (IModel<T>)getDefaultModel();
+ }
+
+ /**
+ * Sets model
+ *
+ * @param model
+ */
+ public final void setModel(IModel<T> model)
+ {
+ setDefaultModel(model);
+ }
+
+ /**
+ * Gets model object
+ *
+ * @return model object
+ */
+ @SuppressWarnings("unchecked")
+ public final T getModelObject()
+ {
+ return (T)getDefaultModelObject();
+ }
+
+ /**
+ * Sets model object
+ *
+ * @param object
+ */
+ public final void setModelObject(T object)
+ {
+ setDefaultModelObject(object);
+ }
+
+
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/RadioChoice.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/RadioChoice.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/RadioChoice.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/RadioChoice.java Sat Jun 28 22:50:41 2008
@@ -315,7 +315,7 @@
{
convertInput();
updateModel();
- onSelectionChanged(getModelObject());
+ onSelectionChanged(getDefaultModelObject());
}
/**
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/RadioGroup.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/RadioGroup.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/RadioGroup.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/RadioGroup.java Sat Jun 28 22:50:41 2008
@@ -46,7 +46,7 @@
* @param <T>
* The model object type
*/
-public class RadioGroup<T> extends FormComponent<T> implements IOnChangeListener
+public class RadioGroup<T> extends FormComponent implements IOnChangeListener
{
private static final long serialVersionUID = 1L;
@@ -150,7 +150,7 @@
{
convertInput();
updateModel();
- onSelectionChanged(getModelObject());
+ onSelectionChanged(getDefaultModelObject());
}
/**
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/SimpleFormComponentLabel.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/SimpleFormComponentLabel.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/SimpleFormComponentLabel.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/SimpleFormComponentLabel.java Sat Jun 28 22:50:41 2008
@@ -25,7 +25,7 @@
*
* @author Igor Vaynberg (ivaynberg)
*/
-public class SimpleFormComponentLabel extends FormComponentLabel<String>
+public class SimpleFormComponentLabel extends FormComponentLabel
{
private static final long serialVersionUID = 1L;
@@ -37,7 +37,7 @@
* @param labelProvider
* label provider (e.g. FormComponent, Radio, Check)
*/
- public SimpleFormComponentLabel(String id, LabeledWebMarkupContainer<?> labelProvider)
+ public SimpleFormComponentLabel(String id, LabeledWebMarkupContainer labelProvider)
{
super(id, labelProvider);
if (labelProvider.getLabel() == null)
@@ -46,7 +46,7 @@
+ "Use FormComponent.setLabel(IModel) to set the model "
+ "that will feed this label");
}
- setModel(labelProvider.getLabel());
+ setDefaultModel(labelProvider.getLabel());
}
/**
@@ -56,6 +56,6 @@
@Override
protected void onComponentTagBody(final MarkupStream markupStream, final ComponentTag openTag)
{
- replaceComponentTagBody(markupStream, openTag, getModelObjectAsString());
+ replaceComponentTagBody(markupStream, openTag, getDefaultModelObjectAsString());
}
}
\ No newline at end of file
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/SubmitLink.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/SubmitLink.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/SubmitLink.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/SubmitLink.java Sat Jun 28 22:50:41 2008
@@ -69,7 +69,7 @@
* @param <T>
* The model object type
*/
-public class SubmitLink<T> extends AbstractSubmitLink<T>
+public class SubmitLink extends AbstractSubmitLink
{
private static final long serialVersionUID = 1L;
@@ -112,7 +112,7 @@
* The model for this submitlink, It won't be used by the submit link itself, but it
* can be used for keeping state
*/
- public SubmitLink(String id, IModel<T> model)
+ public SubmitLink(String id, IModel<?> model)
{
super(id, model);
}
@@ -133,7 +133,7 @@
* @param form
* The form which this submitlink must submit.
*/
- public SubmitLink(String id, IModel<T> model, Form<?> form)
+ public SubmitLink(String id, IModel<?> model, Form<?> form)
{
super(id, model, form);
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/TextArea.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/TextArea.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/TextArea.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/TextArea.java Sat Jun 28 22:50:41 2008
@@ -28,7 +28,7 @@
* @param <T>
* The model object type
*/
-public class TextArea<T> extends AbstractTextComponent<T>
+public class TextArea<T> extends AbstractTextComponent
{
private static final long serialVersionUID = 1L;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/persistence/CookieValuePersister.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/persistence/CookieValuePersister.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/persistence/CookieValuePersister.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/persistence/CookieValuePersister.java Sat Jun 28 22:50:41 2008
@@ -43,7 +43,7 @@
/**
* @see org.apache.wicket.markup.html.form.persistence.IValuePersister#clear(org.apache.wicket.markup.html.form.FormComponent)
*/
- public void clear(final FormComponent<?> component)
+ public void clear(final FormComponent component)
{
final Cookie cookie = getCookie(component);
if (cookie != null)
@@ -59,7 +59,7 @@
/**
* @see org.apache.wicket.markup.html.form.persistence.IValuePersister#load(org.apache.wicket.markup.html.form.FormComponent)
*/
- public void load(final FormComponent<?> component)
+ public void load(final FormComponent component)
{
final Cookie cookie = getCookie(component);
if (cookie != null)
@@ -76,7 +76,7 @@
/**
* @see org.apache.wicket.markup.html.form.persistence.IValuePersister#save(org.apache.wicket.markup.html.form.FormComponent)
*/
- public void save(final FormComponent<?> component)
+ public void save(final FormComponent component)
{
final String name = getName(component);
final String value = component.getValue();
@@ -101,7 +101,7 @@
* Component to get name for
* @return The name of the component.
*/
- protected String getName(final FormComponent<?> component)
+ protected String getName(final FormComponent component)
{
return component.getPageRelativePath();
}
@@ -150,7 +150,7 @@
* The form component
* @return The cookie for the component or null if none is available
*/
- private Cookie getCookie(final FormComponent<?> component)
+ private Cookie getCookie(final FormComponent component)
{
// Gets the cookie's name
final String name = getName(component);
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/persistence/IValuePersister.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/persistence/IValuePersister.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/persistence/IValuePersister.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/persistence/IValuePersister.java Sat Jun 28 22:50:41 2008
@@ -38,7 +38,7 @@
* @param component
* The form component
*/
- void save(FormComponent<?> component);
+ void save(FormComponent component);
/**
* Loads any persisted value for a given form component
@@ -46,7 +46,7 @@
* @param component
* The form component
*/
- void load(FormComponent<?> component);
+ void load(FormComponent component);
/**
* Remove any persisted value for a given form component.
@@ -54,5 +54,5 @@
* @param component
* The form component
*/
- void clear(FormComponent<?> component);
+ void clear(FormComponent component);
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/upload/FileUploadField.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/upload/FileUploadField.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/upload/FileUploadField.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/upload/FileUploadField.java Sat Jun 28 22:50:41 2008
@@ -94,13 +94,13 @@
}
/**
- * @see org.apache.wicket.Component#setModel(org.apache.wicket.model.IModel)
+ * @see org.apache.wicket.Component#setDefaultModel(org.apache.wicket.model.IModel)
*/
@Override
- public FileUploadField setModel(IModel<FileUpload> model)
+ public FileUploadField setDefaultModel(IModel<?> model)
{
hasExplicitModel = true;
- return (FileUploadField)super.setModel(model);
+ return (FileUploadField)super.setDefaultModel(model);
}
/**
@@ -112,7 +112,7 @@
// Only update the model if one was passed in
if (hasExplicitModel)
{
- setModelObject(getConvertedInput());
+ setDefaultModelObject(getConvertedInput());
}
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/upload/MultiFileUploadField.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/upload/MultiFileUploadField.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/upload/MultiFileUploadField.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/upload/MultiFileUploadField.java Sat Jun 28 22:50:41 2008
@@ -51,7 +51,8 @@
* be processed within the request they were uploaded.
*
* Uses javascript implementation from
- * http://the-stickman.com/web-development/javascript/upload-multiple-files-with-a-single-file-element/
+ * http://the-stickman.com/web-development/javascript/upload-multiple
+ * -files-with-a-single-file-element/
*
* For customizing caption text see {@link #RESOURCE_LIMITED} and {@link #RESOURCE_UNLIMITED}
*
@@ -96,8 +97,8 @@
MultiFileUploadField.class, "MultiFileUploadField.js");
- private final WebComponent<FileUpload> upload;
- private final WebMarkupContainer<?> container;
+ private final WebComponent upload;
+ private final WebMarkupContainer container;
private final int max;
@@ -151,15 +152,15 @@
this.max = max;
- upload = new WebComponent<FileUpload>("upload");
+ upload = new WebComponent("upload");
upload.setOutputMarkupId(true);
add(upload);
- container = new WebMarkupContainer<Void>("container");
+ container = new WebMarkupContainer("container");
container.setOutputMarkupId(true);
add(container);
- container.add(new Label<String>("caption", new CaptionModel()));
+ container.add(new Label("caption", new CaptionModel()));
}
/**
@@ -301,7 +302,7 @@
if (collection == null)
{
// no existing collection, push the one we created
- setModelObject(getConvertedInput());
+ setDefaultModelObject(getConvertedInput());
}
else
{
@@ -314,7 +315,7 @@
// push the collection in case the model is listening to
// setobject calls
- setModelObject(collection);
+ setDefaultModelObject(collection);
}
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/validation/AbstractFormValidator.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/validation/AbstractFormValidator.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/validation/AbstractFormValidator.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/validation/AbstractFormValidator.java Sat Jun 28 22:50:41 2008
@@ -65,7 +65,7 @@
* form component against which the error is reported
*
*/
- public void error(FormComponent<?> fc)
+ public void error(FormComponent fc)
{
error(fc, resourceKey(), variablesMap());
}
@@ -78,7 +78,7 @@
* @param resourceKey
* The message resource key to use
*/
- public void error(FormComponent<?> fc, final String resourceKey)
+ public void error(FormComponent fc, final String resourceKey)
{
if (resourceKey == null)
{
@@ -96,7 +96,7 @@
* @param vars
* variables for variable interpolation
*/
- public void error(FormComponent<?> fc, final Map<String, Object> vars)
+ public void error(FormComponent fc, final Map<String, Object> vars)
{
if (vars == null)
{
@@ -115,7 +115,7 @@
* @param vars
* The model for variable interpolation
*/
- public void error(FormComponent<?> fc, final String resourceKey, Map<String, Object> vars)
+ public void error(FormComponent fc, final String resourceKey, Map<String, Object> vars)
{
if (fc == null)
{
@@ -155,14 +155,14 @@
*/
protected Map<String, Object> variablesMap()
{
- FormComponent<?>[] formComponents = getDependentFormComponents();
+ FormComponent[] formComponents = getDependentFormComponents();
if (formComponents != null && formComponents.length > 0)
{
Map<String, Object> args = new HashMap<String, Object>(formComponents.length * 3);
for (int i = 0; i < formComponents.length; i++)
{
- final FormComponent<?> formComponent = formComponents[i];
+ final FormComponent formComponent = formComponents[i];
String arg = "label" + i;
IModel<?> label = formComponent.getLabel();
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/validation/EqualInputValidator.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/validation/EqualInputValidator.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/validation/EqualInputValidator.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/validation/EqualInputValidator.java Sat Jun 28 22:50:41 2008
@@ -40,7 +40,7 @@
private static final long serialVersionUID = 1L;
/** form components to be checked. */
- private final FormComponent< ? >[] components;
+ private final FormComponent[] components;
/**
* Construct.
@@ -50,7 +50,7 @@
* @param formComponent2
* a form component
*/
- public EqualInputValidator(FormComponent< ? > formComponent1, FormComponent< ? > formComponent2)
+ public EqualInputValidator(FormComponent formComponent1, FormComponent formComponent2)
{
if (formComponent1 == null)
{
@@ -66,7 +66,7 @@
/**
* @see org.apache.wicket.markup.html.form.validation.IFormValidator#getDependentFormComponents()
*/
- public FormComponent< ? >[] getDependentFormComponents()
+ public FormComponent[] getDependentFormComponents()
{
return components;
}
@@ -78,8 +78,8 @@
{
// we have a choice to validate the type converted values or the raw
// input values, we validate the raw input
- final FormComponent< ? > formComponent1 = components[0];
- final FormComponent< ? > formComponent2 = components[1];
+ final FormComponent formComponent1 = components[0];
+ final FormComponent formComponent2 = components[1];
if (!Objects.equal(formComponent1.getInput(), formComponent2.getInput()))
{
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/validation/EqualPasswordInputValidator.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/validation/EqualPasswordInputValidator.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/validation/EqualPasswordInputValidator.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/validation/EqualPasswordInputValidator.java Sat Jun 28 22:50:41 2008
@@ -44,8 +44,8 @@
* @param formComponent1
* @param formComponent2
*/
- public EqualPasswordInputValidator(FormComponent< ? > formComponent1,
- FormComponent< ? > formComponent2)
+ public EqualPasswordInputValidator(FormComponent formComponent1,
+ FormComponent formComponent2)
{
super(formComponent1, formComponent2);
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/validation/FormComponentFeedbackBorder.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/validation/FormComponentFeedbackBorder.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/validation/FormComponentFeedbackBorder.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/validation/FormComponentFeedbackBorder.java Sat Jun 28 22:50:41 2008
@@ -35,7 +35,7 @@
* @author Jonathan Locke
* @author Eelco Hillenius
*/
-public class FormComponentFeedbackBorder extends Border<Void> implements IFeedback
+public class FormComponentFeedbackBorder extends Border implements IFeedback
{
private static final long serialVersionUID = 1L;
@@ -46,7 +46,7 @@
* Error indicator that will be shown whenever there is an error-level message for the
* collecting component.
*/
- private final class ErrorIndicator extends WebMarkupContainer<Void>
+ private final class ErrorIndicator extends WebMarkupContainer
{
private static final long serialVersionUID = 1L;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/validation/FormComponentFeedbackIndicator.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/validation/FormComponentFeedbackIndicator.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/validation/FormComponentFeedbackIndicator.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/validation/FormComponentFeedbackIndicator.java Sat Jun 28 22:50:41 2008
@@ -33,7 +33,7 @@
*
* @author Jonathan Locke
*/
-public class FormComponentFeedbackIndicator extends Panel<Void> implements IFeedback
+public class FormComponentFeedbackIndicator extends Panel implements IFeedback
{
private static final long serialVersionUID = 1L;
@@ -57,7 +57,7 @@
* @deprecated no need for a model in this component
*/
@Deprecated
- public FormComponentFeedbackIndicator(final String id, IModel<Void> model)
+ public FormComponentFeedbackIndicator(final String id, IModel model)
{
super(id, model);
}
@@ -66,7 +66,7 @@
* @param component
* The component to watch for messages
*/
- public void setIndicatorFor(final Component< ? > component)
+ public void setIndicatorFor(final Component component)
{
filter = new ComponentFeedbackMessageFilter(component);
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/validation/IFormValidator.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/validation/IFormValidator.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/validation/IFormValidator.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/validation/IFormValidator.java Sat Jun 28 22:50:41 2008
@@ -37,7 +37,7 @@
/**
* @return array of {@link FormComponent}s that this validator depends on
*/
- FormComponent< ? >[] getDependentFormComponents();
+ FormComponent[] getDependentFormComponents();
/**
* This method is ran if all components returned by
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/image/ContextImage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/image/ContextImage.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/image/ContextImage.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/image/ContextImage.java Sat Jun 28 22:50:41 2008
@@ -29,7 +29,7 @@
* @author Alastair Maw
* @author Igor Vaynberg (ivaynberg)
*/
-public class ContextImage extends WebComponent<String>
+public class ContextImage extends WebComponent
{
private static final long serialVersionUID = 1L;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/image/ContextPathGenerator.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/image/ContextPathGenerator.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/image/ContextPathGenerator.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/image/ContextPathGenerator.java Sat Jun 28 22:50:41 2008
@@ -60,7 +60,7 @@
/** {@inheritDoc} **/
@Override
- public void onComponentTag(Component<?> component, ComponentTag tag)
+ public void onComponentTag(Component component, ComponentTag tag)
{
// get the path
final String path = contextRelativePath.getObject();
@@ -76,7 +76,7 @@
/** {@inheritDoc} **/
@Override
- public void detach(Component<?> component)
+ public void detach(Component component)
{
contextRelativePath.detach();
super.detach(component);
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/image/Image.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/image/Image.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/image/Image.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/image/Image.java Sat Jun 28 22:50:41 2008
@@ -37,10 +37,8 @@
*
* @author Jonathan Locke
*
- * @param <T>
- * The model object type
*/
-public class Image<T> extends WebComponent<T> implements IResourceListener
+public class Image extends WebComponent implements IResourceListener
{
private static final long serialVersionUID = 1L;
@@ -125,7 +123,7 @@
/**
* @see org.apache.wicket.Component#Component(String, IModel)
*/
- public Image(final String id, final IModel<T> model)
+ public Image(final String id, final IModel<?> model)
{
super(id, model);
}
@@ -182,16 +180,16 @@
}
/**
- * @see org.apache.wicket.Component#setModel(org.apache.wicket.model.IModel)
+ * @see org.apache.wicket.Component#setDefaultModel(org.apache.wicket.model.IModel)
*/
@Override
- public Component<T> setModel(IModel<T> model)
+ public Component setDefaultModel(IModel<?> model)
{
// Null out the image resource, so we reload it (otherwise we'll be
// stuck with the old model.
localizedImageResource.setResourceReference(null);
localizedImageResource.setResource(null);
- return super.setModel(model);
+ return super.setDefaultModel(model);
}
/**
@@ -214,7 +212,7 @@
* @see org.apache.wicket.Component#initModel()
*/
@Override
- protected IModel<T> initModel()
+ protected IModel<?> initModel()
{
// Images don't support Compound models. They either have a simple
// model, explicitly set, or they use their tag's src or value
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/image/NonCachingImage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/image/NonCachingImage.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/image/NonCachingImage.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/image/NonCachingImage.java Sat Jun 28 22:50:41 2008
@@ -27,10 +27,8 @@
* browser from caching the image.
*
* @author Igor Vaynberg (ivaynberg)
- * @param <T>
- * type of model object
*/
-public class NonCachingImage<T> extends Image<T>
+public class NonCachingImage extends Image
{
/**
*
@@ -45,7 +43,7 @@
* @param id
* @param model
*/
- public NonCachingImage(String id, IModel<T> model)
+ public NonCachingImage(String id, IModel<?> model)
{
super(id, model);
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/image/resource/LocalizedImageResource.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/image/resource/LocalizedImageResource.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/image/resource/LocalizedImageResource.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/image/resource/LocalizedImageResource.java Sat Jun 28 22:50:41 2008
@@ -79,7 +79,7 @@
private Boolean resourceKind;
/** The component that is referencing this image resource */
- private final Component<?> component;
+ private final Component component;
/** The image resource this image component references */
private Resource resource;
@@ -161,7 +161,7 @@
* @param component
* The component that owns this localized image resource
*/
- public LocalizedImageResource(final Component<?> component)
+ public LocalizedImageResource(final Component component)
{
this.component = component;
locale = component.getLocale();
@@ -280,7 +280,7 @@
// check if the model contains a resource, if so, load the resource from
// the model.
- Object modelObject = component.getModelObject();
+ Object modelObject = component.getDefaultModelObject();
if (modelObject instanceof ResourceReference)
{
resourceReference = (ResourceReference)modelObject;
@@ -312,7 +312,7 @@
else
{
// Load static image using model object as the path
- loadStaticImage(component.getModelObjectAsString());
+ loadStaticImage(component.getDefaultModelObjectAsString());
}
}
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/include/Include.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/include/Include.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/include/Include.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/include/Include.java Sat Jun 28 22:50:41 2008
@@ -76,7 +76,7 @@
*
* @author Eelco Hillenius
*/
-public class Include extends WebComponent<String>
+public class Include extends WebComponent
{
private static final long serialVersionUID = 1L;
@@ -143,7 +143,7 @@
{
// gets the model object: should provide us with either an absolute or a
// relative url
- String url = getModelObjectAsString();
+ String url = getDefaultModelObjectAsString();
if (!isAbsolute(url))
{
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/internal/Enclosure.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/internal/Enclosure.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/internal/Enclosure.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/internal/Enclosure.java Sat Jun 28 22:50:41 2008
@@ -75,19 +75,19 @@
* @author Juergen Donnerstag
* @since 1.3
*/
-public class Enclosure extends WebMarkupContainer<Object>
+public class Enclosure extends WebMarkupContainer
{
private static final long serialVersionUID = 1L;
private static final Logger log = LoggerFactory.getLogger(Enclosure.class);
/** The child component to delegate the isVisible() call to */
- private Component< ? > childComponent;
+ private Component childComponent;
/** Id of the child component that will control visibility of the enclosure */
private final CharSequence childId;
- private transient Map<Component< ? >, Boolean> originalVisibilityStatus;
+ private transient Map<Component, Boolean> originalVisibilityStatus;
/**
* Construct.
@@ -116,11 +116,11 @@
* @param childId
* @return Child Component
*/
- public Component< ? > getChildComponent()
+ public Component getChildComponent()
{
if (childComponent == null)
{
- MarkupContainer< ? > parent = getEnclosureParent();
+ MarkupContainer parent = getEnclosureParent();
if (childId == null)
{
@@ -128,7 +128,7 @@
"You most likely forgot to register the EnclosureHandler with the MarkupParserFactory");
}
- final Component< ? > child = parent.get(childId.toString());
+ final Component child = parent.get(childId.toString());
if (child == null)
{
throw new MarkupException(
@@ -145,9 +145,9 @@
*
* @return enclosure's parent markup container
*/
- private MarkupContainer< ? > getEnclosureParent()
+ private MarkupContainer getEnclosureParent()
{
- MarkupContainer< ? > parent = getParent();
+ MarkupContainer parent = getParent();
while (parent != null)
{
if (parent.isTransparentResolver())
@@ -180,7 +180,7 @@
@Override
protected void onComponentTagBody(MarkupStream markupStream, ComponentTag openTag)
{
- final Component< ? > controller = getChildComponent();
+ final Component controller = getChildComponent();
if (controller == this)
{
throw new WicketRuntimeException(
@@ -190,13 +190,13 @@
setVisible(controller.determineVisibility());
// transfer visibility to direct children
- originalVisibilityStatus = new HashMap<Component< ? >, Boolean>();
+ originalVisibilityStatus = new HashMap<Component, Boolean>();
DirectChildTagIterator it = new DirectChildTagIterator(markupStream, openTag);
- MarkupContainer< ? > controllerParent = getEnclosureParent();
+ MarkupContainer controllerParent = getEnclosureParent();
while (it.hasNext())
{
ComponentTag t = it.next();
- Component< ? > child = controllerParent.get(t.getId());
+ Component child = controllerParent.get(t.getId());
if (child != null)
{
// record original visiblity allowed value, will restore later
@@ -223,7 +223,7 @@
if (originalVisibilityStatus != null)
{
// restore original visibility statuses
- for (Map.Entry<Component< ? >, Boolean> entry : originalVisibilityStatus.entrySet())
+ for (Map.Entry<Component, Boolean> entry : originalVisibilityStatus.entrySet())
{
entry.getKey().setVisibilityAllowed(entry.getValue());
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/internal/HtmlHeaderContainer.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/internal/HtmlHeaderContainer.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/internal/HtmlHeaderContainer.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/internal/HtmlHeaderContainer.java Sat Jun 28 22:50:41 2008
@@ -47,24 +47,24 @@
* HtmlHeaderResolver.
* <p>
* <ul>
- * <li> <head> will be inserted in output automatically if required</li>
- * <li> <head> is <b>not</b> a wicket specific tag and you must use add() to add components
+ * <li><head> will be inserted in output automatically if required</li>
+ * <li><head> is <b>not</b> a wicket specific tag and you must use add() to add components
* referenced in body of the head tag</li>
- * <li> <head> is supported by panels, borders and inherited markup, but is <b>not</b> copied
+ * <li><head> is supported by panels, borders and inherited markup, but is <b>not</b> copied
* to the output. They are for previewability only (except on Pages)</li>
- * <li> <wicket:head> does not make sense in page markup (but does in inherited page markup)</li>
- * <li> <wicket:head> makes sense in Panels, Borders and inherited markup (of Panels, Borders
+ * <li><wicket:head> does not make sense in page markup (but does in inherited page markup)</li>
+ * <li><wicket:head> makes sense in Panels, Borders and inherited markup (of Panels, Borders
* and Pages)</li>
- * <li> components within <wicket:head> must be added by means of add(), like always with
+ * <li>components within <wicket:head> must be added by means of add(), like always with
* Wicket. No difference.</li>
- * <li> <wicket:head> and it's content is copied to the output. Components contained in
+ * <li><wicket:head> and it's content is copied to the output. Components contained in
* <org.apache.wicket.head> are rendered as usual</li>
* </ul>
*
* @author Juergen Donnerstag
*
*/
-public class HtmlHeaderContainer extends WebMarkupContainer<Void>
+public class HtmlHeaderContainer extends WebMarkupContainer
{
private static final long serialVersionUID = 1L;
@@ -205,18 +205,18 @@
* @param container
* The header component container
*/
- private final void renderHeaderSections(final MarkupContainer< ? > page,
+ private final void renderHeaderSections(final MarkupContainer page,
final HtmlHeaderContainer container)
{
page.renderHead(container);
// Make sure all Components interested in contributing to the header
// and there attached behaviors are asked.
- page.visitChildren(new IVisitor<Component< ? >>()
+ page.visitChildren(new IVisitor<Component>()
{
/**
* @see org.apache.wicket.Component.IVisitor#component(org.apache.wicket.Component)
*/
- public Object component(Component< ? > component)
+ public Object component(Component component)
{
if (component.isVisible())
{
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/AbstractLink.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/AbstractLink.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/AbstractLink.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/AbstractLink.java Sat Jun 28 22:50:41 2008
@@ -26,26 +26,18 @@
* Base class that that contains functionality for rendering disabled links.
*
* @author Matej Knopp
- *
- * @param <T>
- * The model object type
*/
-public abstract class AbstractLink<T> extends WebMarkupContainer<T>
+public abstract class AbstractLink extends WebMarkupContainer
{
-
- /**
- *
- */
private static final long serialVersionUID = 1L;
-
/**
* Construct.
*
* @param id
* @param model
*/
- public AbstractLink(String id, IModel<T> model)
+ public AbstractLink(String id, IModel<?> model)
{
super(id, model);
}
@@ -78,7 +70,7 @@
* The insertion string
* @return this
*/
- public AbstractLink<T> setAfterDisabledLink(final String afterDisabledLink)
+ public AbstractLink setAfterDisabledLink(final String afterDisabledLink)
{
if (afterDisabledLink == null)
{
@@ -106,7 +98,7 @@
* The insertion string
* @return this
*/
- public AbstractLink<T> setBeforeDisabledLink(final String beforeDisabledLink)
+ public AbstractLink setBeforeDisabledLink(final String beforeDisabledLink)
{
if (beforeDisabledLink == null)
{
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/BookmarkablePageLink.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/BookmarkablePageLink.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/BookmarkablePageLink.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/BookmarkablePageLink.java Sat Jun 28 22:50:41 2008
@@ -33,7 +33,7 @@
*
* @author Jonathan Locke
*/
-public class BookmarkablePageLink extends Link<CharSequence>
+public class BookmarkablePageLink extends Link
{
private static final long serialVersionUID = 1L;
@@ -57,7 +57,7 @@
* @param pageClass
* The class of page to link to
*/
- public <C extends Page<?>> BookmarkablePageLink(final String id, final Class<C> pageClass)
+ public <C extends Page> BookmarkablePageLink(final String id, final Class<C> pageClass)
{
this(id, pageClass, null);
}
@@ -113,7 +113,7 @@
* @param parameters
* The parameters to pass to the new page when the link is clicked
*/
- public <C extends Page<?>> BookmarkablePageLink(final String id, final Class<C> pageClass,
+ public <C extends Page> BookmarkablePageLink(final String id, final Class<C> pageClass,
final PageParameters parameters)
{
super(id);
@@ -137,7 +137,7 @@
*
* @return Page class
*/
- public final Class<? extends Page<?>> getPageClass()
+ public final Class<? extends Page> getPageClass()
{
return Classes.resolveClass(pageClassName);
}
@@ -165,7 +165,7 @@
* @see org.apache.wicket.markup.html.link.Link#linksTo(org.apache.wicket.Page)
*/
@Override
- public boolean linksTo(final Page<?> page)
+ public boolean linksTo(final Page page)
{
return page.getClass() == getPageClass();
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/DownloadLink.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/DownloadLink.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/DownloadLink.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/DownloadLink.java Sat Jun 28 22:50:41 2008
@@ -68,7 +68,7 @@
{
throw new IllegalArgumentException("file cannot be null");
}
- setModel(new Model<File>(file));
+ setDefaultModel(new Model<File>(file));
}
/**
@@ -122,7 +122,7 @@
{
throw new IllegalArgumentException("fileName cannot be an empty string");
}
- setModel(new Model<File>(file));
+ setDefaultModel(new Model<File>(file));
this.fileName = fileName;
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/ExternalLink.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/ExternalLink.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/ExternalLink.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/ExternalLink.java Sat Jun 28 22:50:41 2008
@@ -30,7 +30,7 @@
*
* @author Juergen Donnerstag
*/
-public class ExternalLink extends AbstractLink<String>
+public class ExternalLink extends AbstractLink
{
private static final long serialVersionUID = 1L;
@@ -59,7 +59,7 @@
{
super(id);
- setModel(href != null ? new Model<String>(href) : null);
+ setDefaultModel(href != null ? new Model<String>(href) : null);
this.label = (label != null ? new Model<String>(label) : null);
}
@@ -90,7 +90,7 @@
{
super(id);
- setModel(wrap(href));
+ setDefaultModel(wrap(href));
this.label = wrap(label);
}
@@ -148,9 +148,9 @@
{
disableLink(tag);
}
- else if (getModel() != null)
+ else if (getDefaultModel() != null)
{
- Object hrefValue = getModelObject();
+ Object hrefValue = getDefaultModelObject();
if (hrefValue != null)
{
String url = hrefValue.toString();
@@ -231,7 +231,7 @@
if ((label != null) && (label.getObject() != null))
{
replaceComponentTagBody(markupStream, openTag,
- getModelObjectAsString(label.getObject()));
+ getDefaultModelObjectAsString(label.getObject()));
}
else
{
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/IPageLink.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/IPageLink.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/IPageLink.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/IPageLink.java Sat Jun 28 22:50:41 2008
@@ -44,7 +44,7 @@
*
* @return The page to go to.
*/
- Page<?> getPage();
+ Page getPage();
/**
* Gets the class of the destination page, which serves as a form of identity that can be used
@@ -70,5 +70,5 @@
* @return The class of page linked to, as a form of identity
* @see Link#linksTo(Page)
*/
- Class<? extends Page<?>> getPageIdentity();
+ Class<? extends Page> getPageIdentity();
}
\ No newline at end of file
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/ImageMap.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/ImageMap.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/ImageMap.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/ImageMap.java Sat Jun 28 22:50:41 2008
@@ -30,10 +30,8 @@
* An image map holds links with different hot-area shapes.
*
* @author Jonathan Locke
- * @param <T>
- * type of model object
*/
-public final class ImageMap<T> extends WebMarkupContainer<T>
+public final class ImageMap extends WebMarkupContainer
{
private static final long serialVersionUID = 1L;
@@ -68,7 +66,7 @@
* @param link
* the link
*/
- public CircleLink(final int x, final int y, final int radius, final Link< ? > link)
+ public CircleLink(final int x, final int y, final int radius, final Link link)
{
super(link);
this.x = x;
@@ -113,7 +111,7 @@
* @param link
* the link
*/
- public PolygonLink(final int[] coordinates, final Link< ? > link)
+ public PolygonLink(final int[] coordinates, final Link link)
{
super(link);
this.coordinates = coordinates;
@@ -181,8 +179,7 @@
* @param link
* the link
*/
- public RectangleLink(final int x1, final int y1, final int x2, final int y2,
- final Link< ? > link)
+ public RectangleLink(final int x1, final int y1, final int x2, final int y2, final Link link)
{
super(link);
this.x1 = x1;
@@ -220,7 +217,7 @@
*/
private static final long serialVersionUID = 1L;
/** The link. */
- private final Link< ? > link;
+ private final Link link;
/**
* Constructor.
@@ -228,7 +225,7 @@
* @param link
* The link
*/
- public ShapeLink(final Link< ? > link)
+ public ShapeLink(final Link link)
{
this.link = link;
}
@@ -302,8 +299,7 @@
* the link
* @return This
*/
- public ImageMap<T> addCircleLink(final int x1, final int y1, final int radius,
- final Link<T> link)
+ public ImageMap addCircleLink(final int x1, final int y1, final int radius, final Link link)
{
add(link);
shapeLinks.add(new CircleLink(x1, y1, radius, link));
@@ -319,7 +315,7 @@
* the link
* @return This
*/
- public ImageMap<T> addPolygonLink(final int[] coordinates, final Link<T> link)
+ public ImageMap addPolygonLink(final int[] coordinates, final Link link)
{
add(link);
shapeLinks.add(new PolygonLink(coordinates, link));
@@ -340,8 +336,8 @@
* @param link
* @return This
*/
- public ImageMap<T> addRectangleLink(final int x1, final int y1, final int x2, final int y2,
- final Link< ? > link)
+ public ImageMap addRectangleLink(final int x1, final int y1, final int x2, final int y2,
+ final Link link)
{
add(link);
shapeLinks.add(new RectangleLink(x1, y1, x2, y2, link));
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/InlineFrame.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/InlineFrame.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/InlineFrame.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/InlineFrame.java Sat Jun 28 22:50:41 2008
@@ -34,11 +34,10 @@
*
* @author Sven Meier
* @author Ralf Ebert
- * @param <T>
- * type of model object
+ *
*/
-public class InlineFrame<T> extends WebMarkupContainer<T> implements ILinkListener
+public class InlineFrame extends WebMarkupContainer implements ILinkListener
{
private static final long serialVersionUID = 1L;
@@ -63,7 +62,7 @@
* @param c
* Page class
*/
- public <C extends Page<?>> InlineFrame(final String id, final IPageMap pageMap, final Class<C> c)
+ public <C extends Page> InlineFrame(final String id, final IPageMap pageMap, final Class<C> c)
{
this(id, pageMap, c, null);
}
@@ -83,14 +82,14 @@
* @param params
* Page parameters
*/
- public <C extends Page<?>> InlineFrame(final String id, final IPageMap pageMap,
- final Class<C> c, final PageParameters params)
+ public <C extends Page> InlineFrame(final String id, final IPageMap pageMap, final Class<C> c,
+ final PageParameters params)
{
this(id, pageMap, new IPageLink()
{
private static final long serialVersionUID = 1L;
- public Page<?> getPage()
+ public Page getPage()
{
if (params == null)
{
@@ -103,7 +102,7 @@
}
}
- public Class<? extends Page<?>> getPageIdentity()
+ public Class<? extends Page> getPageIdentity()
{
return c;
}
@@ -125,22 +124,22 @@
* @param page
* The page
*/
- public InlineFrame(final String id, final Page<?> page)
+ public InlineFrame(final String id, final Page page)
{
this(id, page.getPageMap(), new IPageLink()
{
private static final long serialVersionUID = 1L;
- public Page<?> getPage()
+ public Page getPage()
{
// use given page
return page;
}
@SuppressWarnings("unchecked")
- public Class<? extends Page<?>> getPageIdentity()
+ public Class<? extends Page> getPageIdentity()
{
- return (Class<? extends Page<?>>)page.getClass();
+ return page.getClass();
}
});
@@ -239,8 +238,8 @@
* TODO optimization: the inlineframe component does not always have to be stateless.
*
* unfortunately due to current implementation always using ipagelink and a ilinklistener
- * callback it has to always be *stateful* because it can be put inside a listview item
- * which will not be built upon a stateless callback causing a "component at path
+ * callback it has to always bestateful because it can be put inside a listview item which
+ * will not be built upon a stateless callback causing a "component at path
* listview:0:iframe not found" error.
*
* eventually variant such as (string, ipagemap, class<? extends Page>) can be made
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/Link.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/Link.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/Link.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/Link.java Sat Jun 28 22:50:41 2008
@@ -72,10 +72,8 @@
*
* @author Jonathan Locke
* @author Eelco Hillenius
- * @param <T>
- * type of model object
*/
-public abstract class Link<T> extends AbstractLink<T> implements ILinkListener
+public abstract class Link<T> extends AbstractLink implements ILinkListener
{
/** Change record for when an anchor is changed. */
private final class AnchorChange extends Change
@@ -83,14 +81,14 @@
private static final long serialVersionUID = 1L;
/** the old anchor. */
- private final Component< ? > anchor;
+ private final Component anchor;
/**
* Construct.
*
* @param anchor
*/
- public AnchorChange(Component< ? > anchor)
+ public AnchorChange(Component anchor)
{
this.anchor = anchor;
}
@@ -111,7 +109,7 @@
* must be attached to a <a tag with a href attribute of more than one character starting
* with '#' ('<a href="#someAnchor" ... ').
*/
- private Component< ? > anchor;
+ private Component anchor;
/**
* True if link should automatically enable/disable based on current page; false by default.
@@ -145,7 +143,7 @@
*
* @return Any anchor component to jump to, might be null
*/
- public Component< ? > getAnchor()
+ public Component getAnchor()
{
return anchor;
}
@@ -231,7 +229,7 @@
* The anchor
* @return this
*/
- public Link<T> setAnchor(Component< ? > anchor)
+ public Link setAnchor(Component anchor)
{
addStateChange(new AnchorChange(this.anchor));
this.anchor = anchor;
@@ -245,7 +243,7 @@
* whether this link should automatically enable/disable based on current page.
* @return This
*/
- public final Link<T> setAutoEnable(final boolean autoEnable)
+ public final Link setAutoEnable(final boolean autoEnable)
{
this.autoEnable = autoEnable;
return this;
@@ -259,7 +257,7 @@
* the popup specification.
* @return This
*/
- public final Link<T> setPopupSettings(final PopupSettings popupSettings)
+ public final Link setPopupSettings(final PopupSettings popupSettings)
{
this.popupSettings = popupSettings;
return this;
@@ -291,7 +289,7 @@
{
if (url != null)
{
- Component< ? > anchor = getAnchor();
+ Component anchor = getAnchor();
if (anchor != null)
{
if (url.toString().indexOf('#') == -1)
@@ -377,7 +375,7 @@
* A page
* @return True if this link goes to the given page
*/
- protected boolean linksTo(final Page< ? > page)
+ protected boolean linksTo(final Page page)
{
return false;
}
@@ -474,4 +472,47 @@
}
}
+
+ /**
+ * Gets model
+ *
+ * @return model
+ */
+ @SuppressWarnings("unchecked")
+ public final IModel<T> getModel()
+ {
+ return (IModel<T>)getDefaultModel();
+ }
+
+ /**
+ * Sets model
+ *
+ * @param model
+ */
+ public final void setModel(IModel<T> model)
+ {
+ setDefaultModel(model);
+ }
+
+ /**
+ * Gets model object
+ *
+ * @return model object
+ */
+ @SuppressWarnings("unchecked")
+ public final T getModelObject()
+ {
+ return (T)getDefaultModelObject();
+ }
+
+ /**
+ * Sets model object
+ *
+ * @param object
+ */
+ public final void setModelObject(T object)
+ {
+ setDefaultModelObject(object);
+ }
+
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/PageLink.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/PageLink.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/PageLink.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/PageLink.java Sat Jun 28 22:50:41 2008
@@ -27,10 +27,8 @@
*
* @see IPageLink
* @author Jonathan Locke
- * @param <T>
- * type of model object
*/
-public class PageLink<T> extends Link<T>
+public class PageLink extends Link
{
private static final long serialVersionUID = 1L;
@@ -48,7 +46,7 @@
* @param c
* Page class
*/
- public <C extends Page<?>> PageLink(final String id, final Class<C> c)
+ public <C extends Page> PageLink(final String id, final Class<C> c)
{
super(id);
@@ -58,17 +56,17 @@
throw new IllegalArgumentException("Class " + c + " is not a subclass of Page");
}
- this.pageLink = new IPageLink()
+ pageLink = new IPageLink()
{
private static final long serialVersionUID = 1L;
- public Page<?> getPage()
+ public Page getPage()
{
// Create page using page factory
return PageLink.this.getPage().getPageFactory().newPage(c);
}
- public Class<? extends Page<?>> getPageIdentity()
+ public Class<? extends Page> getPageIdentity()
{
return c;
}
@@ -108,24 +106,24 @@
* setResponsePage in their {@link Link#onClick() onClick} methods.
*/
@Deprecated
- public PageLink(final String id, final Page<?> page)
+ public PageLink(final String id, final Page page)
{
super(id);
- this.pageLink = new IPageLink()
+ pageLink = new IPageLink()
{
private static final long serialVersionUID = 1L;
- public Page<?> getPage()
+ public Page getPage()
{
// Create page using page factory
return page;
}
@SuppressWarnings("unchecked")
- public Class<? extends Page<?>> getPageIdentity()
+ public Class<? extends Page> getPageIdentity()
{
- return (Class<? extends Page<?>>)page.getClass();
+ return page.getClass();
}
};
}
@@ -137,7 +135,7 @@
* @see org.apache.wicket.markup.html.link.Link#linksTo(org.apache.wicket.Page)
*/
@Override
- public boolean linksTo(final Page<?> page)
+ public boolean linksTo(final Page page)
{
return page.getClass() == pageLink.getPageIdentity();
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/PopupCloseLink.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/PopupCloseLink.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/PopupCloseLink.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/PopupCloseLink.java Sat Jun 28 22:50:41 2008
@@ -23,17 +23,15 @@
* Closes a popup window and cleans up any related session page map for the popup.
*
* @author Jonathan Locke
- * @param <T>
- * type of model object
*/
-public class PopupCloseLink<T> extends Link<T>
+public class PopupCloseLink extends Link
{
private static final long serialVersionUID = 1L;
/**
* ClosePopupPage closes the popup window.
*/
- public static final class ClosePopupPage extends WebPage<Void>
+ public static final class ClosePopupPage extends WebPage
{
private static final long serialVersionUID = 1L;
}
@@ -54,7 +52,7 @@
* @param id
* @param object
*/
- public PopupCloseLink(String id, IModel<T> object)
+ public PopupCloseLink(String id, IModel<?> object)
{
super(id, object);
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/PopupSettings.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/PopupSettings.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/PopupSettings.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/PopupSettings.java Sat Jun 28 22:50:41 2008
@@ -341,7 +341,7 @@
* Calling component
* @return The pagemap where the popup page must be created in
*/
- public IPageMap getPageMap(Component<?> callee)
+ public IPageMap getPageMap(Component callee)
{
if (pageMapName != null)
{
@@ -354,7 +354,7 @@
throw new IllegalArgumentException(
"when the page map is not set, argument callee may not be null");
}
- Page<?> page = callee.getPage();
+ Page page = callee.getPage();
if (page == null)
{
throw new IllegalStateException(callee +
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/ResourceLink.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/ResourceLink.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/ResourceLink.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/ResourceLink.java Sat Jun 28 22:50:41 2008
@@ -25,10 +25,8 @@
* A link to any ResourceReference.
*
* @author Jonathan Locke
- * @param <T>
- * type of model object
*/
-public class ResourceLink<T> extends Link<T> implements IResourceListener
+public class ResourceLink extends Link implements IResourceListener
{
private static final long serialVersionUID = 1L;
@@ -73,7 +71,7 @@
super(id);
this.resourceReference = resourceReference;
this.resourceParameters = resourceParameters;
- this.resource = null;
+ resource = null;
}
/**
@@ -88,8 +86,8 @@
{
super(id);
this.resource = resource;
- this.resourceReference = null;
- this.resourceParameters = null;
+ resourceReference = null;
+ resourceParameters = null;
}
/**
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/StatelessLink.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/StatelessLink.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/StatelessLink.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/StatelessLink.java Sat Jun 28 22:50:41 2008
@@ -25,10 +25,8 @@
*
* @author jcompagner
*
- * @param <T>
- * The model object type
*/
-public abstract class StatelessLink<T> extends Link<T>
+public abstract class StatelessLink extends Link
{
private static final long serialVersionUID = 1L;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/list/ListItem.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/list/ListItem.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/list/ListItem.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/list/ListItem.java Sat Jun 28 22:50:41 2008
@@ -27,7 +27,7 @@
* @param <T>
* Model object type
*/
-public class ListItem<T> extends WebMarkupContainer<T>
+public class ListItem<T> extends WebMarkupContainer
{
private static final long serialVersionUID = 1L;
@@ -58,4 +58,46 @@
{
return index;
}
+
+ /**
+ * Gets model
+ *
+ * @return model
+ */
+ @SuppressWarnings("unchecked")
+ public final IModel<T> getModel()
+ {
+ return (IModel<T>)getDefaultModel();
+ }
+
+ /**
+ * Sets model
+ *
+ * @param model
+ */
+ public final void setModel(IModel<T> model)
+ {
+ setDefaultModel(model);
+ }
+
+ /**
+ * Gets model object
+ *
+ * @return model object
+ */
+ @SuppressWarnings("unchecked")
+ public final T getModelObject()
+ {
+ return (T)getDefaultModelObject();
+ }
+
+ /**
+ * Sets model object
+ *
+ * @param object
+ */
+ public final void setModelObject(T object)
+ {
+ setDefaultModelObject(object);
+ }
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/list/ListView.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/list/ListView.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/list/ListView.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/list/ListView.java Sat Jun 28 22:50:41 2008
@@ -104,11 +104,8 @@
* @param <T>
* Model object type
*/
-public abstract class ListView<T> extends AbstractRepeater<List<T>>
+public abstract class ListView<T> extends AbstractRepeater
{
- /**
- *
- */
private static final long serialVersionUID = 1L;
/** Index of the first item to show */
@@ -135,6 +132,8 @@
}
/**
+ * @param id
+ * @param model
* @see org.apache.wicket.Component#Component(String, IModel)
*/
public ListView(final String id, final IModel<List<T>> model)
@@ -171,9 +170,10 @@
*
* @return The list of items in this list view.
*/
+ @SuppressWarnings("unchecked")
public final List<T> getList()
{
- final List<T> list = getModelObject();
+ final List<T> list = (List<T>)getDefaultModelObject();
if (list == null)
{
return Collections.emptyList();
@@ -217,7 +217,7 @@
{
int size = viewSize;
- final Object modelObject = getModelObject();
+ final Object modelObject = getDefaultModelObject();
if (modelObject == null)
{
return size == Integer.MAX_VALUE ? 0 : size;
@@ -248,17 +248,14 @@
/**
* Returns a link that will move the given item "down" (towards the end) in the listView.
*
- * @param <S>
- * The returned {@link Link}'s model object type
- *
* @param id
* Name of move-down link component to create
* @param item
* @return The link component
*/
- public final <S> Link<S> moveDownLink(final String id, final ListItem<T> item)
+ public final Link moveDownLink(final String id, final ListItem<T> item)
{
- return new Link<S>(id)
+ return new Link(id)
{
private static final long serialVersionUID = 1L;
@@ -268,7 +265,7 @@
@Override
public void onClick()
{
- final int index = getList().indexOf(item.getModelObject());
+ final int index = getList().indexOf(item.getDefaultModelObject());
if (index != -1)
{
addStateChange(new Change()
@@ -299,7 +296,7 @@
{
super.onBeforeRender();
setAutoEnable(false);
- if (getList().indexOf(item.getModelObject()) == (getList().size() - 1))
+ if (getList().indexOf(item.getDefaultModelObject()) == (getList().size() - 1))
{
setEnabled(false);
}
@@ -310,17 +307,14 @@
/**
* Returns a link that will move the given item "up" (towards the beginning) in the listView.
*
- * @param <S>
- * The returned {@link Link}'s model object type
- *
* @param id
* Name of move-up link component to create
* @param item
* @return The link component
*/
- public final <S> Link<S> moveUpLink(final String id, final ListItem<T> item)
+ public final Link moveUpLink(final String id, final ListItem<T> item)
{
- return new Link<S>(id)
+ return new Link(id)
{
private static final long serialVersionUID = 1L;
@@ -330,7 +324,7 @@
@Override
public void onClick()
{
- final int index = getList().indexOf(item.getModelObject());
+ final int index = getList().indexOf(item.getDefaultModelObject());
if (index != -1)
{
@@ -362,7 +356,7 @@
{
super.onBeforeRender();
setAutoEnable(false);
- if (getList().indexOf(item.getModelObject()) == 0)
+ if (getList().indexOf(item.getDefaultModelObject()) == 0)
{
setEnabled(false);
}
@@ -373,17 +367,14 @@
/**
* Returns a link that will remove this ListItem from the ListView that holds it.
*
- * @param <S>
- * The returned {@link Link}'s model object type
- *
* @param id
* Name of remove link component to create
* @param item
* @return The link component
*/
- public final <S> Link<S> removeLink(final String id, final ListItem<T> item)
+ public final Link removeLink(final String id, final ListItem<T> item)
{
- return new Link<S>(id)
+ return new Link(id)
{
private static final long serialVersionUID = 1L;
@@ -397,7 +388,7 @@
{
private static final long serialVersionUID = 1L;
- final int oldIndex = getList().indexOf(item.getModelObject());
+ final int oldIndex = getList().indexOf(item.getDefaultModelObject());
final T removedObject = item.getModelObject();
@Override
@@ -411,7 +402,7 @@
item.modelChanging();
// Remove item and invalidate listView
- getList().remove(item.getModelObject());
+ getList().remove(item.getDefaultModelObject());
ListView.this.modelChanged();
ListView.this.removeAll();
@@ -429,7 +420,7 @@
*/
public ListView<T> setList(List<T> list)
{
- setModel(Model.of(list));
+ setDefaultModel(Model.of(list));
return this;
}
@@ -536,10 +527,10 @@
{
// Remove all ListItems no longer required
final int maxIndex = firstIndex + size;
- for (final Iterator<Component<?>> iterator = iterator(); iterator.hasNext();)
+ for (final Iterator<? extends ListItem<T>> iterator = iterator(); iterator.hasNext();)
{
// Get next child component
- final ListItem<?> child = (ListItem<?>)iterator.next();
+ final ListItem<?> child = iterator.next();
if (child != null)
{
final int index = child.getIndex();
@@ -626,7 +617,7 @@
* @see org.apache.wicket.markup.repeater.AbstractRepeater#renderChild(org.apache.wicket.Component)
*/
@Override
- protected final void renderChild(Component<?> child)
+ protected final void renderChild(Component child)
{
renderItem((ListItem<?>)child);
}
@@ -647,11 +638,11 @@
* @see org.apache.wicket.markup.repeater.AbstractRepeater#renderIterator()
*/
@Override
- protected Iterator<Component<?>> renderIterator()
+ protected Iterator<Component> renderIterator()
{
final int size = size();
- return new ReadOnlyIterator<Component<?>>()
+ return new ReadOnlyIterator<Component>()
{
private int index = 0;
@@ -660,13 +651,62 @@
return index < size;
}
- public Component<?> next()
+ public Component next()
{
final String id = Integer.toString(firstIndex + index);
index++;
- Component<?> c = get(id);
+ Component c = get(id);
return c;
}
};
}
+
+ @SuppressWarnings({"unchecked"})
+ @Override
+ public Iterator<? extends ListItem<T>> iterator() {
+ return (Iterator<? extends ListItem<T>>) super.iterator();
+ }
+
+ /**
+ * Gets model
+ *
+ * @return model
+ */
+ @SuppressWarnings("unchecked")
+ public final IModel<List<T>> getModel()
+ {
+ return (IModel<List<T>>)getDefaultModel();
+ }
+
+ /**
+ * Sets model
+ *
+ * @param model
+ */
+ public final void setModel(IModel<List<T>> model)
+ {
+ setDefaultModel(model);
+ }
+
+ /**
+ * Gets model object
+ *
+ * @return model object
+ */
+ @SuppressWarnings("unchecked")
+ public final List<T> getModelObject()
+ {
+ return (List<T>)getDefaultModelObject();
+ }
+
+ /**
+ * Sets model object
+ *
+ * @param object
+ */
+ public final void setModelObject(List<T> object)
+ {
+ setDefaultModelObject(object);
+ }
+
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/list/Loop.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/list/Loop.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/list/Loop.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/list/Loop.java Sat Jun 28 22:50:41 2008
@@ -37,7 +37,7 @@
* @author Jonathan Locke
*
*/
-public abstract class Loop extends AbstractRepeater<Integer>
+public abstract class Loop extends AbstractRepeater
{
/**
*
@@ -49,7 +49,7 @@
*
* @author Jonathan Locke
*/
- public static class LoopItem extends WebMarkupContainer<Void>
+ public static class LoopItem extends WebMarkupContainer
{
private static final long serialVersionUID = 1L;
@@ -110,7 +110,7 @@
*/
public final int getIterations()
{
- return (getModelObject()).intValue();
+ return ((Integer)getDefaultModelObject()).intValue();
}
/**
@@ -156,11 +156,11 @@
* @see org.apache.wicket.markup.repeater.AbstractRepeater#renderIterator()
*/
@Override
- protected Iterator<Component<?>> renderIterator()
+ protected Iterator<Component> renderIterator()
{
final int iterations = size();
- return new ReadOnlyIterator<Component<?>>()
+ return new ReadOnlyIterator<Component>()
{
private int index = 0;
@@ -169,7 +169,7 @@
return index < iterations;
}
- public Component<?> next()
+ public Component next()
{
return get(Integer.toString(index++));
}
@@ -189,7 +189,7 @@
* @param child
*/
@Override
- protected final void renderChild(Component<?> child)
+ protected final void renderChild(Component child)
{
renderItem((LoopItem)child);
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/list/PageableListView.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/list/PageableListView.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/list/PageableListView.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/list/PageableListView.java Sat Jun 28 22:50:41 2008
@@ -138,7 +138,7 @@
@Override
public int getViewSize()
{
- if (getModelObject() != null)
+ if (getDefaultModelObject() != null)
{
super.setStartIndex(getCurrentPage() * getRowsPerPage());
super.setViewSize(getRowsPerPage());
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/navigation/paging/PagingNavigation.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/navigation/paging/PagingNavigation.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/navigation/paging/PagingNavigation.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/navigation/paging/PagingNavigation.java Sat Jun 28 22:50:41 2008
@@ -29,13 +29,13 @@
* contains a {@link Label} with the page number of that link (1..n).
*
* <pre>
- *
+ *
* <td wicket:id="navigation">
* <a wicket:id="pageLink" href="SearchCDPage.html">
* <span wicket:id="pageNumber">1</>
* </a>
* </td>
- *
+ *
* </pre>
*
* thus renders like:
@@ -275,7 +275,7 @@
@Override
protected void onBeforeRender()
{
- setModel(new Model<Integer>(new Integer(pageable.getPageCount())));
+ setDefaultModel(new Model<Integer>(new Integer(pageable.getPageCount())));
// PagingNavigation itself (as well as the PageableListView)
// may have pages.
@@ -309,7 +309,7 @@
final int pageIndex = getStartIndex() + loopItem.getIteration();
// Add a page link pointing to the page
- final Link<?> link = newPagingNavigationLink("pageLink", pageable, pageIndex);
+ final Link link = newPagingNavigationLink("pageLink", pageable, pageIndex);
loopItem.add(link);
// Add a page number label to the list which is enclosed by the link
@@ -322,7 +322,7 @@
{
label = String.valueOf(pageIndex + 1);
}
- link.add(new Label<String>("pageNumber", label));
+ link.add(new Label("pageNumber", label));
}
/**
@@ -336,7 +336,7 @@
* the page index the link points to
* @return the page navigation link.
*/
- protected Link<?> newPagingNavigationLink(String id, IPageable pageable, int pageIndex)
+ protected Link newPagingNavigationLink(String id, IPageable pageable, int pageIndex)
{
return new PagingNavigationLink(id, pageable, pageIndex);
}
@@ -424,6 +424,6 @@
*/
private void setIterations(int i)
{
- setModelObject(new Integer(i));
+ setDefaultModelObject(new Integer(i));
}
}
\ No newline at end of file
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/navigation/paging/PagingNavigationIncrementLink.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/navigation/paging/PagingNavigationIncrementLink.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/navigation/paging/PagingNavigationIncrementLink.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/navigation/paging/PagingNavigationIncrementLink.java Sat Jun 28 22:50:41 2008
@@ -24,9 +24,9 @@
* like
*
* <pre>
- *
+ *
* [first / << / <] 1 | 2 | 3 [> / >> /last]
- *
+ *
* </pre>
*
* <p>
@@ -36,7 +36,7 @@
* @author Juergen Donnerstag
* @author Martijn Dashorst
*/
-public class PagingNavigationIncrementLink extends Link<Object>
+public class PagingNavigationIncrementLink extends Link
{
private static final long serialVersionUID = 1L;
@@ -121,7 +121,7 @@
* @see org.apache.wicket.markup.html.link.PageLink#linksTo(org.apache.wicket.Page)
*/
@Override
- public boolean linksTo(final Page<?> page)
+ public boolean linksTo(final Page page)
{
pageable.getCurrentPage();
return ((increment < 0) && isFirst()) || ((increment > 0) && isLast());
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/navigation/paging/PagingNavigationLink.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/navigation/paging/PagingNavigationLink.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/navigation/paging/PagingNavigationLink.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/navigation/paging/PagingNavigationLink.java Sat Jun 28 22:50:41 2008
@@ -26,7 +26,7 @@
* @author Eelco Hillenius
* @author Martijn Dashorst
*/
-public class PagingNavigationLink extends Link<Object>
+public class PagingNavigationLink extends Link
{
private static final long serialVersionUID = 1L;
@@ -115,7 +115,7 @@
* @see org.apache.wicket.markup.html.link.PageLink#linksTo(org.apache.wicket.Page)
*/
@Override
- public final boolean linksTo(final Page<?> page)
+ public final boolean linksTo(final Page page)
{
return getPageNumber() == pageable.getCurrentPage();
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/navigation/paging/PagingNavigator.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/navigation/paging/PagingNavigator.java?rev=672603&r1=672602&r2=672603&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/navigation/paging/PagingNavigator.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/navigation/paging/PagingNavigator.java Sat Jun 28 22:50:41 2008
@@ -27,7 +27,7 @@
*
* @author Juergen Donnerstag
*/
-public class PagingNavigator extends Panel<Object>
+public class PagingNavigator extends Panel
{
private static final long serialVersionUID = 1L;
@@ -110,8 +110,7 @@
* the increment
* @return the increment link
*/
- protected Link<Object> newPagingNavigationIncrementLink(String id, IPageable pageable,
- int increment)
+ protected Link newPagingNavigationIncrementLink(String id, IPageable pageable, int increment)
{
return new PagingNavigationIncrementLink(id, pageable, increment);
}
@@ -128,7 +127,7 @@
* the page to jump to
* @return the pagenumber link
*/
- protected Link<Object> newPagingNavigationLink(String id, IPageable pageable, int pageNumber)
+ protected Link newPagingNavigationLink(String id, IPageable pageable, int pageNumber)
{
return new PagingNavigationLink(id, pageable, pageNumber);
}