This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch release-2.0.0-M1-RC2
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 321e618b61f5472f48310593ca9ebdcb71122b77
Merge: 63c2856 5d9f4f7
Author: danhaywood <d...@haywood-associates.co.uk>
AuthorDate: Wed Jul 25 07:19:42 2018 +0100
ISIS-1966: Merge branch 'maint-1.16.2'
# Conflicts:
#
core/runtime/src/main/java/org/apache/isis/core/runtime/services/publish/PublishedObjectsDefault.java
.../RepresentsInteractionMemberExecution.java | 35 ++++++++++++++++++++++
.../services/publish/PublishedObjectsDefault.java | 13 ++++++--
.../application/simpleapp/webapp/lib/.gitignore | 5 ----
3 files changed, 45 insertions(+), 8 deletions(-)
diff --cc
core/runtime/src/main/java/org/apache/isis/core/runtime/services/publish/PublishedObjectsDefault.java
index 9c59317,208a356..8e32446
---
a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/publish/PublishedObjectsDefault.java
+++
b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/publish/PublishedObjectsDefault.java
@@@ -32,7 -32,8 +32,9 @@@ import com.google.common.collect.Immuta
import com.google.common.collect.Multimaps;
import org.apache.isis.applib.annotation.Programmatic;
+import org.apache.isis.applib.annotation.PublishingChangeKind;
+ import org.apache.isis.applib.annotation.PublishedObject;
+ import org.apache.isis.applib.services.RepresentsInteractionMemberExecution;
import org.apache.isis.applib.services.publish.PublishedObjects;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.oid.RootOid;
@@@ -45,9 -46,9 +47,9 @@@ import org.apache.isis.schema.utils.jax
/**
* Captures which objects were created, updated or deleted in the course of a
transaction.
*/
- public class PublishedObjectsDefault implements PublishedObjects {
+ public class PublishedObjectsDefault implements PublishedObjects,
RepresentsInteractionMemberExecution {
- //region > constructor, fields
+ // -- constructor, fields
private UUID transactionUuid;
private final int sequence;
private final String userName;
@@@ -72,10 -73,10 +74,9 @@@
this.numberObjectPropertiesModified = numberObjectPropertiesModified;
this.changesByAdapter = changesByAdapter;
}
- //endregion
-
- // -- transactionId, completedAt, user
- //region > transactionId, sequence completedAt, user
++ // -- transactionId, sequence completedAt, user
@Programmatic
@Override
public UUID getTransactionId() {
