This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/causeway.git
The following commit(s) were added to refs/heads/master by this push:
new 686fe6ea8f CAUSEWAY-3753: fixes spelling mistake...
686fe6ea8f is described below
commit 686fe6ea8fa7b3349db8c287e0f3bc259a2df6d6
Author: Dan Haywood <[email protected]>
AuthorDate: Tue Jun 4 22:19:41 2024 +0100
CAUSEWAY-3753: fixes spelling mistake...
... choosing to rename to more active method name
---
.../metamodel/interactions/managed/ParameterNegotiationModel.java | 8 ++++----
.../causeway/viewer/wicket/model/models/ScalarParameterModel.java | 3 ++-
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git
a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/interactions/managed/ParameterNegotiationModel.java
b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/interactions/managed/ParameterNegotiationModel.java
index f01e8e9ce2..bdf41308b1 100644
---
a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/interactions/managed/ParameterNegotiationModel.java
+++
b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/interactions/managed/ParameterNegotiationModel.java
@@ -171,8 +171,8 @@ public class ParameterNegotiationModel {
* (Ignoring the {@link ParameterModel#isValidationFeedbackActive()} flag.)
* @apiNote introduced for [CAUSEWAY-3753] - not sure why required.
*/
- @NonNull public String getImmidiateParamValidation(final int paramNr) {
- return paramModels.getElseFail(paramNr).getImmidiateParamValidation();
+ @NonNull public String validateImmediately(final int paramNr) {
+ return paramModels.getElseFail(paramNr).validateImmediately();
}
@NonNull public Bindable<String> getBindableParamSearchArgument(final int
paramNr) {
@@ -390,7 +390,7 @@ public class ParameterNegotiationModel {
// validate this parameter, but only when validationFeedback has
been activated
observableParamValidation = _Observables.lazy(()->
isValidationFeedbackActive()
- ? getImmidiateParamValidation()
+ ? validateImmediately()
: (String)null);
observableVisibilityConsent = _Observables.lazy(()->
@@ -504,7 +504,7 @@ public class ParameterNegotiationModel {
* Calls the underlying action parameter validation logic, for pending
arguments.
* (Ignoring the {@link #isValidationFeedbackActive()} flag.)
*/
- private String getImmidiateParamValidation() {
+ private String validateImmediately() {
return metaModel
.isValid(
getNegotiationModel().getHead(),
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/ScalarParameterModel.java
index c6141d72ef..e1f6d0a7b3 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/ScalarParameterModel.java
@@ -60,11 +60,12 @@ implements HasUiParameter {
@Override
public String validate(final @NonNull ManagedObject proposedArg) {
proposedValue().getValue().setValue(proposedArg); // updates the
pending parameter value
+
//TODO [CAUSEWAY-3753] for some reason the
ParameterModel.isValidationFeedbackActive() flag is not yet active,
// hence we call the immediate validation logic, that ignores the
flag.
// In addition, the immediate validation call does not cache its
result, so its always re-evaluated.
// (keeping a todo marker here, until we know this fix works as
desired)
- return
getParameterNegotiationModel().getImmidiateParamValidation(getParameterIndex());
+ return
getParameterNegotiationModel().validateImmediately(getParameterIndex());
}
@Override
