Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
mederly committed Mar 1, 2022
2 parents e358012 + 9217fa7 commit 4baa869
Showing 1 changed file with 16 additions and 23 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.AjaxFallbackLink;
import org.apache.wicket.extensions.markup.html.tabs.*;
import org.apache.wicket.extensions.markup.html.tabs.ITab;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.model.IModel;

Expand All @@ -20,15 +20,12 @@
* Ajaxified version of the tabbed panel. Uses AjaxFallbackLink instead of regular wicket links so
* it can update itself inplace.
*
* @param <T> The type of panel to be used for this component's tabs. Just use {@link org.apache.wicket.extensions.markup.html.tabs.ITab} if you
* have no special needs here.
* @author Igor Vaynberg (ivaynberg)
* @author shood
*
* @param <T>
* The type of panel to be used for this component's tabs. Just use {@link org.apache.wicket.extensions.markup.html.tabs.ITab} if you
* have no special needs here.
*/
public class AjaxTabbedPanel<T extends ITab> extends TabbedPanel<T>
{
public class AjaxTabbedPanel<T extends ITab> extends TabbedPanel<T> {
private static final long serialVersionUID = 1L;

/**
Expand All @@ -37,8 +34,7 @@ public class AjaxTabbedPanel<T extends ITab> extends TabbedPanel<T>
* @param id
* @param tabs
*/
public AjaxTabbedPanel(final String id, final List<T> tabs)
{
public AjaxTabbedPanel(final String id, final List<T> tabs) {
this(id, tabs, null);
}

Expand All @@ -47,8 +43,7 @@ public AjaxTabbedPanel(final String id, final List<T> tabs)
*
* @param id
* @param tabs
* @param model
* model holding the index of the selected tab
* @param model model holding the index of the selected tab
*/
public AjaxTabbedPanel(final String id, final List<T> tabs, IModel<Integer> model) {
this(id, tabs, model, null);
Expand All @@ -62,23 +57,21 @@ public AjaxTabbedPanel(final String id, final List<T> tabs, IModel<Integer> mode
}

@Override
protected WebMarkupContainer newLink(final String linkId, final int index)
{
return new AjaxFallbackLink<Void>(linkId)
{
protected WebMarkupContainer newLink(final String linkId, final int index) {
return new AjaxFallbackLink<Void>(linkId) {

private static final long serialVersionUID = 1L;

@Override
public void onClick(final Optional<AjaxRequestTarget> target)
{
public void onClick(final Optional<AjaxRequestTarget> target) {
setSelectedTab(index);
onTabChange(index);
if (target != null && target.isPresent() && target.get() != null)
{

if (target != null && target.isPresent()) {
target.get().add(AjaxTabbedPanel.this);
}
onAjaxUpdate(target.get());

onAjaxUpdate(target);
}
};
}
Expand All @@ -92,9 +85,9 @@ public void onClick(final Optional<AjaxRequestTarget> target)
* <code>target</code> argument can be null when the client browser does not support ajax and
* the fallback mode is used. See {@link AjaxFallbackLink} for details.
*
* @param target
* ajax target used to update this component
* @param target ajax target used to update this component
*/
protected void onAjaxUpdate(final AjaxRequestTarget target){}
protected void onAjaxUpdate(final Optional<AjaxRequestTarget> target) {
}
}

0 comments on commit 4baa869

Please sign in to comment.