You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2021/04/01 08:54:54 UTC
[isis] branch master updated: ISIS-2573: make Interaction
attributes part of API (applib)
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new 6d0aee4 ISIS-2573: make Interaction attributes part of API (applib)
6d0aee4 is described below
commit 6d0aee427a59031ec9f2e45c11230fa33382281a
Author: Andi Huber <ah...@apache.org>
AuthorDate: Thu Apr 1 10:54:42 2021 +0200
ISIS-2573: make Interaction attributes part of API (applib)
---
.../java/org/apache/isis/applib/services/iactn/Interaction.java | 8 ++++++--
.../apache/isis/core/metamodel/execution/InteractionInternal.java | 6 ++----
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/iactn/Interaction.java b/api/applib/src/main/java/org/apache/isis/applib/services/iactn/Interaction.java
index 54197a1..72bda27 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/iactn/Interaction.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/iactn/Interaction.java
@@ -21,8 +21,9 @@ package org.apache.isis.applib.services.iactn;
import java.util.UUID;
-import org.apache.isis.applib.services.command.Command;
import org.apache.isis.applib.mixins.system.HasInteractionId;
+import org.apache.isis.applib.services.command.Command;
+import org.apache.isis.commons.having.HasTypeSpecificAttributes;
/**
* Represents an action invocation or property modification, resulting in some
@@ -52,7 +53,10 @@ import org.apache.isis.applib.mixins.system.HasInteractionId;
*
* @since 1.x revised for 2.0 {@index}
*/
-public interface Interaction extends HasInteractionId {
+public interface Interaction
+extends
+ HasInteractionId,
+ HasTypeSpecificAttributes {
/**
* The unique identifier of this interaction (inherited from
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/execution/InteractionInternal.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/execution/InteractionInternal.java
index bce0c1c..3b9fd73 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/execution/InteractionInternal.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/execution/InteractionInternal.java
@@ -28,15 +28,13 @@ import org.apache.isis.applib.services.iactn.Execution;
import org.apache.isis.applib.services.iactn.Interaction;
import org.apache.isis.applib.services.iactn.PropertyEdit;
import org.apache.isis.applib.services.metrics.MetricsService;
-import org.apache.isis.commons.having.HasTypeSpecificAttributes;
+import org.apache.isis.applib.services.wrapper.WrapperFactory;
/**
* @since 2.0
*/
public interface InteractionInternal
-extends
- Interaction,
- HasTypeSpecificAttributes {
+extends Interaction {
/**
* (Modeled after {@link Callable}), is the implementation