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/09/21 09:52:30 UTC
[2/2] isis git commit: ISIS-1044: reinstating deleted API,
else backward compatibility broken within isisaddons' excel wicket
component.
ISIS-1044: reinstating deleted API, else backward compatibility broken within isisaddons' excel wicket component.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/3895a5e2
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/3895a5e2
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/3895a5e2
Branch: refs/heads/master
Commit: 3895a5e24cbe1fdbc3498bcad8830e2fd60e91a0
Parents: ed1a459
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Mon Sep 21 08:51:48 2015 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Mon Sep 21 08:51:48 2015 +0100
----------------------------------------------------------------------
.../isis/core/metamodel/spec/feature/ObjectAssociation.java | 5 +++++
.../specloader/specimpl/ObjectAssociationAbstract.java | 6 ++++++
2 files changed, 11 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/3895a5e2/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAssociation.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAssociation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAssociation.java
index 8e32a1d..bef0e02 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAssociation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAssociation.java
@@ -45,6 +45,11 @@ import org.apache.isis.core.metamodel.specloader.specimpl.ContributeeMember;
public interface ObjectAssociation extends ObjectMember, CurrentHolder {
/**
+ * As per {@link #get(ObjectAdapter, InteractionInitiatedBy)}, with {@link InteractionInitiatedBy#USER}.
+ */
+ ObjectAdapter get(final ObjectAdapter owner);
+
+ /**
* Returns the referenced {@link ObjectAdapter} for the owning
* {@link ObjectAdapter}.
*
http://git-wip-us.apache.org/repos/asf/isis/blob/3895a5e2/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectAssociationAbstract.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectAssociationAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectAssociationAbstract.java
index fd738bf..8787b5d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectAssociationAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectAssociationAbstract.java
@@ -49,6 +49,12 @@ public abstract class ObjectAssociationAbstract extends ObjectMemberAbstract imp
}
@Override
+ public ObjectAdapter get(
+ final ObjectAdapter fromObject) {
+ return get(fromObject, InteractionInitiatedBy.USER);
+ }
+
+ @Override
public abstract ObjectAdapter get(
final ObjectAdapter fromObject,
final InteractionInitiatedBy interactionInitiatedBy);