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 2021/05/10 10:52:11 UTC
[isis] branch master updated: ISIS-2648: restore previous behavior
and leave a note
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 6bbff53 ISIS-2648: restore previous behavior and leave a note
6bbff53 is described below
commit 6bbff539225c347bd4d19bc070a6797a894dfb24
Author: Andi Huber <ah...@apache.org>
AuthorDate: Mon May 10 12:51:56 2021 +0200
ISIS-2648: restore previous behavior and leave a note
---
.../java/org/apache/isis/core/metamodel/facets/WhereValueFacet.java | 3 ++-
.../isis/core/metamodel/specloader/specimpl/ObjectMemberAbstract.java | 4 ----
2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/WhereValueFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/WhereValueFacet.java
index 2bd6eb4..3841cbc 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/WhereValueFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/WhereValueFacet.java
@@ -36,7 +36,8 @@ public interface WhereValueFacet extends Facet {
static Optional<Where> where(
final @NonNull FacetHolder facetHolder,
final @NonNull Class<? extends WhereValueFacet> facetType) {
- return facetHolder.lookupFacet(facetType)
+ //TODO why do we treat fallback facets as no-op?
+ return facetHolder.lookupNonFallbackFacet(facetType)
.map(WhereValueFacet::where);
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectMemberAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectMemberAbstract.java
index 87021ce..fc5aa34 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectMemberAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectMemberAbstract.java
@@ -165,11 +165,7 @@ implements ObjectMember, HasMetaModelContext, HasFacetHolder {
@Override
public boolean isAlwaysHidden() {
-
return HiddenFacet.isAlwaysHidden(getFacetHolder());
-
-
-
}
/**