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 2013/08/20 16:16:31 UTC
git commit: ISIS-210: further fix for choices with param types
Updated Branches:
refs/heads/master 1a4e68921 -> a9ff5e66d
ISIS-210: further fix for choices with param types
- should be using the new AdapterInvokeUtils#invokeWithDefaults(), not the original #invoke()
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/a9ff5e66
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/a9ff5e66
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/a9ff5e66
Branch: refs/heads/master
Commit: a9ff5e66dd115f660ca2fb2f7e4b0176a55c2116
Parents: 1a4e689
Author: Dan Haywood <da...@apache.org>
Authored: Tue Aug 20 15:16:20 2013 +0100
Committer: Dan Haywood <da...@apache.org>
Committed: Tue Aug 20 15:16:20 2013 +0100
----------------------------------------------------------------------
.../choices/methodnum/ActionParameterChoicesFacetViaMethod.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/a9ff5e66/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/param/choices/methodnum/ActionParameterChoicesFacetViaMethod.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/param/choices/methodnum/ActionParameterChoicesFacetViaMethod.java b/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/param/choices/methodnum/ActionParameterChoicesFacetViaMethod.java
index 12a9279..37ca5d7 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/param/choices/methodnum/ActionParameterChoicesFacetViaMethod.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/param/choices/methodnum/ActionParameterChoicesFacetViaMethod.java
@@ -66,7 +66,7 @@ public class ActionParameterChoicesFacetViaMethod extends ActionParameterChoices
@Override
public Object[] getChoices(final ObjectAdapter adapter, final ObjectAdapter[] arguments) {
- final Object options = AdapterInvokeUtils.invoke(method, adapter, arguments);
+ final Object options = AdapterInvokeUtils.invokeWithDefaults(method, adapter, arguments);
if (options == null) {
return new Object[0];
}