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/12/18 14:44:09 UTC
[isis] branch master updated: ISIS-2226: fix regression from last
commit; also cleaning up a bit
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 bd2f455 ISIS-2226: fix regression from last commit; also cleaning up a bit
bd2f455 is described below
commit bd2f45562feb0b9c23a06d6e126f670dd26a0f47
Author: Andi Huber <ah...@apache.org>
AuthorDate: Wed Dec 18 15:43:57 2019 +0100
ISIS-2226: fix regression from last commit; also cleaning up a bit
---
.../invocation/ActionDomainEventFacetAbstract.java | 9 +++++++--
.../specloader/specimpl/ObjectActionContributee.java | 19 +++----------------
2 files changed, 10 insertions(+), 18 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/action/invocation/ActionDomainEventFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/action/invocation/ActionDomainEventFacetAbstract.java
index f8ad455..06d01d5 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/action/invocation/ActionDomainEventFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/action/invocation/ActionDomainEventFacetAbstract.java
@@ -147,9 +147,14 @@ implements ActionDomainEventFacet {
val contributee = ic.getContributeeWithParamIndex();
- if(contributee!=null && contributee.getIndex() == 0) {
- ManagedObject adapter = contributee.getValue();
+ if(contributee!=null) {
+
+ val adapter = contributee.getIndex() == 0
+ ? contributee.getValue()
+ : ManagedObject.empty();
+
return Can.ofSingleton(adapter);
+
}
return Can.empty();
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/specimpl/ObjectActionContributee.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/specimpl/ObjectActionContributee.java
index fedab95..e76e0ef 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/specimpl/ObjectActionContributee.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/specimpl/ObjectActionContributee.java
@@ -30,7 +30,6 @@ import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facetapi.FacetHolderImpl;
import org.apache.isis.metamodel.facetapi.FacetUtil;
import org.apache.isis.metamodel.facetapi.FeatureType;
-import org.apache.isis.metamodel.facets.FacetedMethodParameter;
import org.apache.isis.metamodel.interactions.InteractionUtils;
import org.apache.isis.metamodel.interactions.UsabilityContext;
import org.apache.isis.metamodel.interactions.VisibilityContext;
@@ -103,7 +102,7 @@ public class ObjectActionContributee extends ObjectActionDefault implements Cont
protected synchronized Can<ObjectActionParameter> determineParameters() {
val serviceParameters = serviceAction.getParameters();
- final List<FacetedMethodParameter> paramPeers = getFacetedMethod().getParameters(); //side effects?
+ //final List<FacetedMethodParameter> paramPeers = getFacetedMethod().getParameters(); //side effects?
final List<ObjectActionParameter> contributeeParameters = _Lists.newArrayList();
int contributeeParamNum = 0;
@@ -124,9 +123,9 @@ public class ObjectActionContributee extends ObjectActionDefault implements Cont
: new OneToManyActionParameterContributee(
servicePojo, serviceParameter, contributeeParamNum, this);
- contributeeParameters.add(contributedParam);
+ contributeeParameters.add(contributedParam);
- contributeeParamNum++;
+ contributeeParamNum++;
}
return Can.ofCollection(contributeeParameters);
}
@@ -242,18 +241,6 @@ public class ObjectActionContributee extends ObjectActionDefault implements Cont
// //////////////////////////////////////
-// static <T> T[] addElementToArray(T[] array, final int n, final T element, final T[] type) {
-// List<T> list = _Lists.newArrayList(Arrays.asList(array));
-// list.add(n, element);
-// return list.toArray(type);
-// }
-//
-// static <T> T[] removeElementFromArray(T[] array, int n, T[] t) {
-// List<T> list = _Lists.newArrayList(Arrays.asList(array));
-// list.remove(n);
-// return list.toArray(t);
-// }
-
public ManagedObject getServiceAdapter() {
return getObjectManager().adapt(servicePojo);
}