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 2015/10/16 01:01:07 UTC
[3/7] isis git commit: ISIS-1007: should not render "are you sure"
for entity action links that take arguments (will render a prompt).
ISIS-1007: should not render "are you sure" for entity action links that take arguments (will render a prompt).
Also: some minor refactoring to remove duplication.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/e74e1372
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/e74e1372
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/e74e1372
Branch: refs/heads/master
Commit: e74e1372bfd4ce634788be0536f2847f58984600
Parents: 51e7be7
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Thu Oct 15 14:36:20 2015 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Thu Oct 15 14:36:20 2015 +0100
----------------------------------------------------------------------
.../viewer/wicket/model/links/LinkAndLabel.java | 57 +++++++++++++++++++-
.../entityactions/AdditionalLinksPanel.java | 2 +-
.../collection/bulk/BulkActionsLinkFactory.java | 21 ++------
.../linkandlabel/ActionLinkFactoryAbstract.java | 18 +------
4 files changed, 63 insertions(+), 35 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/e74e1372/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/links/LinkAndLabel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/links/LinkAndLabel.java b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/links/LinkAndLabel.java
index d961fc2..c728a63 100644
--- a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/links/LinkAndLabel.java
+++ b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/links/LinkAndLabel.java
@@ -25,8 +25,11 @@ import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
import org.apache.wicket.markup.html.link.AbstractLink;
import org.apache.isis.applib.annotation.ActionLayout;
+import org.apache.isis.applib.annotation.ActionSemantics;
import org.apache.isis.applib.annotation.SemanticsOf;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facets.members.cssclassfa.CssClassFaPosition;
+import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
public class LinkAndLabel implements Serializable {
@@ -38,6 +41,49 @@ public class LinkAndLabel implements Serializable {
return Lists.newArrayList(Iterables.filter(entityActionLinks, Predicates.positioned(position)));
}
+ public static LinkAndLabel newLinkAndLabel(
+ final ObjectAdapter objectAdapter,
+ final ObjectAction objectAction,
+ final AbstractLink link,
+ final String disabledReasonIfAny,
+ final boolean blobOrClob) {
+
+ final String name = ObjectAction.Utils.nameFor(objectAction);
+
+ final boolean explorationOrPrototype = ObjectAction.Utils.isExplorationOrPrototype(objectAction);
+ final String actionIdentifier = ObjectAction.Utils.actionIdentifierFor(objectAction);
+ final String description = ObjectAction.Utils.descriptionOf(objectAction);
+ final String cssClass = ObjectAction.Utils.cssClassFor(objectAction, objectAdapter);
+ final String cssClassFa = ObjectAction.Utils.cssClassFaFor(objectAction);
+ final CssClassFaPosition cssClassFaPosition = ObjectAction.Utils.cssClassFaPositionFor(objectAction);
+ final ActionLayout.Position actionLayoutPosition = ObjectAction.Utils.actionLayoutPositionOf(objectAction);
+ final ActionSemantics.Of semantics = objectAction.getSemantics();
+
+ return new LinkAndLabel(
+ link, name,
+ disabledReasonIfAny, description,
+ blobOrClob, explorationOrPrototype,
+ actionIdentifier,
+ cssClass, cssClassFa, cssClassFaPosition, actionLayoutPosition,
+ SemanticsOf.from(semantics),
+ Parameters.fromParameterCount(objectAction.getParameterCount()));
+ }
+
+ public enum Parameters {
+ NO_PARAMETERS,
+ TAKES_PARAMETERS;
+
+ public static Parameters fromParameterCount(final int parameterCount) {
+ return parameterCount > 0? TAKES_PARAMETERS: NO_PARAMETERS;
+ }
+
+ public boolean isNoParameters() {
+ return this == NO_PARAMETERS;
+ }
+ public boolean isTakesParameters() {
+ return this == TAKES_PARAMETERS;
+ }
+ }
private final AbstractLink link;
private final String label;
@@ -51,8 +97,9 @@ public class LinkAndLabel implements Serializable {
private final CssClassFaPosition cssClassFaPosition;
private final ActionLayout.Position position;
private final SemanticsOf semanticsOf;
+ private Parameters parameters;
- public LinkAndLabel(
+ private LinkAndLabel(
final AbstractLink link,
final String label,
final String disabledReasonIfAny,
@@ -64,7 +111,8 @@ public class LinkAndLabel implements Serializable {
final String cssClassFa,
final CssClassFaPosition cssClassFaPosition,
final ActionLayout.Position position,
- final SemanticsOf semanticsOf) {
+ final SemanticsOf semanticsOf,
+ final Parameters parameters) {
this.link = link;
this.label = label;
this.disabledReasonIfAny = disabledReasonIfAny;
@@ -77,6 +125,7 @@ public class LinkAndLabel implements Serializable {
this.cssClassFaPosition = cssClassFaPosition;
this.position = position;
this.semanticsOf = semanticsOf;
+ this.parameters = parameters;
}
public AbstractLink getLink() {
@@ -127,6 +176,10 @@ public class LinkAndLabel implements Serializable {
return semanticsOf;
}
+ public Parameters getParameters() {
+ return parameters;
+ }
+
public static class Predicates {
public static Predicate<LinkAndLabel> positioned(final ActionLayout.Position position) {
return new Predicate<LinkAndLabel>() {
http://git-wip-us.apache.org/repos/asf/isis/blob/e74e1372/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/AdditionalLinksPanel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/AdditionalLinksPanel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/AdditionalLinksPanel.java
index 9eabdf5..7de96a0 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/AdditionalLinksPanel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/AdditionalLinksPanel.java
@@ -125,7 +125,7 @@ public class AdditionalLinksPanel extends PanelAbstract<ListOfLinksModel> {
link.add(new CssClassAppender(linkAndLabel.getActionIdentifier()));
SemanticsOf semantics = linkAndLabel.getSemantics();
- if ( semantics.isAreYouSure() ) {
+ if ( semantics.isAreYouSure() && linkAndLabel.getParameters().isNoParameters() ) {
ConfirmationConfig confirmationConfig = new ConfirmationConfig();
// TODO ISIS-1007 Use i18n for the title and the labels
confirmationConfig.withTitle("Are you sure?");
http://git-wip-us.apache.org/repos/asf/isis/blob/e74e1372/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/bulk/BulkActionsLinkFactory.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/bulk/BulkActionsLinkFactory.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/bulk/BulkActionsLinkFactory.java
index de42f3f..6a113a0 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/bulk/BulkActionsLinkFactory.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/bulk/BulkActionsLinkFactory.java
@@ -26,13 +26,9 @@ import org.apache.wicket.Session;
import org.apache.wicket.markup.html.link.AbstractLink;
import org.apache.wicket.markup.html.link.Link;
import org.apache.isis.applib.RecoverableException;
-import org.apache.isis.applib.annotation.ActionSemantics;
-import org.apache.isis.applib.annotation.SemanticsOf;
import org.apache.isis.applib.services.actinvoc.ActionInvocationContext;
-import org.apache.isis.applib.annotation.ActionLayout;
import org.apache.isis.applib.annotation.Bulk;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
-import org.apache.isis.core.metamodel.facets.members.cssclassfa.CssClassFaPosition;
import org.apache.isis.applib.annotation.InvokedOn;
import org.apache.isis.applib.services.command.Command;
import org.apache.isis.applib.services.command.Command.Executor;
@@ -212,19 +208,12 @@ public final class BulkActionsLinkFactory implements ActionLinkFactory {
};
link.add(new JGrowlBehaviour());
- final boolean explorationOrPrototype = ObjectAction.Utils.isExplorationOrPrototype(objectAction);
- final String actionIdentifier = ObjectAction.Utils.actionIdentifierFor(objectAction);
- final String description = ObjectAction.Utils.descriptionOf(objectAction);
- final String cssClass = ObjectAction.Utils.cssClassFor(objectAction, null);
- final String cssClassFa = ObjectAction.Utils.cssClassFaFor(objectAction);
- final CssClassFaPosition cssClassFaPosition = ObjectAction.Utils.cssClassFaPositionFor(objectAction);
- final ActionLayout.Position position = ObjectAction.Utils.actionLayoutPositionOf(objectAction);
- final ActionSemantics.Of semantics = objectAction.getSemantics();
-
- return new LinkAndLabel(link, objectAction.getName(), null, description, false, explorationOrPrototype, actionIdentifier, cssClass, cssClassFa, cssClassFaPosition, position,
- SemanticsOf.from(semantics));
- }
+ final String disabledReasonIfAny = null;
+ final boolean blobOrClob = false;
+ final ObjectAdapter objectAdapter = null;
+ return LinkAndLabel.newLinkAndLabel(objectAdapter, objectAction, link, disabledReasonIfAny, blobOrClob);
+ }
///////////////////////////////////////////////////////
// Dependencies (from context)
http://git-wip-us.apache.org/repos/asf/isis/blob/e74e1372/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/linkandlabel/ActionLinkFactoryAbstract.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/linkandlabel/ActionLinkFactoryAbstract.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/linkandlabel/ActionLinkFactoryAbstract.java
index 0608c7c..e81de3d 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/linkandlabel/ActionLinkFactoryAbstract.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/linkandlabel/ActionLinkFactoryAbstract.java
@@ -25,11 +25,7 @@ import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.html.link.AbstractLink;
import org.apache.wicket.request.IRequestHandler;
-import org.apache.isis.applib.annotation.ActionLayout;
-import org.apache.isis.applib.annotation.ActionSemantics;
-import org.apache.isis.applib.annotation.SemanticsOf;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.facets.members.cssclassfa.CssClassFaPosition;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
import org.apache.isis.viewer.wicket.model.links.LinkAndLabel;
import org.apache.isis.viewer.wicket.model.models.ActionModel;
@@ -174,19 +170,9 @@ public abstract class ActionLinkFactoryAbstract implements ActionLinkFactory {
final AbstractLink link,
final String disabledReasonIfAny) {
- final String label = ObjectAction.Utils.nameFor(objectAction);
final boolean blobOrClob = ObjectAction.Utils.returnsBlobOrClob(objectAction);
- final boolean prototype = ObjectAction.Utils.isExplorationOrPrototype(objectAction);
- final String actionIdentifier = ObjectAction.Utils.actionIdentifierFor(objectAction);
- final String description = ObjectAction.Utils.descriptionOf(objectAction);
- final ActionLayout.Position position = ObjectAction.Utils.actionLayoutPositionOf(objectAction);
- final String cssClass = ObjectAction.Utils.cssClassFor(objectAction, objectAdapter);
- final String cssClassFa = ObjectAction.Utils.cssClassFaFor(objectAction);
- final CssClassFaPosition cssClassFaPosition = ObjectAction.Utils.cssClassFaPositionFor(objectAction);
- final ActionSemantics.Of semantics = objectAction.getSemantics();
-
- return new LinkAndLabel(link, label, disabledReasonIfAny, description, blobOrClob, prototype, actionIdentifier,
- cssClass, cssClassFa, cssClassFaPosition, position, SemanticsOf.from(semantics));
+
+ return LinkAndLabel.newLinkAndLabel(objectAdapter, objectAction, link, disabledReasonIfAny, blobOrClob);
}
// ////////////////////////////////////////////////////////////