This is an automated email from the ASF dual-hosted git repository. ahuber pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/isis.git
commit b87b224347b4099574b41e66a85ac7bf06e1a88a Author: Andi Huber <ahu...@apache.org> AuthorDate: Thu May 7 17:56:56 2020 +0200 ISIS-2340: renaming for consistency --- .../common/model/action/form/FormUiModel.java | 4 +++ .../viewer/wicket/model/models/ActionModel.java | 31 +++++++++++----------- .../wicket/model/models/PageParameterUtil.java | 4 +-- .../ui/components/actioninfo/ActionInfoPanel.java | 2 +- .../ui/components/actionlink/ActionLinkPanel.java | 2 +- .../actionlink/ActionLinkPanelFactory.java | 2 +- .../actionprompt/ActionPromptHeaderPanel.java | 4 +-- .../components/actions/ActionParametersForm.java | 2 +- .../actions/ActionParametersFormPanel.java | 2 +- .../components/actions/ActionParametersPanel.java | 2 +- .../StandaloneCollectionPanel.java | 2 +- .../widgets/linkandlabel/ActionLink.java | 4 +-- .../linkandlabel/LinkAndLabelFactoryAbstract.java | 4 +-- .../ui/pages/actionprompt/ActionPromptPage.java | 4 +-- .../StandaloneCollectionPage.java | 2 +- .../viewer/wicket/ui/pages/value/ValuePage.java | 2 +- .../wicket/ui/pages/voidreturn/VoidReturnPage.java | 2 +- .../wicket/ui/panels/FormExecutorDefault.java | 2 +- 18 files changed, 41 insertions(+), 36 deletions(-) diff --git a/viewers/common/src/main/java/org/apache/isis/viewer/common/model/action/form/FormUiModel.java b/viewers/common/src/main/java/org/apache/isis/viewer/common/model/action/form/FormUiModel.java index 3abf6f0..fa03cd2 100644 --- a/viewers/common/src/main/java/org/apache/isis/viewer/common/model/action/form/FormUiModel.java +++ b/viewers/common/src/main/java/org/apache/isis/viewer/common/model/action/form/FormUiModel.java @@ -20,8 +20,12 @@ package org.apache.isis.viewer.common.model.action.form; import java.util.stream.Stream; +import org.apache.isis.core.metamodel.spec.feature.ObjectAction; + public interface FormUiModel { + ObjectAction getMetaModel(); + Stream<FormPendingParamUiModel> streamPendingParamUiModels(); } diff --git a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionModel.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionModel.java index 57df7fd..9041cfb 100644 --- a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionModel.java +++ b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionModel.java @@ -97,7 +97,7 @@ implements FormUiModel, FormExecutorContext { @Override public PageParameters getPageParametersWithoutUiHints() { val adapter = getTargetAdapter(); - val objectAction = getAction(); + val objectAction = getMetaModel(); return PageParameterUtil.createPageParameters(adapter, objectAction, argCache().snapshot()); } @@ -111,7 +111,7 @@ implements FormUiModel, FormExecutorContext { @Override public String getTitle() { val target = getTargetAdapter(); - val objectAction = getAction(); + val objectAction = getMetaModel(); val buf = new StringBuilder(); for(val argumentAdapter: argCache().snapshot()) { @@ -158,7 +158,7 @@ implements FormUiModel, FormExecutorContext { return new ActionArgumentCache( entityModel, actionMemento, - getAction()); + getMetaModel()); } private ActionModel(EntityModel entityModel, ActionMemento actionMemento) { @@ -178,7 +178,8 @@ implements FormUiModel, FormExecutorContext { } private transient ObjectAction objectAction; - public ObjectAction getAction() { + @Override + public ObjectAction getMetaModel() { if(objectAction==null) { objectAction = actionMemento.getAction(getSpecificationLoader()); } @@ -186,7 +187,7 @@ implements FormUiModel, FormExecutorContext { } public boolean hasParameters() { - return getAction().getParameterCount() > 0; + return getMetaModel().getParameterCount() > 0; } public ManagedObject getTargetAdapter() { @@ -216,7 +217,7 @@ implements FormUiModel, FormExecutorContext { val targetAdapter = getTargetAdapter(); final Can<ManagedObject> arguments = argCache().snapshot(); - final ObjectAction action = getAction(); + final ObjectAction action = getMetaModel(); // if this action is a mixin, then it will fill in the details automatically. val mixedInAdapter = (ManagedObject)null; @@ -244,7 +245,7 @@ implements FormUiModel, FormExecutorContext { public String getReasonDisabledIfAny() { val targetAdapter = getTargetAdapter(); - final ObjectAction objectAction = getAction(); + final ObjectAction objectAction = getMetaModel(); final Consent usability = objectAction.isUsable( @@ -259,7 +260,7 @@ implements FormUiModel, FormExecutorContext { public boolean isVisible() { val targetAdapter = getTargetAdapter(); - val objectAction = getAction(); + val objectAction = getMetaModel(); final Consent visibility = objectAction.isVisible( @@ -273,7 +274,7 @@ implements FormUiModel, FormExecutorContext { public String getReasonInvalidIfAny() { val targetAdapter = getTargetAdapter(); final Can<ManagedObject> proposedArguments = argCache().snapshot(); - final ObjectAction objectAction = getAction(); + final ObjectAction objectAction = getMetaModel(); final Consent validity = objectAction .isProposedArgumentSetValid(targetAdapter, proposedArguments, InteractionInitiatedBy.USER); return validity.isAllowed() ? null : validity.getReason(); @@ -285,7 +286,7 @@ implements FormUiModel, FormExecutorContext { } public PendingParameterModel getArgumentsAsParamModel() { - return getAction().newPendingParameterModelHead(getTargetAdapter()) + return getMetaModel().newPendingParameterModelHead(getTargetAdapter()) .model(argCache().snapshot()); } @@ -295,7 +296,7 @@ implements FormUiModel, FormExecutorContext { */ public void clearArguments() { - val defaultsFixedPoint = getAction() + val defaultsFixedPoint = getMetaModel() .newPendingParameterModelHead(getTargetAdapter()) .defaults() .getParamValues(); @@ -308,7 +309,7 @@ implements FormUiModel, FormExecutorContext { * of {@link BookmarkPolicy#AS_ROOT root}, and has safe {@link ObjectAction#getSemantics() semantics}. */ public boolean isBookmarkable() { - final ObjectAction action = getAction(); + final ObjectAction action = getMetaModel(); final BookmarkPolicyFacet bookmarkPolicy = action.getFacet(BookmarkPolicyFacet.class); final boolean safeSemantics = action.getSemantics().isSafeInNature(); return bookmarkPolicy.value() == BookmarkPolicy.AS_ROOT && safeSemantics; @@ -392,7 +393,7 @@ implements FormUiModel, FormExecutorContext { @Override public PromptStyle getPromptStyle() { - final ObjectAction objectAction = getAction(); + final ObjectAction objectAction = getMetaModel(); final ObjectSpecification objectActionOwner = objectAction.getOnType(); if(objectActionOwner.isManagedBean()) { // tried to move this test into PromptStyleFacetFallback, @@ -428,7 +429,7 @@ implements FormUiModel, FormExecutorContext { } public <T extends Facet> T getFacet(final Class<T> facetType) { - final FacetHolder facetHolder = getAction(); + final FacetHolder facetHolder = getMetaModel(); return facetHolder.getFacet(facetType); } @@ -461,7 +462,7 @@ implements FormUiModel, FormExecutorContext { public Stream<FormPendingParamUiModel> streamPendingParamUiModels() { val targetAdapter = this.getTargetAdapter(); - val realTargetAdapter = this.getAction().realTargetAdapter(targetAdapter); + val realTargetAdapter = this.getMetaModel().realTargetAdapter(targetAdapter); val pendingArgs = getArgumentsAsParamModel(); return argCache() diff --git a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/PageParameterUtil.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/PageParameterUtil.java index ca9861f..9950788 100644 --- a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/PageParameterUtil.java +++ b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/PageParameterUtil.java @@ -216,7 +216,7 @@ class PageParameterUtil { final List<String> argsAsEncodedOidStrings = PageParameterNames.ACTION_ARGS.getListFrom(pageParameters); - val action = actionModel.getAction(); + val action = actionModel.getMetaModel(); val parameters = action.getParameters(); for (int paramNum = 0; paramNum < argsAsEncodedOidStrings.size(); paramNum++) { @@ -237,7 +237,7 @@ class PageParameterUtil { return false; } - val action = actionModel.getAction(); + val action = actionModel.getMetaModel(); val actionParamIfAny = action.getParameters().get(paramNumAndOidString.getParamNum()); if(!actionParamIfAny.isPresent()) { return false; diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actioninfo/ActionInfoPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actioninfo/ActionInfoPanel.java index 7f052fa..3d34f26 100644 --- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actioninfo/ActionInfoPanel.java +++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actioninfo/ActionInfoPanel.java @@ -40,7 +40,7 @@ public class ActionInfoPanel extends PanelAbstract<ActionModel> { super(id, actionModel); val targetAdapter = getModel().getTargetAdapter(); - val objectAction = getModel().getAction(); + val objectAction = getModel().getMetaModel(); // TODO: render instead as links (providing isn't a service; provide a // component for this?) diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionlink/ActionLinkPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionlink/ActionLinkPanel.java index 12a5ca6..8e4a38a 100644 --- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionlink/ActionLinkPanel.java +++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionlink/ActionLinkPanel.java @@ -79,7 +79,7 @@ public class ActionLinkPanel extends PanelAbstract<ActionModel> { } private String determineTitle() { - return getModel().getAction().getId(); + return getModel().getMetaModel().getId(); } private AbstractLink newLink(final String linkId, final Class<? extends Page> pageClass, final PageParameters pageParameters) { diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionlink/ActionLinkPanelFactory.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionlink/ActionLinkPanelFactory.java index 6119e1c..6725560 100644 --- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionlink/ActionLinkPanelFactory.java +++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionlink/ActionLinkPanelFactory.java @@ -45,7 +45,7 @@ public class ActionLinkPanelFactory extends ComponentFactoryAbstract { return ApplicationAdvice.DOES_NOT_APPLY; } final ActionModel actionModel = (ActionModel) model; - final SemanticsOf semantics = actionModel.getAction().getSemantics(); + final SemanticsOf semantics = actionModel.getMetaModel().getSemantics(); return ApplicationAdvice.appliesIf(semantics.isSafeInNature()); } diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionprompt/ActionPromptHeaderPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionprompt/ActionPromptHeaderPanel.java index d4561be..26061b4 100644 --- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionprompt/ActionPromptHeaderPanel.java +++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionprompt/ActionPromptHeaderPanel.java @@ -48,12 +48,12 @@ public class ActionPromptHeaderPanel extends PanelAbstract<ActionModel> { private static final long serialVersionUID = 1L; @Override public String getObject() { - final ObjectAction action = model.getAction(); + final ObjectAction action = model.getMetaModel(); return action.getName(); } }); - final ObjectAction action = model.getAction(); + final ObjectAction action = model.getMetaModel(); NamedFacet namedFacet = action.getFacet(NamedFacet.class); if (namedFacet != null) { label.setEscapeModelStrings(namedFacet.escaped()); diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersForm.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersForm.java index 5e8b377..d3a54af 100644 --- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersForm.java +++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersForm.java @@ -140,7 +140,7 @@ class ActionParametersForm extends PromptFormAbstract<ActionModel> { */ private void applyAreYouSure(AjaxButton button) { val actionModel = getActionModel(); - val action = actionModel.getAction(); + val action = actionModel.getMetaModel(); if (action.getSemantics().isAreYouSure()) { val confirmUiModel = ConfirmUiModel.ofAreYouSure(getTranslationService(), Placement.RIGHT); diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersFormPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersFormPanel.java index b06d4eb..2df3121 100644 --- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersFormPanel.java +++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersFormPanel.java @@ -51,7 +51,7 @@ public class ActionParametersFormPanel extends PromptFormPanelAbstract<ActionMod final ActionParametersForm inputForm = new ActionParametersForm("inputForm", this, this.getWicketViewerSettings(), model); - final ObjectAction action = model.getAction(); + final ObjectAction action = model.getMetaModel(); CssClassAppender.appendCssClassTo(inputForm, "isis-" + CssClassAppender.asCssStyle(action.getOnType().getSpecId().asString().replace(".","-") + "-" + action.getId())); add(inputForm); } diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersPanel.java index 61328e7..3f47d0b 100644 --- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersPanel.java +++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersPanel.java @@ -97,7 +97,7 @@ public class ActionParametersPanel extends PanelAbstract<ActionModel> { getComponentFactoryRegistry().addOrReplaceComponent(header, ComponentType.ENTITY_ICON_AND_TITLE, actionModel .getParentUiModel()); - final String actionName = getActionModel().getAction().getName(); + final String actionName = getActionModel().getMetaModel().getName(); header.add(new Label(ID_ACTION_NAME, Model.of(actionName))); } diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/standalonecollection/StandaloneCollectionPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/standalonecollection/StandaloneCollectionPanel.java index ec25d2d..7bdda54 100644 --- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/standalonecollection/StandaloneCollectionPanel.java +++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/standalonecollection/StandaloneCollectionPanel.java @@ -63,7 +63,7 @@ implements CollectionCountProvider, CollectionSelectorProvider { addOrReplace(outerDiv); ActionModel actionModel = entityCollectionModel.getActionModelHint(); - ObjectAction action = actionModel.getAction(); + ObjectAction action = actionModel.getMetaModel(); outerDiv.addOrReplace(new Label(StandaloneCollectionPanel.ID_ACTION_NAME, Model.of(action.getName()))); CssClassAppender.appendCssClassTo(outerDiv, diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/linkandlabel/ActionLink.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/linkandlabel/ActionLink.java index 777845b..48bbcd2 100644 --- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/linkandlabel/ActionLink.java +++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/linkandlabel/ActionLink.java @@ -111,7 +111,7 @@ public abstract class ActionLink extends AjaxLink<ManagedObject> implements IAja public ObjectAction getObjectAction() { return objectAction != null ? objectAction - : (objectAction = getActionModel().getAction()); + : (objectAction = getActionModel().getMetaModel()); } @@ -261,7 +261,7 @@ public abstract class ActionLink extends AjaxLink<ManagedObject> implements IAja } private static boolean isIdempotentOrCachable(ActionModel actionModel) { - val objectAction = actionModel.getAction(); + val objectAction = actionModel.getMetaModel(); return ObjectAction.Util.isIdempotentOrCachable(objectAction); } diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/linkandlabel/LinkAndLabelFactoryAbstract.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/linkandlabel/LinkAndLabelFactoryAbstract.java index e6379c8..e8e0e9f 100644 --- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/linkandlabel/LinkAndLabelFactoryAbstract.java +++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/linkandlabel/LinkAndLabelFactoryAbstract.java @@ -182,7 +182,7 @@ implements Serializable { private static final long serialVersionUID = 1L; @Override public String getObject() { - final ObjectAction action = actionModel.getAction(); + final ObjectAction action = actionModel.getMetaModel(); return action.getName(); } }); @@ -195,7 +195,7 @@ implements Serializable { final ActionPromptWithExtraContent promptWithExtraContent = (ActionPromptWithExtraContent) prompt; - final ObjectAction action = actionModel.getAction(); + final ObjectAction action = actionModel.getMetaModel(); if(action instanceof ObjectActionMixedIn) { final ObjectActionMixedIn actionMixedIn = (ObjectActionMixedIn) action; final ObjectSpecification mixinSpec = actionMixedIn.getMixinType(); diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/actionprompt/ActionPromptPage.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/actionprompt/ActionPromptPage.java index 8fae257..0a39f6b 100644 --- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/actionprompt/ActionPromptPage.java +++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/actionprompt/ActionPromptPage.java @@ -38,7 +38,7 @@ public class ActionPromptPage extends PageAbstract { public ActionPromptPage(final ActionModel model) { super( new PageParameters(), - model.getAction().getName(), + model.getMetaModel().getName(), ComponentType.ACTION_PROMPT); addChildComponents(themeDiv, model); @@ -61,7 +61,7 @@ public class ActionPromptPage extends PageAbstract { } public ActionPromptPage(final PageParameters pageParameters, final ActionModel model) { - super(pageParameters, model.getAction().getName(), ComponentType.ACTION_PROMPT); + super(pageParameters, model.getMetaModel().getName(), ComponentType.ACTION_PROMPT); addChildComponents(themeDiv, model); // no need to bookmark because the ActionParametersPanel will have done so for us diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/standalonecollection/StandaloneCollectionPage.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/standalonecollection/StandaloneCollectionPage.java index 7e49f86..0f5fbfd 100644 --- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/standalonecollection/StandaloneCollectionPage.java +++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/standalonecollection/StandaloneCollectionPage.java @@ -49,7 +49,7 @@ public class StandaloneCollectionPage extends PageAbstract { private static String actionNameFrom(final EntityCollectionModel model) { ActionModel actionModel = model.getActionModelHint(); if(actionModel != null) { - return actionModel.getAction().getName(); + return actionModel.getMetaModel().getName(); } return "Results"; // fallback, probably not required because hint should always exist on the model. } diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/value/ValuePage.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/value/ValuePage.java index e2efc18..b301537 100644 --- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/value/ValuePage.java +++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/value/ValuePage.java @@ -62,7 +62,7 @@ public class ValuePage extends PageAbstract { private static String actionNameFrom(final ValueModel valueModel) { ActionModel actionModel = valueModel.getActionModelHint(); if(actionModel != null) { - return actionModel.getAction().getName(); + return actionModel.getMetaModel().getName(); } return "Results"; // fallback, probably not required because hint should always exist on the model. } diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/voidreturn/VoidReturnPage.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/voidreturn/VoidReturnPage.java index f086cc2..abd61c2 100644 --- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/voidreturn/VoidReturnPage.java +++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/voidreturn/VoidReturnPage.java @@ -55,7 +55,7 @@ public class VoidReturnPage extends PageAbstract { private static String actionNameFrom(final VoidModel model) { ActionModel actionModel = model.getActionModelHint(); if(actionModel != null) { - return actionModel.getAction().getName(); + return actionModel.getMetaModel().getName(); } return "Results"; // fallback, probably not required because hint should always exist on the model. } diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormExecutorDefault.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormExecutorDefault.java index 6f659fd..7265d6d 100644 --- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormExecutorDefault.java +++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormExecutorDefault.java @@ -169,7 +169,7 @@ implements FormExecutor { RedirectFacet redirectFacet = null; if(model instanceof ActionModel) { final ActionModel actionModel = (ActionModel) model; - redirectFacet = actionModel.getAction().getFacet(RedirectFacet.class); + redirectFacet = actionModel.getMetaModel().getFacet(RedirectFacet.class); } if (shouldRedirect(targetAdapter, resultAdapter, redirectFacet)