You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2022/09/17 19:47:47 UTC
[isis] branch master updated (afd9add321 -> fda7a766c0)
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
from afd9add321 ISIS-3215: more misnomer
new c82d2e3a4c ISIS-3215: more misnomer (2)
new fda7a766c0 ISIS-3215: demo domain fixes
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../java/org/apache/isis/core/metamodel/facetapi/FeatureType.java | 4 ++--
.../specloader/specimpl/ObjectActionParameterAbstract.java | 8 +++-----
.../depargs/DependentArgsActionDemo_useAutoComplete.java | 8 ++++++++
.../progmodel/depargs/DependentArgsActionDemo_useChoices.java | 7 +++++++
4 files changed, 20 insertions(+), 7 deletions(-)
[isis] 01/02: ISIS-3215: more misnomer (2)
Posted by ah...@apache.org.
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 c82d2e3a4cec9fd71cd5d692d3b4893a0420de84
Author: andi-huber <ah...@apache.org>
AuthorDate: Sat Sep 17 21:43:03 2022 +0200
ISIS-3215: more misnomer (2)
---
.../java/org/apache/isis/core/metamodel/facetapi/FeatureType.java | 4 ++--
.../specloader/specimpl/ObjectActionParameterAbstract.java | 8 +++-----
2 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/FeatureType.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/FeatureType.java
index 94e228d377..a3f6758512 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/FeatureType.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/FeatureType.java
@@ -66,7 +66,7 @@ public enum FeatureType {
return Identifier.actionIdentifier(typeIdentifier, fullMethodName, parameterTypes);
}
},
- ACTION_PARAMETER_SINGULAR("Scalar Parameter") {
+ ACTION_PARAMETER_SINGULAR("Singular Parameter") {
/**
* Always returns <tt>null</tt>.
*/
@@ -75,7 +75,7 @@ public enum FeatureType {
return null;
}
},
- ACTION_PARAMETER_PLURAL("Collection Parameter") {
+ ACTION_PARAMETER_PLURAL("Plural Parameter") {
/**
* Always returns <tt>null</tt>.
*/
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstract.java
index 0d67e5a06c..ad45cb72a9 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstract.java
@@ -240,14 +240,12 @@ implements
.map(defaultsFacet->defaultsFacet.getDefault(pendingArgs))
.orElseGet(Can::empty);
- val paramMeta = pendingArgs.getParamMetamodel(getParameterIndex());
-
- if(paramMeta.isPlural()) {
- final Can<ManagedObject> nonScalarDefaults = defaults
+ if(this.isPlural()) {
+ final Can<ManagedObject> pluralDefaults = defaults
// post processing each entry
.map(obj->ManagedObjects.emptyToDefault(paramSpec, !isOptional(), obj));
// pack up
- val packed = ManagedObject.packed(paramSpec, nonScalarDefaults);
+ val packed = ManagedObject.packed(paramSpec, pluralDefaults);
return packed;
}
[isis] 02/02: ISIS-3215: demo domain fixes
Posted by ah...@apache.org.
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 fda7a766c0fbf8e04c9fe9f3366761a5907a1ac9
Author: andi-huber <ah...@apache.org>
AuthorDate: Sat Sep 17 21:47:41 2022 +0200
ISIS-3215: demo domain fixes
---
.../depargs/DependentArgsActionDemo_useAutoComplete.java | 8 ++++++++
.../progmodel/depargs/DependentArgsActionDemo_useChoices.java | 7 +++++++
2 files changed, 15 insertions(+)
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/depargs/DependentArgsActionDemo_useAutoComplete.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/depargs/DependentArgsActionDemo_useAutoComplete.java
index 36d08beafb..ab71f7391b 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/depargs/DependentArgsActionDemo_useAutoComplete.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/depargs/DependentArgsActionDemo_useAutoComplete.java
@@ -76,6 +76,14 @@ public class DependentArgsActionDemo_useAutoComplete {
// -- PARAM 1 (DemoItem)
+ @MemberSupport public DemoItem default1Act(final Parameters params) {
+ // fill in first that is possible based on the first param from the UI dialog
+ return params.parity()==null
+ ? null
+ : autoComplete1Act(params, params.parity.name())
+ .stream().findFirst().orElse(null);
+ }
+
@MemberSupport public Collection<DemoItem> autoComplete1Act(
final Parameters params,
@MinLength(2) final String search) {
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/depargs/DependentArgsActionDemo_useChoices.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/depargs/DependentArgsActionDemo_useChoices.java
index e5403fa9ef..9bd56acdc3 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/depargs/DependentArgsActionDemo_useChoices.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/depargs/DependentArgsActionDemo_useChoices.java
@@ -76,6 +76,13 @@ public class DependentArgsActionDemo_useChoices {
// -- PARAM 1 (DemoItem)
+ @MemberSupport public DemoItem default1Act(final Parameters params) {
+ // fill in first that is possible based on the first param from the UI dialog
+ return params.parity()==null
+ ? null
+ : choices1Act(params).stream().findFirst().orElse(null);
+ }
+
@MemberSupport public Collection<DemoItem> choices1Act(final Parameters params) {
val parity = params.parity(); // <-- the refining parameter from the dialog above