Author: jdonnerstag
Date: Fri Apr 11 09:47:23 2008
New Revision: 647221
URL: http://svn.apache.org/viewvc?rev=647221&view=rev
Log:
generics
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/form/AjaxFormChoiceComponentUpdatingBehavior.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/form/AjaxFormComponentUpdatingBehavior.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/form/AjaxFormSubmitBehavior.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/form/AjaxFormValidatingBehavior.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/markup/html/AjaxFallbackLink.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxButton.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxCheckBox.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxFallbackButton.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxSubmitButton.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/markup/html/navigation/paging/AjaxPagingNavigation.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/markup/html/navigation/paging/AjaxPagingNavigationBehavior.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/markup/html/navigation/paging/AjaxPagingNavigationLink.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/markup/html/navigation/paging/AjaxPagingNavigator.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/navigation/paging/PagingNavigationLink.java
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/form/AjaxFormChoiceComponentUpdatingBehavior.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/form/AjaxFormChoiceComponentUpdatingBehavior.java?rev=647221&r1=647220&r2=647221&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/form/AjaxFormChoiceComponentUpdatingBehavior.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/form/AjaxFormChoiceComponentUpdatingBehavior.java
Fri Apr 11 09:47:23 2008
@@ -56,6 +56,7 @@
/**
* @see
org.apache.wicket.ajax.AbstractDefaultAjaxBehavior#renderHead(org.apache.wicket.markup.html.IHeaderResponse)
*/
+ @Override
public void renderHead(IHeaderResponse response)
{
super.renderHead(response);
@@ -106,16 +107,15 @@
}
}
-
/**
*
* @see org.apache.wicket.behavior.AbstractAjaxBehavior#onBind()
*/
+ @Override
protected void onBind()
{
super.onBind();
-
if (!(getComponent() instanceof RadioChoice) &&
!(getComponent() instanceof CheckBoxMultipleChoice) &&
!(getComponent() instanceof RadioGroup) &&
!(getComponent() instanceof CheckGroup))
@@ -134,9 +134,9 @@
*
* @return FormComponent
*/
- protected final FormComponent getFormComponent()
+ protected final FormComponent< ? > getFormComponent()
{
- return (FormComponent)getComponent();
+ return (FormComponent< ? >)getComponent();
}
/**
@@ -154,9 +154,10 @@
*
* @see
org.apache.wicket.ajax.AbstractDefaultAjaxBehavior#respond(org.apache.wicket.ajax.AjaxRequestTarget)
*/
+ @Override
protected final void respond(final AjaxRequestTarget target)
{
- final FormComponent formComponent = getFormComponent();
+ final FormComponent< ? > formComponent = getFormComponent();
try
{
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/form/AjaxFormComponentUpdatingBehavior.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/form/AjaxFormComponentUpdatingBehavior.java?rev=647221&r1=647220&r2=647221&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/form/AjaxFormComponentUpdatingBehavior.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/form/AjaxFormComponentUpdatingBehavior.java
Fri Apr 11 09:47:23 2008
@@ -65,6 +65,7 @@
*
* @see org.apache.wicket.behavior.AbstractAjaxBehavior#onBind()
*/
+ @Override
protected void onBind()
{
super.onBind();
@@ -80,14 +81,15 @@
*
* @return FormComponent
*/
- protected final FormComponent getFormComponent()
+ protected final FormComponent< ? > getFormComponent()
{
- return (FormComponent)getComponent();
+ return (FormComponent< ? >)getComponent();
}
/**
* @see org.apache.wicket.ajax.AjaxEventBehavior#getEventHandler()
*/
+ @Override
protected final CharSequence getEventHandler()
{
return generateCallbackScript(new
AppendingStringBuffer("wicketAjaxPost('").append(
@@ -98,6 +100,7 @@
/**
* @see
org.apache.wicket.ajax.AjaxEventBehavior#onCheckEvent(java.lang.String)
*/
+ @Override
protected void onCheckEvent(String event)
{
if ("href".equalsIgnoreCase(event))
@@ -111,9 +114,10 @@
*
* @see
org.apache.wicket.ajax.AjaxEventBehavior#onEvent(org.apache.wicket.ajax.AjaxRequestTarget)
*/
+ @Override
protected final void onEvent(final AjaxRequestTarget target)
{
- final FormComponent formComponent = getFormComponent();
+ final FormComponent< ? > formComponent = getFormComponent();
if (getEvent().toLowerCase().equals("onblur") &&
disableFocusOnBlur())
{
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/form/AjaxFormSubmitBehavior.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/form/AjaxFormSubmitBehavior.java?rev=647221&r1=647220&r2=647221&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/form/AjaxFormSubmitBehavior.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/form/AjaxFormSubmitBehavior.java
Fri Apr 11 09:47:23 2008
@@ -40,7 +40,7 @@
{
private static final long serialVersionUID = 1L;
- private Form form;
+ private Form< ? > form;
/**
* Constructor. This constructor can only be used when the component
this behavior is attached
@@ -62,7 +62,7 @@
* @param event
* javascript event this behavior is attached to, like
onclick
*/
- public AjaxFormSubmitBehavior(Form form, String event)
+ public AjaxFormSubmitBehavior(Form< ? > form, String event)
{
super(event);
this.form = form;
@@ -73,13 +73,17 @@
}
}
- protected Form getForm()
+ /**
+ *
+ * @return
+ */
+ protected Form< ? > getForm()
{
if (form == null)
{
// try to find form in the hierarchy of owning component
- Component component = getComponent();
- form = (Form)component.findParent(Form.class);
+ Component< ? > component = getComponent();
+ form = (Form< ? >)component.findParent(Form.class);
if (form == null)
{
throw new IllegalStateException(
@@ -91,13 +95,16 @@
return form;
}
-
+ /**
+ *
+ * @see org.apache.wicket.ajax.AjaxEventBehavior#getEventHandler()
+ */
+ @Override
protected CharSequence getEventHandler()
{
final String formId = getForm().getMarkupId();
final CharSequence url = getCallbackUrl();
-
AppendingStringBuffer call = new
AppendingStringBuffer("wicketSubmitFormById('").append(
formId).append("', '").append(url).append("', ");
@@ -115,6 +122,11 @@
return generateCallbackScript(call) + ";";
}
+ /**
+ *
+ * @see
org.apache.wicket.ajax.AjaxEventBehavior#onEvent(org.apache.wicket.ajax.AjaxRequestTarget)
+ */
+ @Override
protected void onEvent(AjaxRequestTarget target)
{
getForm().getRootForm().onFormSubmitted();
@@ -157,6 +169,11 @@
*/
protected abstract void onError(AjaxRequestTarget target);
+ /**
+ *
+ * @see
org.apache.wicket.ajax.AbstractDefaultAjaxBehavior#getPreconditionScript()
+ */
+ @Override
protected CharSequence getPreconditionScript()
{
return "return Wicket.$$(this)&&Wicket.$$('" +
getForm().getMarkupId() + "')";
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/form/AjaxFormValidatingBehavior.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/form/AjaxFormValidatingBehavior.java?rev=647221&r1=647220&r2=647221&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/form/AjaxFormValidatingBehavior.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/form/AjaxFormValidatingBehavior.java
Fri Apr 11 09:47:23 2008
@@ -45,16 +45,26 @@
* @param event
* javascript event this behavior will be invoked on, like
onclick
*/
- public AjaxFormValidatingBehavior(Form form, String event)
+ public AjaxFormValidatingBehavior(Form< ? > form, String event)
{
super(form, event);
}
+ /**
+ *
+ * @see
org.apache.wicket.ajax.form.AjaxFormSubmitBehavior#onSubmit(org.apache.wicket.ajax.AjaxRequestTarget)
+ */
+ @Override
protected void onSubmit(final AjaxRequestTarget target)
{
addFeedbackPanels(target);
}
+ /**
+ *
+ * @see
org.apache.wicket.ajax.form.AjaxFormSubmitBehavior#onError(org.apache.wicket.ajax.AjaxRequestTarget)
+ */
+ @Override
protected void onError(AjaxRequestTarget target)
{
addFeedbackPanels(target);
@@ -67,14 +77,13 @@
*/
private void addFeedbackPanels(final AjaxRequestTarget target)
{
- getComponent().getPage().visitChildren(IFeedback.class, new
IVisitor()
+ getComponent().getPage().visitChildren(IFeedback.class, new
IVisitor<Component< ? >>()
{
- public Object component(Component component)
+ public Object component(Component< ? > component)
{
target.addComponent(component);
return IVisitor.CONTINUE_TRAVERSAL;
}
-
});
}
@@ -84,7 +93,7 @@
* @param form
* @param event
*/
- public static void addToAllFormComponents(final Form form, final String
event)
+ public static void addToAllFormComponents(final Form< ? > form, final
String event)
{
addToAllFormComponents(form, event, null);
}
@@ -96,12 +105,12 @@
* @param event
* @param throttleDelay
*/
- public static void addToAllFormComponents(final Form form, final String
event,
- final Duration throttleDelay)
+ public static void addToAllFormComponents(final Form< ? > form, final
String event,
+ final Duration throttleDelay)
{
- form.visitChildren(FormComponent.class, new IVisitor()
+ form.visitChildren(FormComponent.class, new IVisitor<Component<
? >>()
{
- public Object component(Component component)
+ public Object component(Component< ? > component)
{
AjaxFormValidatingBehavior behavior = new
AjaxFormValidatingBehavior(form, event);
if (throttleDelay != null)
@@ -111,8 +120,6 @@
component.add(behavior);
return
IVisitor.CONTINUE_TRAVERSAL_BUT_DONT_GO_DEEPER;
}
-
});
}
-
}
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/markup/html/AjaxFallbackLink.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/markup/html/AjaxFallbackLink.java?rev=647221&r1=647220&r2=647221&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/markup/html/AjaxFallbackLink.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/markup/html/AjaxFallbackLink.java
Fri Apr 11 09:47:23 2008
@@ -31,9 +31,10 @@
* @since 1.2
*
* @author Igor Vaynberg (ivaynberg)
- *
+ * @param <T>
+ * The model object type
*/
-public abstract class AjaxFallbackLink extends Link implements IAjaxLink
+public abstract class AjaxFallbackLink<T> extends Link<T> implements IAjaxLink
{
/** */
private static final long serialVersionUID = 1L;
@@ -54,7 +55,7 @@
* @param id
* @param model
*/
- public AjaxFallbackLink(final String id, final IModel model)
+ public AjaxFallbackLink(final String id, final IModel<T> model)
{
super(id, model);
@@ -62,17 +63,32 @@
{
private static final long serialVersionUID = 1L;
+ /**
+ *
+ * @see
org.apache.wicket.ajax.AjaxEventBehavior#onEvent(org.apache.wicket.ajax.AjaxRequestTarget)
+ */
+ @Override
protected void onEvent(AjaxRequestTarget target)
{
onClick(target);
}
+ /**
+ *
+ * @see
org.apache.wicket.ajax.AbstractDefaultAjaxBehavior#getAjaxCallDecorator()
+ */
+ @Override
protected IAjaxCallDecorator getAjaxCallDecorator()
{
- return new
CancelEventIfNoAjaxDecorator(AjaxFallbackLink.this
- .getAjaxCallDecorator());
+ return new CancelEventIfNoAjaxDecorator(
+
AjaxFallbackLink.this.getAjaxCallDecorator());
}
+ /**
+ *
+ * @see
org.apache.wicket.ajax.AjaxEventBehavior#onComponentTag(org.apache.wicket.markup.ComponentTag)
+ */
+ @Override
protected void onComponentTag(ComponentTag tag)
{
// only render handler if link is enabled
@@ -84,6 +100,10 @@
});
}
+ /**
+ *
+ * @return
+ */
protected IAjaxCallDecorator getAjaxCallDecorator()
{
return null;
@@ -93,6 +113,7 @@
*
* @see org.apache.wicket.markup.html.link.Link#onClick()
*/
+ @Override
public final void onClick()
{
onClick(null);
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxButton.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxButton.java?rev=647221&r1=647220&r2=647221&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxButton.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxButton.java
Fri Apr 11 09:47:23 2008
@@ -38,7 +38,7 @@
{
private static final long serialVersionUID = 1L;
- private final Form form;
+ private final Form< ? > form;
/**
* Construct.
@@ -57,7 +57,7 @@
* @see org.apache.wicket.markup.html.form.FormComponent#getForm()
*/
@Override
- public Form getForm()
+ public Form< ? > getForm()
{
if (form != null)
{
@@ -75,42 +75,55 @@
* @param id
* @param form
*/
- public AjaxButton(String id, final Form form)
+ public AjaxButton(String id, final Form< ? > form)
{
super(id);
this.form = form;
add(new AjaxFormSubmitBehavior(form, "onclick")
{
-
private static final long serialVersionUID = 1L;
+ /**
+ *
+ * @see
org.apache.wicket.ajax.form.AjaxFormSubmitBehavior#onSubmit(org.apache.wicket.ajax.AjaxRequestTarget)
+ */
@Override
protected void onSubmit(AjaxRequestTarget target)
{
AjaxButton.this.onSubmit(target,
AjaxButton.this.getForm());
}
+ /**
+ *
+ * @see
org.apache.wicket.ajax.form.AjaxFormSubmitBehavior#onError(org.apache.wicket.ajax.AjaxRequestTarget)
+ */
@Override
protected void onError(AjaxRequestTarget target)
{
AjaxButton.this.onError(target,
AjaxButton.this.getForm());
}
+ /**
+ *
+ * @see
org.apache.wicket.ajax.form.AjaxFormSubmitBehavior#getEventHandler()
+ */
@Override
protected CharSequence getEventHandler()
{
return new
AppendingStringBuffer(super.getEventHandler()).append("; return false;");
}
+ /**
+ *
+ * @see
org.apache.wicket.ajax.AbstractDefaultAjaxBehavior#getAjaxCallDecorator()
+ */
@Override
protected IAjaxCallDecorator getAjaxCallDecorator()
{
return AjaxButton.this.getAjaxCallDecorator();
}
-
});
-
}
/**
@@ -130,7 +143,7 @@
* @param target
* @param form
*/
- protected abstract void onSubmit(AjaxRequestTarget target, Form form);
+ protected abstract void onSubmit(AjaxRequestTarget target, Form< ? >
form);
/**
* Listener method invoked on form submit with errors
@@ -140,9 +153,7 @@
*
* TODO 1.3: Make abstract to be consistent with onSubmit()
*/
- protected void onError(AjaxRequestTarget target, Form form)
+ protected void onError(AjaxRequestTarget target, Form< ? > form)
{
-
}
-
}
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxCheckBox.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxCheckBox.java?rev=647221&r1=647220&r2=647221&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxCheckBox.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxCheckBox.java
Fri Apr 11 09:47:23 2008
@@ -48,7 +48,7 @@
* @param id
* @param model
*/
- public AjaxCheckBox(final String id, final IModel model)
+ public AjaxCheckBox(final String id, final IModel<Boolean> model)
{
super(id, model);
@@ -58,6 +58,7 @@
{
private static final long serialVersionUID = 1L;
+ @Override
protected void onUpdate(AjaxRequestTarget target)
{
AjaxCheckBox.this.onUpdate(target);
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxFallbackButton.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxFallbackButton.java?rev=647221&r1=647220&r2=647221&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxFallbackButton.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxFallbackButton.java
Fri Apr 11 09:47:23 2008
@@ -38,10 +38,9 @@
*/
public abstract class AjaxFallbackButton<T> extends Button<T>
{
-
private static final long serialVersionUID = 1L;
- private final Form mForm;
+ private final Form< ? > mForm;
/**
* Construct.
@@ -49,7 +48,7 @@
* @param id
* @param form
*/
- public AjaxFallbackButton(String id, Form form)
+ public AjaxFallbackButton(String id, Form< ? > form)
{
this(id, null, form);
}
@@ -61,7 +60,7 @@
* @param model
* @param form
*/
- public AjaxFallbackButton(String id, IModel<T> model, Form form)
+ public AjaxFallbackButton(String id, IModel<T> model, Form< ? > form)
{
super(id, model);
mForm = form;
@@ -93,7 +92,6 @@
{
return
AjaxFallbackButton.this.getAjaxCallDecorator();
}
-
});
}
@@ -105,7 +103,7 @@
*
* TODO 1.3: Make abstract to be consistent with onsubmit()
*/
- protected void onError(AjaxRequestTarget target, Form form)
+ protected void onError(AjaxRequestTarget target, Form< ? > form)
{
// created to override
}
@@ -122,8 +120,12 @@
}
}
+ /**
+ *
+ * @see org.apache.wicket.markup.html.form.Button#getForm()
+ */
@Override
- public Form getForm()
+ public Form< ? > getForm()
{
return mForm == null ? super.getForm() : mForm;
}
@@ -136,8 +138,12 @@
* ajax target if this linked was invoked using ajax, null
otherwise
* @param form
*/
- protected abstract void onSubmit(final AjaxRequestTarget target, final
Form form);
+ protected abstract void onSubmit(final AjaxRequestTarget target, final
Form< ? > form);
+ /**
+ *
+ * @return
+ */
protected IAjaxCallDecorator getAjaxCallDecorator()
{
return null;
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxSubmitButton.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxSubmitButton.java?rev=647221&r1=647220&r2=647221&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxSubmitButton.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxSubmitButton.java
Fri Apr 11 09:47:23 2008
@@ -26,9 +26,12 @@
* @since 1.2
*
* @author Igor Vaynberg (ivaynberg)
+ * @param <T>
+ * The model object type
* @deprecated Use [EMAIL PROTECTED] AjaxButton} instead.
*/
-public abstract class AjaxSubmitButton extends AjaxButton
[EMAIL PROTECTED]
+public abstract class AjaxSubmitButton<T> extends AjaxButton<T>
{
private static final long serialVersionUID = 1L;
@@ -38,6 +41,7 @@
* @param id
* @deprecated Use [EMAIL PROTECTED] AjaxButton} instead.
*/
+ @Deprecated
public AjaxSubmitButton(String id)
{
super(id);
@@ -50,7 +54,8 @@
* @param form
* @deprecated Use [EMAIL PROTECTED] AjaxButton} instead.
*/
- public AjaxSubmitButton(String id, final Form form)
+ @Deprecated
+ public AjaxSubmitButton(String id, final Form< ? > form)
{
super(id, form);
}
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/markup/html/navigation/paging/AjaxPagingNavigation.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/markup/html/navigation/paging/AjaxPagingNavigation.java?rev=647221&r1=647220&r2=647221&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/markup/html/navigation/paging/AjaxPagingNavigation.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/markup/html/navigation/paging/AjaxPagingNavigation.java
Fri Apr 11 09:47:23 2008
@@ -19,6 +19,7 @@
import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.markup.html.navigation.paging.IPageable;
import org.apache.wicket.markup.html.navigation.paging.IPagingLabelProvider;
+import org.apache.wicket.markup.html.navigation.paging.PagingNavigation;
/**
* An ajaxified navigation for a PageableListView that holds links to other
pages of the
@@ -32,9 +33,7 @@
*
* @author Martijn Dashorst
*/
-public class AjaxPagingNavigation
- extends
-
org.apache.wicket.markup.html.navigation.paging.PagingNavigation
+public class AjaxPagingNavigation extends PagingNavigation
{
private static final long serialVersionUID = 1L;
@@ -62,7 +61,7 @@
* The label provider for the text that the links should be
displaying.
*/
public AjaxPagingNavigation(final String id, final IPageable pageable,
- final IPagingLabelProvider labelProvider)
+ final IPagingLabelProvider labelProvider)
{
super(id, pageable, labelProvider);
}
@@ -78,7 +77,8 @@
* the index the link points to
* @return the ajaxified page number link.
*/
- protected Link newPagingNavigationLink(String id, IPageable pageable,
int pageIndex)
+ @Override
+ protected Link< ? > newPagingNavigationLink(String id, IPageable
pageable, int pageIndex)
{
return new AjaxPagingNavigationLink(id, pageable, pageIndex);
}
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/markup/html/navigation/paging/AjaxPagingNavigationBehavior.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/markup/html/navigation/paging/AjaxPagingNavigationBehavior.java?rev=647221&r1=647220&r2=647221&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/markup/html/navigation/paging/AjaxPagingNavigationBehavior.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/markup/html/navigation/paging/AjaxPagingNavigationBehavior.java
Fri Apr 11 09:47:23 2008
@@ -69,19 +69,18 @@
*
* @see
org.apache.wicket.ajax.AjaxEventBehavior#onEvent(org.apache.wicket.ajax.AjaxRequestTarget)
*/
+ @Override
protected void onEvent(AjaxRequestTarget target)
{
// handle the event
owner.onClick(target);
// find the PagingNavigator parent of this link
- AjaxPagingNavigator navigator =
(AjaxPagingNavigator)((Component)owner)
- .findParent(AjaxPagingNavigator.class);
+ AjaxPagingNavigator navigator =
(AjaxPagingNavigator)((Component< ?
>)owner).findParent(AjaxPagingNavigator.class);
if (navigator == null)
{
throw new WicketRuntimeException(
- "Unable to find AjaxPagingNavigator
component in hierarchy starting from " +
- owner);
+ "Unable to find AjaxPagingNavigator component
in hierarchy starting from " + owner);
}
// tell the PagingNavigator to update the IPageable
@@ -92,6 +91,7 @@
*
* @see
org.apache.wicket.ajax.AbstractDefaultAjaxBehavior#getAjaxCallDecorator()
*/
+ @Override
protected IAjaxCallDecorator getAjaxCallDecorator()
{
return new CancelEventIfNoAjaxDecorator();
@@ -100,6 +100,7 @@
/**
* @see
org.apache.wicket.ajax.AjaxEventBehavior#onComponentTag(org.apache.wicket.markup.ComponentTag)
*/
+ @Override
protected void onComponentTag(ComponentTag tag)
{
if (getComponent().isEnabled() &&
getComponent().isEnableAllowed())
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/markup/html/navigation/paging/AjaxPagingNavigationLink.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/markup/html/navigation/paging/AjaxPagingNavigationLink.java?rev=647221&r1=647220&r2=647221&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/markup/html/navigation/paging/AjaxPagingNavigationLink.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/markup/html/navigation/paging/AjaxPagingNavigationLink.java
Fri Apr 11 09:47:23 2008
@@ -27,8 +27,10 @@
* @since 1.2
*
* @author Martijn Dashorst
+ * @param <T>
+ * The model data type
*/
-public class AjaxPagingNavigationLink extends PagingNavigationLink implements
IAjaxLink
+public class AjaxPagingNavigationLink<T> extends PagingNavigationLink<T>
implements IAjaxLink
{
private static final long serialVersionUID = 1L;
@@ -55,6 +57,7 @@
*
* @see org.apache.wicket.markup.html.link.Link#onClick()
*/
+ @Override
public void onClick()
{
onClick(null);
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/markup/html/navigation/paging/AjaxPagingNavigator.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/markup/html/navigation/paging/AjaxPagingNavigator.java?rev=647221&r1=647220&r2=647221&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/markup/html/navigation/paging/AjaxPagingNavigator.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/markup/html/navigation/paging/AjaxPagingNavigator.java
Fri Apr 11 09:47:23 2008
@@ -71,7 +71,7 @@
* The label provider for the link text.
*/
public AjaxPagingNavigator(final String id, final IPageable pageable,
- final IPagingLabelProvider labelProvider)
+ final IPagingLabelProvider labelProvider)
{
super(id, pageable, labelProvider);
this.pageable = pageable;
@@ -90,7 +90,9 @@
* the increment
* @return the increment link
*/
- protected Link newPagingNavigationIncrementLink(String id, IPageable
pageable, int increment)
+ @Override
+ protected Link< ? > newPagingNavigationIncrementLink(String id,
IPageable pageable,
+ int increment)
{
return new AjaxPagingNavigationIncrementLink(id, pageable,
increment);
}
@@ -107,7 +109,8 @@
* the page to jump to
* @return the pagenumber link
*/
- protected Link newPagingNavigationLink(String id, IPageable pageable,
int pageNumber)
+ @Override
+ protected Link< ? > newPagingNavigationLink(String id, IPageable
pageable, int pageNumber)
{
return new AjaxPagingNavigationLink(id, pageable, pageNumber);
}
@@ -121,8 +124,9 @@
* The label provider for the link text.
* @return the navigation object
*/
+ @Override
protected PagingNavigation newNavigation(final IPageable pageable,
- final IPagingLabelProvider labelProvider)
+ final IPagingLabelProvider labelProvider)
{
return new AjaxPagingNavigation("navigation", pageable,
labelProvider);
}
@@ -142,7 +146,7 @@
// the pageable is a component, and that it is a child of a web
// markup container.
- Component container = ((Component)pageable);
+ Component< ? > container = ((Component< ? >)pageable);
// no need for a nullcheck as there is bound to be a
non-repeater
// somewhere higher in the hierarchy
while (container instanceof AbstractRepeater)
@@ -153,7 +157,7 @@
// in case the navigator is not contained by the container, we
have
// to add it to the response
- if (((MarkupContainer)container).contains(this, true) == false)
+ if (((MarkupContainer< ? >)container).contains(this, true) ==
false)
{
target.addComponent(this);
}
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=647221&r1=647220&r2=647221&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
Fri Apr 11 09:47:23 2008
@@ -25,8 +25,10 @@
* @author Jonathan Locke
* @author Eelco Hillenius
* @author Martijn Dashorst
+ * @param <T>
+ * The model data type
*/
-public class PagingNavigationLink extends Link
+public class PagingNavigationLink<T> extends Link<T>
{
private static final long serialVersionUID = 1L;
@@ -58,6 +60,7 @@
/**
* @see org.apache.wicket.markup.html.link.Link#onClick()
*/
+ @Override
public void onClick()
{
pageable.setCurrentPage(getPageNumber());
@@ -113,6 +116,7 @@
* @return True if this link links to the given page
* @see
org.apache.wicket.markup.html.link.PageLink#linksTo(org.apache.wicket.Page)
*/
+ @Override
public final boolean linksTo(final Page page)
{
return getPageNumber() == pageable.getCurrentPage();
