This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch v3
in repository https://gitbox.apache.org/repos/asf/causeway.git
The following commit(s) were added to refs/heads/v3 by this push:
new 77031ddbe00 CAUSEWAY-2297: misnomer 'scalar' when allows plural (part
2)
77031ddbe00 is described below
commit 77031ddbe00ae939d602a91ed2a6be4691a9d36f
Author: Andi Huber <[email protected]>
AuthorDate: Sun Nov 24 08:58:54 2024 +0100
CAUSEWAY-2297: misnomer 'scalar' when allows plural (part 2)
- renaming ScalarParameterModel -> ParameterModel
---
.../causeway/viewer/wicket/model/models/ActionModel.java | 8 ++++----
.../viewer/wicket/model/models/FormExecutorContext.java | 2 +-
.../models/{ScalarParameterModel.java => ParameterModel.java} | 9 +++++----
.../causeway/viewer/wicket/model/models/UiAttributeWkt.java | 6 +++---
.../model/models/interaction/act/ActionInteractionWkt.java | 10 +++++-----
.../wicket/ui/components/actions/ActionParametersForm.java | 4 ++--
6 files changed, 20 insertions(+), 19 deletions(-)
diff --git
a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/ActionModel.java
b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/ActionModel.java
index 2a62b79ff64..3f5739f0824 100644
---
a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/ActionModel.java
+++
b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/ActionModel.java
@@ -81,7 +81,7 @@ implements UiActionForm, FormExecutorContext,
BookmarkableModel, IModel<ManagedO
final Where where,
final ColumnActionModifier columnActionModifier,
final ScalarPropertyModel associatedWithPropertyIfAny,
- final ScalarParameterModel associatedWithParameterIfAny,
+ final ParameterModel associatedWithParameterIfAny,
final EntityCollectionModel associatedWithCollectionIfAny) {
var delegate = ActionInteractionWkt.forEntity(
parentEntityModel,
@@ -144,7 +144,7 @@ implements UiActionForm, FormExecutorContext,
BookmarkableModel, IModel<ManagedO
final UiAttributeWkt scalarModel) {
return scalarModel instanceof ScalarPropertyModel
? forProperty(action, (ScalarPropertyModel)scalarModel)
- : forParameter(action, (ScalarParameterModel)scalarModel);
+ : forParameter(action, (ParameterModel)scalarModel);
}
public static ActionModel forProperty(
@@ -160,7 +160,7 @@ implements UiActionForm, FormExecutorContext,
BookmarkableModel, IModel<ManagedO
public static ActionModel forParameter(
final ObjectAction action,
- final ScalarParameterModel parameterModel) {
+ final ParameterModel parameterModel) {
//XXX[CAUSEWAY-3080] only supported, when parameter type is a singular
composite value-type
var param = parameterModel.getMetaModel();
if(param.isSingular()
@@ -246,7 +246,7 @@ implements UiActionForm, FormExecutorContext,
BookmarkableModel, IModel<ManagedO
}
@Override
- public Optional<ScalarParameterModel> getAssociatedParameter() {
+ public Optional<ParameterModel> getAssociatedParameter() {
return delegate.associatedWithParameter();
}
diff --git
a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/FormExecutorContext.java
b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/FormExecutorContext.java
index 1444e3936a1..657451a0f73 100644
---
a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/FormExecutorContext.java
+++
b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/FormExecutorContext.java
@@ -38,7 +38,7 @@ extends
&& getInlinePromptContext() != null;
}
- default Optional<ScalarParameterModel> getAssociatedParameter() {
+ default Optional<ParameterModel> getAssociatedParameter() {
return Optional.empty();
}
diff --git
a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/ScalarParameterModel.java
b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/ParameterModel.java
similarity index 94%
rename from
viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/ScalarParameterModel.java
rename to
viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/ParameterModel.java
index fb55d244ee6..b9fe81a6dfb 100644
---
a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/ScalarParameterModel.java
+++
b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/ParameterModel.java
@@ -33,16 +33,17 @@ import lombok.Getter;
import lombok.NonNull;
/**
+ * Wraps a {@link UiParameterWkt}.
* @see UiParameter
*/
-public final class ScalarParameterModel
+public final class ParameterModel
extends UiAttributeWkt
implements HasUiParameter {
private static final long serialVersionUID = 1L;
- public static ScalarParameterModel wrap(final UiParameterWkt delegate) {
- return new ScalarParameterModel(delegate);
+ public static ParameterModel wrap(final UiParameterWkt delegate) {
+ return new ParameterModel(delegate);
}
@Getter(onMethod_={@Override})
@@ -53,7 +54,7 @@ implements HasUiParameter {
* object, with the {@link #getObject() value of this model} to be default
* value (if any) of that action parameter.
*/
- private ScalarParameterModel(
+ private ParameterModel(
final UiParameterWkt uiParameter) {
super(
UiObjectWkt.ofAdapter(uiParameter.getOwner()),
diff --git
a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/UiAttributeWkt.java
b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/UiAttributeWkt.java
index 7fdcc0e1daf..4882baf4d0f 100644
---
a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/UiAttributeWkt.java
+++
b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/UiAttributeWkt.java
@@ -106,11 +106,11 @@ implements HasRenderingHints, UiAttribute,
FormExecutorContext {
}
/**
- * This instance is either a {@link ScalarParameterModel} or a {@link
ScalarPropertyModel}.
+ * This instance is either a {@link ParameterModel} or a {@link
ScalarPropertyModel}.
*/
- public final Either<ScalarParameterModel, ScalarPropertyModel>
getSpecialization() {
+ public final Either<ParameterModel, ScalarPropertyModel>
getSpecialization() {
return this.isParameter()
- ? Either.left((ScalarParameterModel) this)
+ ? Either.left((ParameterModel) this)
: Either.right((ScalarPropertyModel) this);
}
diff --git
a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/interaction/act/ActionInteractionWkt.java
b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/interaction/act/ActionInteractionWkt.java
index fcfca864d5d..0153d98a5e2 100644
---
a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/interaction/act/ActionInteractionWkt.java
+++
b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/interaction/act/ActionInteractionWkt.java
@@ -39,7 +39,7 @@ import
org.apache.causeway.core.metamodel.object.ManagedObjects;
import org.apache.causeway.core.metamodel.spec.feature.ObjectAction;
import org.apache.causeway.viewer.wicket.model.models.EntityCollectionModel;
import org.apache.causeway.viewer.wicket.model.models.InlinePromptContext;
-import org.apache.causeway.viewer.wicket.model.models.ScalarParameterModel;
+import org.apache.causeway.viewer.wicket.model.models.ParameterModel;
import org.apache.causeway.viewer.wicket.model.models.ScalarPropertyModel;
import org.apache.causeway.viewer.wicket.model.models.UiObjectWkt;
import
org.apache.causeway.viewer.wicket.model.models.interaction.BookmarkedObjectWkt;
@@ -82,7 +82,7 @@ extends HasBookmarkedOwnerAbstract<ActionInteraction> {
private Can<UiParameterWkt> childModels;
private @Nullable ScalarPropertyModel associatedWithPropertyIfAny;
- private @Nullable ScalarParameterModel associatedWithParameterIfAny;
+ private @Nullable ParameterModel associatedWithParameterIfAny;
private @Nullable EntityCollectionModel associatedWithCollectionIfAny;
public static ActionInteractionWkt forEntity(
@@ -90,7 +90,7 @@ extends HasBookmarkedOwnerAbstract<ActionInteraction> {
final Identifier actionIdentifier,
final Where where,
final ScalarPropertyModel associatedWithPropertyIfAny,
- final ScalarParameterModel associatedWithParameterIfAny,
+ final ParameterModel associatedWithParameterIfAny,
final EntityCollectionModel associatedWithCollectionIfAny) {
var onwerSpec =
parentEntityModel.getBookmarkedOwner().getSpecification();
@@ -120,7 +120,7 @@ extends HasBookmarkedOwnerAbstract<ActionInteraction> {
*/
final Optional<ObjectAction> objectAction,
final ScalarPropertyModel associatedWithPropertyIfAny,
- final ScalarParameterModel associatedWithParameterIfAny,
+ final ParameterModel associatedWithParameterIfAny,
final EntityCollectionModel associatedWithCollectionIfAny) {
super(bookmarkedObject);
this.memberId = memberId;
@@ -180,7 +180,7 @@ extends HasBookmarkedOwnerAbstract<ActionInteraction> {
return Optional.ofNullable(associatedWithPropertyIfAny);
}
- public Optional<ScalarParameterModel> associatedWithParameter() {
+ public Optional<ParameterModel> associatedWithParameter() {
return Optional.ofNullable(associatedWithParameterIfAny);
}
diff --git
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/actions/ActionParametersForm.java
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/actions/ActionParametersForm.java
index a4da1786846..bf2f28cb8a9 100644
---
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/actions/ActionParametersForm.java
+++
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/actions/ActionParametersForm.java
@@ -35,7 +35,7 @@ import
org.apache.causeway.viewer.commons.model.decorators.ConfirmDecorator.Conf
import org.apache.causeway.viewer.commons.model.layout.UiPlacementDirection;
import org.apache.causeway.viewer.commons.model.scalar.UiParameter;
import org.apache.causeway.viewer.wicket.model.models.ActionModel;
-import org.apache.causeway.viewer.wicket.model.models.ScalarParameterModel;
+import org.apache.causeway.viewer.wicket.model.models.ParameterModel;
import org.apache.causeway.viewer.wicket.model.models.ScalarPropertyModel;
import
org.apache.causeway.viewer.wicket.model.models.interaction.act.UiParameterWkt;
import
org.apache.causeway.viewer.wicket.ui.components.scalars.ScalarPanelAbstract;
@@ -89,7 +89,7 @@ extends PromptFormAbstract<ActionModel> {
final UiParameterWkt paramModel,
final Consumer<ScalarPanelAbstract> onNewScalarPanel) {
- var scalarParamModel = ScalarParameterModel.wrap(paramModel);
+ var scalarParamModel = ParameterModel.wrap(paramModel);
// returned ScalarPanelAbstract should already have added any
associated LinkAndLabel(s)
var component = getComponentFactoryRegistry()
