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 2017/08/03 15:44:28 UTC
[3/9] isis git commit: ISIS-1689:
ObjectSpecIdFacetDerivedFromClassName is now a derived facet so will not
clobber object spec id facet from JDO PersistenceCapable#schema
ISIS-1689: ObjectSpecIdFacetDerivedFromClassName is now a derived facet so will not clobber object spec id facet from JDO PersistenceCapable#schema
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/5dbbb2ba
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/5dbbb2ba
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/5dbbb2ba
Branch: refs/heads/master
Commit: 5dbbb2ba925847aa36a948129076e62d1ceb8956
Parents: eae978e
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Thu Aug 3 14:34:35 2017 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Thu Aug 3 14:34:35 2017 +0100
----------------------------------------------------------------------
.../objectspecid/ObjectSpecIdFacetAbstract.java | 14 ++++++++++----
.../ObjectSpecIdFacetDerivedFromClassName.java | 2 +-
2 files changed, 11 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/5dbbb2ba/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/objectspecid/ObjectSpecIdFacetAbstract.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/objectspecid/ObjectSpecIdFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/objectspecid/ObjectSpecIdFacetAbstract.java
index f2c1355..89fda4a 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/objectspecid/ObjectSpecIdFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/objectspecid/ObjectSpecIdFacetAbstract.java
@@ -33,12 +33,18 @@ public abstract class ObjectSpecIdFacetAbstract extends
private final ObjectSpecId value;
- public ObjectSpecIdFacetAbstract(final String value,
- final FacetHolder holder) {
- super(ObjectSpecIdFacetAbstract.type(), holder, Derivation.NOT_DERIVED);
- this.value = ObjectSpecId.of(value);
+ public ObjectSpecIdFacetAbstract(final String value, final FacetHolder holder) {
+ this(value, holder, Derivation.NOT_DERIVED);
}
+ public ObjectSpecIdFacetAbstract(
+ final String value,
+ final FacetHolder holder,
+ final Derivation derivation) {
+ super(ObjectSpecIdFacetAbstract.type(), holder, derivation);
+ this.value = ObjectSpecId.of(value);
+ }
+
public ObjectSpecId value() {
return value;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/5dbbb2ba/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/objectspecid/classname/ObjectSpecIdFacetDerivedFromClassName.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/objectspecid/classname/ObjectSpecIdFacetDerivedFromClassName.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/objectspecid/classname/ObjectSpecIdFacetDerivedFromClassName.java
index dba2248..0e5b289 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/objectspecid/classname/ObjectSpecIdFacetDerivedFromClassName.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/objectspecid/classname/ObjectSpecIdFacetDerivedFromClassName.java
@@ -28,6 +28,6 @@ public class ObjectSpecIdFacetDerivedFromClassName extends ObjectSpecIdFacetAbst
this(cls.getCanonicalName(), holder);
}
public ObjectSpecIdFacetDerivedFromClassName(final String value, final FacetHolder holder) {
- super(value, holder);
+ super(value, holder, Derivation.DERIVED);
}
}