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 2018/12/18 14:06:31 UTC
[isis] 01/04: ISIS-2050: only contribute associations to entities
and view models.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-2050
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 939c275ab3275090f47f35fe6ebe4c6ef1dad327
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Dec 18 14:01:35 2018 +0000
ISIS-2050: only contribute associations to entities and view models.
Same logic as contributing actions.
---
.../org/apache/isis/core/commons/config/ConfigPropertyAbstract.java | 4 ++--
.../metamodel/specloader/specimpl/ObjectSpecificationAbstract.java | 6 ++++--
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/commons/config/ConfigPropertyAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/commons/config/ConfigPropertyAbstract.java
index 40d9487..46070df 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/commons/config/ConfigPropertyAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/commons/config/ConfigPropertyAbstract.java
@@ -2,8 +2,8 @@ package org.apache.isis.core.commons.config;
public abstract class ConfigPropertyAbstract<T> implements ConfigProperty<T> {
final String key;
- final boolean defaultValue;
- public ConfigPropertyAbstract(final String key, final boolean defaultValue) {
+ final T defaultValue;
+ public ConfigPropertyAbstract(final String key, final T defaultValue) {
this.key = key;
this.defaultValue = defaultValue;
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java
index a238827..479c029 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java
@@ -661,8 +661,10 @@ public abstract class ObjectSpecificationAbstract extends FacetHolderImpl implem
if(contributed.isIncluded() && !contributeeAndMixedInAssociationsAdded) {
synchronized (this.associations) {
List<ObjectAssociation> associations = Lists.newArrayList(this.associations);
- associations.addAll(createContributeeAssociations());
- associations.addAll(createMixedInAssociations());
+ if(isPersistenceCapableOrViewModel()) {
+ associations.addAll(createContributeeAssociations());
+ associations.addAll(createMixedInAssociations());
+ }
sortAndUpdateAssociations(associations);
contributeeAndMixedInAssociationsAdded = true;
}