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 2019/10/08 12:45:41 UTC
[isis] 01/02: ISIS-1998: minor polishing
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch v2
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 1d1a5bc86422678657dbbcf3eaecf33c0ccfe297
Author: Andi Huber <ah...@apache.org>
AuthorDate: Tue Oct 8 08:48:25 2019 +0200
ISIS-1998: minor polishing
---
.../apache/isis/metamodel/facets/ContributeeMemberFacetFactory.java | 6 +++---
.../facets/actions/action/invocation/ActionInvocationFacet.java | 2 +-
.../metamodel/specloader/specimpl/ObjectSpecificationAbstract.java | 3 ++-
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/ContributeeMemberFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/ContributeeMemberFacetFactory.java
index d6f1e92..9948b4d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/ContributeeMemberFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/ContributeeMemberFacetFactory.java
@@ -27,11 +27,11 @@ import org.apache.isis.metamodel.specloader.specimpl.ContributeeMember;
*/
public interface ContributeeMemberFacetFactory extends FacetFactory {
- class ProcessContributeeMemberContext extends AbstractProcessContext<ObjectMember>
+ public static class ProcessContributeeMemberContext
+ extends AbstractProcessContext<ObjectMember>
implements ProcessContextWithMetadataProperties<ObjectMember> {
- public ProcessContributeeMemberContext(
- final ObjectMember facetHolder) {
+ public ProcessContributeeMemberContext(final ObjectMember facetHolder) {
super(facetHolder);
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/action/invocation/ActionInvocationFacet.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/action/invocation/ActionInvocationFacet.java
index 7808582..ac3cd51 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/action/invocation/ActionInvocationFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/action/invocation/ActionInvocationFacet.java
@@ -40,7 +40,7 @@ public interface ActionInvocationFacet extends Facet {
ObjectAdapter targetAdapter,
ObjectAdapter mixedInAdapter, // null for regular or contributed (not mixin) actions
ObjectAdapter[] argumentAdapters,
- final InteractionInitiatedBy interactionInitiatedBy);
+ InteractionInitiatedBy interactionInitiatedBy);
ObjectSpecification getReturnType();
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java
index 355fe61..fa24f6e 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java
@@ -952,6 +952,7 @@ public abstract class ObjectSpecificationAbstract extends FacetHolderImpl implem
if(!mixinFacet.isMixinFor(getCorrespondingClass())) {
return;
}
+ val mixinMethodName = mixinFacet.value();
final Stream<ObjectAction> mixinActions = mixinSpec
.streamObjectActions(ActionType.ALL, Contributed.INCLUDED);
@@ -959,7 +960,7 @@ public abstract class ObjectSpecificationAbstract extends FacetHolderImpl implem
mixinActions
.filter(Predicates::isMixedInAction)
.map(ObjectActionDefault.class::cast)
- .map(Factories.mixedInAction(this, mixinType, mixinFacet.value()))
+ .map(Factories.mixedInAction(this, mixinType, mixinMethodName))
.peek(facetProcessor::processMemberOrder)
.forEach(onNewMixedInAction);