[isis] branch master updated: ISIS-3049: minor: just comments

[ahuber]

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


The following commit(s) were added to refs/heads/master by this push:
     new 34baab66de ISIS-3049: minor: just comments
34baab66de is described below

commit 34baab66dea7c84834dc936339a40276949bd93b
Author: Andi Huber <ahu...@apache.org>
AuthorDate: Tue Jul 12 07:17:47 2022 +0200

    ISIS-3049: minor: just comments
---
 .../choices/ActionParameterChoicesFacetFromChoicesFromFacet.java    | 2 +-
 .../postprocessors/param/ChoicesAndDefaultsPostProcessor.java       | 6 +++---
 .../testdomain/domainmodel/DomainModelTest_usingGoodDomain.java     | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git 
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/choices/ActionParameterChoicesFacetFromChoicesFromFacet.java
 
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/choices/ActionParameterChoicesFacetFromChoicesFromFacet.java
index 522e9bda3a..5ac3a54c63 100644
--- 
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/choices/ActionParameterChoicesFacetFromChoicesFromFacet.java
+++ 
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/choices/ActionParameterChoicesFacetFromChoicesFromFacet.java
@@ -51,7 +51,7 @@ extends ActionParameterChoicesFacetAbstract {
     private ActionParameterChoicesFacetFromChoicesFromFacet(
             final OneToManyAssociation choicesFromCollection,
             final FacetHolder holder) {
-        super(holder, Precedence.LOW);
+        super(holder, Precedence.LOW); // precedence low, so is overridden by 
imperative facets (member support)
         this.choicesFromCollection = choicesFromCollection;
     }
 
diff --git 
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/param/ChoicesAndDefaultsPostProcessor.java
 
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/param/ChoicesAndDefaultsPostProcessor.java
index de866a0999..df2e9d2d97 100644
--- 
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/param/ChoicesAndDefaultsPostProcessor.java
+++ 
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/param/ChoicesAndDefaultsPostProcessor.java
@@ -140,7 +140,7 @@ extends ObjectSpecificationPostProcessorAbstract {
             val compatibleCollectionParams = 
parameters.filter(whetherCollectionParamOfType);
             val compatibleScalarParams = 
parameters.filter(whetherScalarParamOfType);
 
-            // for collection parameters, install an defaults facet (if there 
isn't one already)
+            // for collection parameters, install a defaults facet (if there 
isn't one already)
             // this will cause the UI to render the collection with toggleboxes
             for (final ObjectActionParameter collectionParam : 
compatibleCollectionParams) {
                 addCollectionParamDefaultsFacetIfNoneAlready(collectionParam);
@@ -190,11 +190,11 @@ extends ObjectSpecificationPostProcessorAbstract {
     }
 
     private static void addCollectionParamChoicesFacetIfNoneAlready(
-            final OneToManyAssociation otma,
+            final OneToManyAssociation coll,
             final ObjectActionParameter param) {
         if(!hasMemberLevelChoices(param)) {
             FacetUtil.addFacet(
-                    new 
ActionParameterChoicesFacetFromParentedCollection(param, otma));
+                    new 
ActionParameterChoicesFacetFromParentedCollection(param, coll));
         }
     }
 
diff --git 
a/regressiontests/stable-domainmodel/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingGoodDomain.java
 
b/regressiontests/stable-domainmodel/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingGoodDomain.java
index 908f2bbb34..9824c11a00 100644
--- 
a/regressiontests/stable-domainmodel/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingGoodDomain.java
+++ 
b/regressiontests/stable-domainmodel/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingGoodDomain.java
@@ -510,7 +510,7 @@ class DomainModelTest_usingGoodDomain {
                val choicesFacet = 
param.getFacet(ActionParameterChoicesFacet.class);
 
                assertNotNull(choicesFacet, ()->String.format(
-                       "param %d is expected to have a 
ActionParameterChoicesFacet",
+                       "param %d is expected to have an 
ActionParameterChoicesFacet",
                        param.getParameterIndex()));
             });
         }