[isis] branch master updated: ISIS-3268: fixes facet precedence too high for LabelAtFacetFromLayoutConfiguration

[ahuber]

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 abdca3e379 ISIS-3268: fixes facet precedence too high for 
LabelAtFacetFromLayoutConfiguration
abdca3e379 is described below

commit abdca3e3791c85817821ffa9e0a92ce18c16f1b7
Author: Andi Huber <ahu...@apache.org>
AuthorDate: Wed Nov 9 09:02:21 2022 +0100

    ISIS-3268: fixes facet precedence too high for
    LabelAtFacetFromLayoutConfiguration
    
    - must be lower than precedence of facets from annotations
---
 .../core/metamodel/facets/fallback/FallbackFacetFactory.java        | 3 ---
 .../facets/fallback/LabelAtFacetFromLayoutConfiguration.java        | 5 +++--
 .../metamodel/facets/objectvalue/labelat/LabelAtFacetAbstract.java  | 6 +++++-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git 
a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/fallback/FallbackFacetFactory.java
 
b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/fallback/FallbackFacetFactory.java
index a168c21749..02bd8e8497 100644
--- 
a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/fallback/FallbackFacetFactory.java
+++ 
b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/fallback/FallbackFacetFactory.java
@@ -26,9 +26,6 @@ import javax.inject.Inject;
 import org.apache.causeway.core.metamodel.context.MetaModelContext;
 import org.apache.causeway.core.metamodel.facetapi.Facet;
 import org.apache.causeway.core.metamodel.facetapi.FeatureType;
-import 
org.apache.causeway.core.metamodel.facets.FacetFactory.ProcessClassContext;
-import 
org.apache.causeway.core.metamodel.facets.FacetFactory.ProcessMethodContext;
-import 
org.apache.causeway.core.metamodel.facets.FacetFactory.ProcessParameterContext;
 import org.apache.causeway.core.metamodel.facets.FacetFactoryAbstract;
 import org.apache.causeway.core.metamodel.facets.FacetedMethod;
 import org.apache.causeway.core.metamodel.facets.TypedHolder;
diff --git 
a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/fallback/LabelAtFacetFromLayoutConfiguration.java
 
b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/fallback/LabelAtFacetFromLayoutConfiguration.java
index 26cccb85d1..595664c6f2 100644
--- 
a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/fallback/LabelAtFacetFromLayoutConfiguration.java
+++ 
b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/fallback/LabelAtFacetFromLayoutConfiguration.java
@@ -24,8 +24,9 @@ import 
org.apache.causeway.core.metamodel.facets.objectvalue.labelat.LabelAtFace
 
 public class LabelAtFacetFromLayoutConfiguration extends LabelAtFacetAbstract {
 
-    public LabelAtFacetFromLayoutConfiguration(LabelPosition labelPosition, 
FacetHolder facetHolder) {
-        super(labelPosition, facetHolder);
+    public LabelAtFacetFromLayoutConfiguration(
+            final LabelPosition labelPosition, final FacetHolder facetHolder) {
+        super(labelPosition, facetHolder, Precedence.LOW);
     }
 
 }
diff --git 
a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/objectvalue/labelat/LabelAtFacetAbstract.java
 
b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/objectvalue/labelat/LabelAtFacetAbstract.java
index e6a1a1a238..40fe33231e 100644
--- 
a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/objectvalue/labelat/LabelAtFacetAbstract.java
+++ 
b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/objectvalue/labelat/LabelAtFacetAbstract.java
@@ -38,7 +38,11 @@ implements LabelAtFacet {
     private final LabelPosition value;
 
     public LabelAtFacetAbstract(final LabelPosition value, final FacetHolder 
holder) {
-        super(type(), holder);
+        this(value, holder, Precedence.DEFAULT);
+    }
+
+    public LabelAtFacetAbstract(final LabelPosition value, final FacetHolder 
holder, final Precedence precedence) {
+        super(type(), holder, precedence);
         this.value = value;
     }