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/12/22 17:53:13 UTC
[4/5] isis git commit: ISIS-970: further fixes around
Bulk.InteractionContext.
ISIS-970: further fixes around Bulk.InteractionContext.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/58f5540a
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/58f5540a
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/58f5540a
Branch: refs/heads/ISIS-970
Commit: 58f5540a73bb391f44cd03556ffbfa14c639b4f0
Parents: 0c89cc2
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Mon Dec 22 16:12:24 2014 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Mon Dec 22 16:14:50 2014 +0000
----------------------------------------------------------------------
.../collection/bulk/BulkActionsLinkFactory.java | 2 +-
.../org/apache/isis/applib/annotation/Bulk.java | 35 +++++++++++++-
.../annotation/BulkInteractionContext.java | 49 ++++++++++++++++----
.../applib/annotation/CollectionLayout.java | 9 ++++
...onInvocationFacetForInteractionAbstract.java | 2 +-
.../specimpl/ObjectActionContributee.java | 2 +-
6 files changed, 86 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/58f5540a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/bulk/BulkActionsLinkFactory.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/bulk/BulkActionsLinkFactory.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/bulk/BulkActionsLinkFactory.java
index ffbb76a..3f371e5 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/bulk/BulkActionsLinkFactory.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/bulk/BulkActionsLinkFactory.java
@@ -94,7 +94,7 @@ public final class BulkActionsLinkFactory implements ActionLinkFactory {
final BulkInteractionContext bulkInteractionContext = BulkInteractionContext.current.get();
if (bulkInteractionContext != null) {
- bulkInteractionContext.setInvokedAs(BulkInteractionContext.InvokedAs.BULK);
+ bulkInteractionContext.setActionInvokedAs(BulkInteractionContext.InvokedAs.BULK);
bulkInteractionContext.setDomainObjects(domainObjects);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/58f5540a/core/applib/src/main/java/org/apache/isis/applib/annotation/Bulk.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/annotation/Bulk.java b/core/applib/src/main/java/org/apache/isis/applib/annotation/Bulk.java
index 08f0bc6..0db18f5 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/annotation/Bulk.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/annotation/Bulk.java
@@ -70,6 +70,28 @@ public @interface Bulk {
/**
+ * @deprecated - use {@link org.apache.isis.applib.annotation.BulkInteractionContext.InvokedAs} instead.
+ */
+ @Deprecated
+ public static enum InvokedAs {
+ /**
+ * @deprecated - use {@link org.apache.isis.applib.annotation.BulkInteractionContext.InvokedAs#BULK} instead.
+ */
+ @Deprecated
+ BULK,
+ /**
+ * @deprecated - use {@link org.apache.isis.applib.annotation.BulkInteractionContext.InvokedAs#REGULAR} instead.
+ */
+ @Deprecated
+ REGULAR;
+ public boolean isRegular() { return this == REGULAR; }
+ public boolean isBulk() { return this == BULK; }
+
+
+ }
+
+
+ /**
* @deprecated - now a {@link RequestScoped} service
*/
@Deprecated
@@ -111,12 +133,23 @@ public @interface Bulk {
return new InteractionContext(InvokedAs.BULK, domainObjects);
}
+
+ // //////////////////////////////////////
+
+ /**
+ * @deprecated - see {@link org.apache.isis.applib.annotation.BulkInteractionContext()}.
+ */
+ @Deprecated
+ public InteractionContext() {
+ super();
+ }
+
/**
* @deprecated - now a {@link RequestScoped} service
*/
@Deprecated
public InteractionContext(final InvokedAs invokedAs, final List<Object> domainObjects) {
- super(invokedAs, domainObjects);
+ super(BulkInteractionContext.InvokedAs.from(invokedAs), domainObjects);
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/58f5540a/core/applib/src/main/java/org/apache/isis/applib/annotation/BulkInteractionContext.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/annotation/BulkInteractionContext.java b/core/applib/src/main/java/org/apache/isis/applib/annotation/BulkInteractionContext.java
index 15aca7d..4ccb5c1 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/annotation/BulkInteractionContext.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/annotation/BulkInteractionContext.java
@@ -44,6 +44,24 @@ public abstract class BulkInteractionContext {
REGULAR;
public boolean isRegular() { return this == REGULAR; }
public boolean isBulk() { return this == BULK; }
+
+ @Deprecated
+ public static InvokedAs from(final Bulk.InteractionContext.InvokedAs invokedAs) {
+ if (invokedAs == Bulk.InteractionContext.InvokedAs.REGULAR) return REGULAR;
+ if (invokedAs == Bulk.InteractionContext.InvokedAs.BULK) return BULK;
+ // shouldn't happen
+ throw new IllegalArgumentException("Unrecognized bulk interactionContext invokedAs: " + invokedAs);
+ }
+
+ @Deprecated
+ public static Bulk.InteractionContext.InvokedAs from(final BulkInteractionContext.InvokedAs invokedAs) {
+ if (invokedAs == REGULAR) return Bulk.InteractionContext.InvokedAs.REGULAR;
+ if (invokedAs == BULK) return Bulk.InteractionContext.InvokedAs.BULK;
+ // shouldn't happen
+ throw new IllegalArgumentException("Unrecognized bulk interactionContext invokedAs: " + invokedAs);
+ }
+
+
}
/**
@@ -75,7 +93,7 @@ public abstract class BulkInteractionContext {
// //////////////////////////////////////
- private InvokedAs invokedAs;
+ private InvokedAs actionInvokedAs;
private List<Object> domainObjects;
private int index;
@@ -90,16 +108,16 @@ public abstract class BulkInteractionContext {
* @deprecated - now a {@link javax.enterprise.context.RequestScoped} service
*/
@Deprecated
- public BulkInteractionContext(final InvokedAs invokedAs, final Object... domainObjects) {
- this(invokedAs, Arrays.asList(domainObjects));
+ public BulkInteractionContext(final InvokedAs actionInvokedAs, final Object... domainObjects) {
+ this(actionInvokedAs, Arrays.asList(domainObjects));
}
/**
* @deprecated - now a {@link javax.enterprise.context.RequestScoped} service
*/
@Deprecated
- public BulkInteractionContext(final InvokedAs invokedAs, final List<Object> domainObjects) {
- this.invokedAs = invokedAs;
+ public BulkInteractionContext(final InvokedAs actionInvokedAs, final List<Object> domainObjects) {
+ this.actionInvokedAs = actionInvokedAs;
this.domainObjects = domainObjects;
}
@@ -133,8 +151,8 @@ public abstract class BulkInteractionContext {
* <b>NOT API</b>: intended to be called only by the framework.
*/
@Programmatic
- public void setInvokedAs(InvokedAs invokedAs) {
- this.invokedAs = invokedAs;
+ public void setActionInvokedAs(InvokedAs actionInvokedAs) {
+ this.actionInvokedAs = actionInvokedAs;
}
/**
@@ -157,13 +175,26 @@ public abstract class BulkInteractionContext {
/**
+ * Whether this particular {@link org.apache.isis.applib.annotation.BulkInteractionContext} was applied as a {@link InvokedAs#BULK bulk} action
+ * (against each domain object in a list of domain objects) or as a {@link InvokedAs#REGULAR regular}
+ * action (against a single domain object).
+ */
+ @Programmatic
+ public BulkInteractionContext.InvokedAs getActionInvokedAs() {
+ return actionInvokedAs;
+ }
+
+ /**
* Whether this particular {@link org.apache.isis.applib.annotation.Bulk.InteractionContext} was applied as a {@link InvokedAs#BULK bulk} action
* (against each domain object in a list of domain objects) or as a {@link InvokedAs#REGULAR regular}
* action (against a single domain object).
+ *
+ * @deprecated - use {@link #getActionInvokedAs()} instead.
*/
+ @Deprecated
@Programmatic
- public InvokedAs getInvokedAs() {
- return invokedAs;
+ public Bulk.InteractionContext.InvokedAs getInvokedAs() {
+ return BulkInteractionContext.InvokedAs.from(actionInvokedAs);
}
/**
http://git-wip-us.apache.org/repos/asf/isis/blob/58f5540a/core/applib/src/main/java/org/apache/isis/applib/annotation/CollectionLayout.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/annotation/CollectionLayout.java b/core/applib/src/main/java/org/apache/isis/applib/annotation/CollectionLayout.java
index 670d538..1997937 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/annotation/CollectionLayout.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/annotation/CollectionLayout.java
@@ -93,12 +93,21 @@ public @interface CollectionLayout {
EAGERLY,
LAZILY;
+ @Deprecated
public static Render.Type typeOf(final RenderType renderType) {
if (renderType == EAGERLY) return Render.Type.EAGERLY;
if (renderType == LAZILY) return Render.Type.LAZILY;
// shouldn't happen
throw new IllegalArgumentException("Unrecognized renderType: " + renderType);
}
+
+ @Deprecated
+ public static RenderType typeOf(final Render.Type renderType) {
+ if (renderType == Render.Type.EAGERLY) return RenderType.EAGERLY;
+ if (renderType == Render.Type.LAZILY) return RenderType.LAZILY;
+ // shouldn't happen
+ throw new IllegalArgumentException("Unrecognized renderType: " + renderType);
+ }
}
/**
http://git-wip-us.apache.org/repos/asf/isis/blob/58f5540a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/interaction/ActionInvocationFacetForInteractionAbstract.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/interaction/ActionInvocationFacetForInteractionAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/interaction/ActionInvocationFacetForInteractionAbstract.java
index 4e0ccaa..7c362c6 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/interaction/ActionInvocationFacetForInteractionAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/interaction/ActionInvocationFacetForInteractionAbstract.java
@@ -238,7 +238,7 @@ public abstract class ActionInvocationFacetForInteractionAbstract
bulkInteractionContext != null &&
bulkInteractionContext.getInvokedAs() == null) {
- bulkInteractionContext.setInvokedAs(BulkInteractionContext.InvokedAs.REGULAR);
+ bulkInteractionContext.setActionInvokedAs(BulkInteractionContext.InvokedAs.REGULAR);
bulkInteractionContext.setDomainObjects(Collections.singletonList(targetPojo));
}
http://git-wip-us.apache.org/repos/asf/isis/blob/58f5540a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionContributee.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionContributee.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionContributee.java
index 5a6fd61..dbcbbfc 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionContributee.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionContributee.java
@@ -188,7 +188,7 @@ public class ObjectActionContributee extends ObjectActionImpl implements Contrib
bulkInteractionContext != null &&
bulkInteractionContext.getInvokedAs() == null) {
- bulkInteractionContext.setInvokedAs(BulkInteractionContext.InvokedAs.REGULAR);
+ bulkInteractionContext.setActionInvokedAs(BulkInteractionContext.InvokedAs.REGULAR);
bulkInteractionContext.setDomainObjects(Collections.singletonList(contributee.getObject()));
}