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 2014/01/10 17:42:32 UTC
git commit: ISIS-641: allow actions to return objects of type
java.util.Collection ...
Updated Branches:
refs/heads/master 239182f83 -> a08335605
ISIS-641: allow actions to return objects of type java.util.Collection ...
... not just java.util.List.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/a0833560
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/a0833560
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/a0833560
Branch: refs/heads/master
Commit: a083356059f2511d27e0ed3c4560e0cf04e64637
Parents: 239182f
Author: Dan Haywood <da...@apache.org>
Authored: Fri Jan 10 16:39:25 2014 +0000
Committer: Dan Haywood <da...@apache.org>
Committed: Fri Jan 10 16:39:25 2014 +0000
----------------------------------------------------------------------
.../isis/viewer/wicket/ui/components/actions/ActionPanel.java | 7 ++++++-
.../dom/src/main/java/dom/todo/ToDoItem.java | 1 +
2 files changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/a0833560/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionPanel.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionPanel.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionPanel.java
index 03e4f88..5c3a51b 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionPanel.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionPanel.java
@@ -19,11 +19,13 @@
package org.apache.isis.viewer.wicket.ui.components.actions;
+import java.util.Collection;
import java.util.Iterator;
import java.util.List;
import com.google.common.base.Throwables;
import com.google.common.collect.Iterables;
+import com.google.common.collect.Lists;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.markup.html.basic.Label;
@@ -462,7 +464,10 @@ public class ActionPanel extends PanelAbstract<ActionModel> implements ActionExe
}
@SuppressWarnings("unchecked")
private static List<Object> asList(final ObjectAdapter resultAdapter) {
- return (List<Object>) resultAdapter.getObject();
+ final Collection<Object> coll = (Collection<Object>) resultAdapter.getObject();
+ return coll instanceof List
+ ? (List<Object>)coll
+ : Lists.<Object>newArrayList(coll);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/a0833560/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/dom/todo/ToDoItem.java
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/dom/todo/ToDoItem.java b/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/dom/todo/ToDoItem.java
index ac98db4..191c768 100644
--- a/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/dom/todo/ToDoItem.java
+++ b/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/dom/todo/ToDoItem.java
@@ -470,6 +470,7 @@ public class ToDoItem implements Comparable<ToDoItem> /*, Locatable*/ { // GMAP3
this.dependencies = dependencies;
}
+
@PublishedAction
public ToDoItem add(
@TypicalLength(20)