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/04/20 10:36:07 UTC
git commit: ISIS-388: using regular Link instead of AjaxLink
Updated Branches:
refs/heads/master 7e6fbb337 -> 7c624d1cb
ISIS-388: using regular Link instead of AjaxLink
... so can redirect to the error page correctly if there is an unexpected error.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/7c624d1c
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/7c624d1c
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/7c624d1c
Branch: refs/heads/master
Commit: 7c624d1cbfe6d706750fa970cc951ebdb3c5d63c
Parents: 7e6fbb3
Author: Dan Haywood <da...@apache.org>
Authored: Sat Apr 20 09:35:53 2013 +0100
Committer: Dan Haywood <da...@apache.org>
Committed: Sat Apr 20 09:35:53 2013 +0100
----------------------------------------------------------------------
.../ajaxtable/BulkActionsLinkFactory.java | 17 +++++++--------
1 files changed, 8 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/7c624d1c/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/BulkActionsLinkFactory.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/BulkActionsLinkFactory.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/BulkActionsLinkFactory.java
index 0f28bab..f519a1a 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/BulkActionsLinkFactory.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/BulkActionsLinkFactory.java
@@ -24,10 +24,9 @@ import com.google.common.base.Predicate;
import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;
import org.apache.wicket.markup.html.link.AbstractLink;
+import org.apache.wicket.markup.html.link.Link;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager.ConcurrencyChecking;
@@ -42,6 +41,8 @@ import org.apache.isis.viewer.wicket.ui.errors.JGrowlBehaviour;
final class BulkActionsLinkFactory implements CssMenuLinkFactory {
private static final long serialVersionUID = 1L;
private final EntityCollectionModel model;
+
+ @SuppressWarnings("unused")
private final DataTable<ObjectAdapter,String> dataTable;
BulkActionsLinkFactory(EntityCollectionModel model, DataTable<ObjectAdapter,String> dataTable) {
@@ -52,12 +53,12 @@ final class BulkActionsLinkFactory implements CssMenuLinkFactory {
@Override
public LinkAndLabel newLink(final ObjectAdapterMemento serviceAdapterMemento, final ObjectAction objectAction, final String linkId) {
final ActionMemento actionMemento = new ActionMemento(objectAction);
- AbstractLink link = new AjaxLink<Void>(linkId) {
-
+ final AbstractLink link = new Link<Object>(linkId) {
+
private static final long serialVersionUID = 1L;
@Override
- public void onClick(AjaxRequestTarget target) {
+ public void onClick() {
final ObjectAction objectAction = actionMemento.getAction();
for(ObjectAdapterMemento entityAdapterMemento: model.getToggleMementosList()) {
@@ -81,13 +82,10 @@ final class BulkActionsLinkFactory implements CssMenuLinkFactory {
return;
}
objectAction.execute(entityAdapter, new ObjectAdapter[]{});
- }
+ }
}
model.clearToggleMementosList();
model.setObject(persistentAdaptersWithin(model.getObject()));
-
- target.add(this); // for jgrowl
- target.add(dataTable);
}
private List<ObjectAdapter> persistentAdaptersWithin(List<ObjectAdapter> adapters) {
@@ -98,6 +96,7 @@ final class BulkActionsLinkFactory implements CssMenuLinkFactory {
}
}));
}
+
};
link.add(new JGrowlBehaviour());
return new LinkAndLabel(link, objectAction.getName(), null);