You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2020/01/21 15:45:05 UTC
[isis] branch master updated: ISIS-2158: fixes regression
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
The following commit(s) were added to refs/heads/master by this push:
new f4c9187 ISIS-2158: fixes regression
f4c9187 is described below
commit f4c9187c57bc27cb892798a3ab344f96049b8533
Author: Andi Huber <ah...@apache.org>
AuthorDate: Tue Jan 21 16:44:56 2020 +0100
ISIS-2158: fixes regression
---
.../recreatable/RecreatableObjectFacetForDomainObjectAnnotation.java | 4 +---
examples/demo/src/main/java/demoapp/dom/tree/TreeDemo.java | 2 +-
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/recreatable/RecreatableObjectFacetForDomainObjectAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/recreatable/RecreatableObjectFacetForDomainObjectAnnotation.java
index d51408c..764e0de 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/recreatable/RecreatableObjectFacetForDomainObjectAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/recreatable/RecreatableObjectFacetForDomainObjectAnnotation.java
@@ -49,9 +49,7 @@ extends RecreatableObjectFacetDeclarativeInitializingAbstract {
case VIEW_MODEL:
case EXTERNAL_ENTITY:
case INMEMORY_ENTITY:
- if (!holder.containsFacet(ViewModelFacet.class)) {
- return null;
- }
+
return new RecreatableObjectFacetForDomainObjectAnnotation(
holder, postConstructMethodCache);
}
diff --git a/examples/demo/src/main/java/demoapp/dom/tree/TreeDemo.java b/examples/demo/src/main/java/demoapp/dom/tree/TreeDemo.java
index 90b39aa..40ef045 100644
--- a/examples/demo/src/main/java/demoapp/dom/tree/TreeDemo.java
+++ b/examples/demo/src/main/java/demoapp/dom/tree/TreeDemo.java
@@ -52,8 +52,8 @@ public class TreeDemo extends DemoStub {
*
* @return the demo tree view model for standalone rendering (as action result)
*/
- @Action
@ActionLayout(cssClassFa="fa-tree")
+ @Action
public TreeNode<FileNode> standalone(){
return createTree();
}