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
commit cbeb4cb9a498dec9f506d3e3ecc5435c3528c9b6 Author: Andi Huber <[email protected]> AuthorDate: Sat May 21 09:09:39 2022 +0200 ISIS-3049: fixes CalendarEvent demo case with ViewModel --- .../isis/applib/value/semantics/ValueDecomposition.java | 11 +++++++++++ .../org/apache/isis/core/metamodel/spec/ManagedObject.java | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/api/applib/src/main/java/org/apache/isis/applib/value/semantics/ValueDecomposition.java b/api/applib/src/main/java/org/apache/isis/applib/value/semantics/ValueDecomposition.java index c7d5faa847..bc14745ed4 100644 --- a/api/applib/src/main/java/org/apache/isis/applib/value/semantics/ValueDecomposition.java +++ b/api/applib/src/main/java/org/apache/isis/applib/value/semantics/ValueDecomposition.java @@ -49,6 +49,17 @@ implements return new ValueDecomposition(Either.right(typedTupleDto)); } + /** + * In support of JAXB de-serialization, + * returns an unspecified type. + * (Introduced for the CalendarEvent demo to work.) + * @deprecated not sure why we are hitting this; remove eventually + */ + @Deprecated + public ValueDecomposition() { + this(Either.left(new ValueWithTypeDto())); + } + @Getter private final Either<ValueWithTypeDto, TypedTupleDto> either; // used by RO-Viewer to render values diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ManagedObject.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ManagedObject.java index 03f5e8ea8b..87ef6931cf 100644 --- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ManagedObject.java +++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ManagedObject.java @@ -151,7 +151,7 @@ public interface ManagedObject { public default String htmlString( final @Nullable ObjectFeature feature) { - if(getSpecification()==null) { + if(!ManagedObjects.isSpecified(this)) { return ""; }
