You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2017/02/06 20:43:23 UTC
[2/2] isis git commit: ISIS-785: fixes multi-select for contributed
actions and mixins
ISIS-785: fixes multi-select for contributed actions and mixins
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/5666e490
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/5666e490
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/5666e490
Branch: refs/heads/maint-1.14.0
Commit: 5666e4909a09692b93e0cb2f7c9ad25b3c82c816
Parents: 67d082f
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Mon Feb 6 20:43:06 2017 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Mon Feb 6 20:43:06 2017 +0000
----------------------------------------------------------------------
.../specloader/specimpl/ObjectActionContributee.java | 3 ++-
.../metamodel/specloader/specimpl/ObjectActionMixedIn.java | 8 +++++---
2 files changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/5666e490/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionContributee.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionContributee.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionContributee.java
index 0d3fc46..c90106a 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionContributee.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionContributee.java
@@ -31,6 +31,7 @@ import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
+import org.apache.isis.core.metamodel.facetapi.FeatureType;
import org.apache.isis.core.metamodel.facetapi.MultiTypedFacet;
import org.apache.isis.core.metamodel.facets.FacetedMethodParameter;
import org.apache.isis.core.metamodel.facets.TypedHolder;
@@ -132,7 +133,7 @@ public class ObjectActionContributee extends ObjectActionDefault implements Cont
(ObjectActionParameterAbstract) serviceParameters.get(serviceParamNum);
final ObjectActionParameterContributee contributedParam =
- specification.isNotCollection()
+ serviceParameter.getPeer().getFeatureType() == FeatureType.ACTION_PARAMETER_SCALAR
? new OneToOneActionParameterContributee(
getServiceAdapter(), serviceParameter, contributeeParamNum, this)
: new OneToManyActionParameterContributee(
http://git-wip-us.apache.org/repos/asf/isis/blob/5666e490/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionMixedIn.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionMixedIn.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionMixedIn.java
index 8b9e963..5810596 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionMixedIn.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionMixedIn.java
@@ -30,6 +30,7 @@ import org.apache.isis.core.metamodel.consent.InteractionResultSet;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
+import org.apache.isis.core.metamodel.facetapi.FeatureType;
import org.apache.isis.core.metamodel.facets.FacetedMethodParameter;
import org.apache.isis.core.metamodel.facets.TypedHolder;
import org.apache.isis.core.metamodel.facets.all.named.NamedFacetInferred;
@@ -143,9 +144,10 @@ public class ObjectActionMixedIn extends ObjectActionDefault implements MixedInM
final ObjectSpecification specification = ObjectMemberAbstract
.getSpecification(getSpecificationLoader(), paramPeer.getType());
- final ObjectActionParameterMixedIn mixedInParameter = specification.isNotCollection()
- ? new OneToOneActionParameterMixedIn(mixinParameter, this)
- : new OneToManyActionParameterMixedIn(mixinParameter, this);
+ final ObjectActionParameterMixedIn mixedInParameter =
+ mixinParameter.getPeer().getFeatureType() == FeatureType.ACTION_PARAMETER_SCALAR
+ ? new OneToOneActionParameterMixedIn(mixinParameter, this)
+ : new OneToManyActionParameterMixedIn(mixinParameter, this);
mixedInParameters.add(mixedInParameter);
}
return mixedInParameters;