[isis] branch master updated: ISIS-3206: polishing

[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 fb8426402c ISIS-3206: polishing
fb8426402c is described below

commit fb8426402c4ae2f87bd095ec098839c3f0552dc7
Author: Andi Huber <ahu...@apache.org>
AuthorDate: Thu Sep 8 12:52:26 2022 +0200

    ISIS-3206: polishing
---
 .../apache/isis/core/metamodel/inspect/model/MMTreeAdapter.java   | 8 +++++---
 .../services/metamodel/ShadowedFactetAttributeAnnotator.java      | 4 ++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git 
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/inspect/model/MMTreeAdapter.java
 
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/inspect/model/MMTreeAdapter.java
index efcc83b9e6..d38ee3efd0 100644
--- 
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/inspect/model/MMTreeAdapter.java
+++ 
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/inspect/model/MMTreeAdapter.java
@@ -21,23 +21,25 @@ package org.apache.isis.core.metamodel.inspect.model;
 import java.util.Optional;
 import java.util.stream.Stream;
 
+import org.apache.isis.applib.annotation.Domain;
 import org.apache.isis.applib.graph.tree.TreeAdapter;
 import org.apache.isis.commons.internal.base._NullSafe;
 
+@Domain.Exclude
 public class MMTreeAdapter implements TreeAdapter<MMNode> {
 
     @Override
-    public Optional<MMNode> parentOf(MMNode node) {
+    public Optional<MMNode> parentOf(final MMNode node) {
         return Optional.ofNullable(node.getParentNode());
     }
 
     @Override
-    public int childCountOf(MMNode node) {
+    public int childCountOf(final MMNode node) {
         return _NullSafe.size(node.getChildNodes());
     }
 
     @Override
-    public Stream<MMNode> childrenOf(MMNode node) {
+    public Stream<MMNode> childrenOf(final MMNode node) {
         return _NullSafe.stream(node.getChildNodes());
     }
 
diff --git 
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/metamodel/ShadowedFactetAttributeAnnotator.java
 
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/metamodel/ShadowedFactetAttributeAnnotator.java
index 443a79b739..4986c36fd6 100644
--- 
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/metamodel/ShadowedFactetAttributeAnnotator.java
+++ 
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/metamodel/ShadowedFactetAttributeAnnotator.java
@@ -70,9 +70,9 @@ public class ShadowedFactetAttributeAnnotator implements 
MetaModelAnnotator {
                     if(attributeName.equals("precedence")) {
                         return; // skip
                     }
-                    addAttributeAnnotation(facetType, attributeName, 
String.format("%s (shadowed %s)",
+                    addAttributeAnnotation(facetType, attributeName, 
String.format("'%s' from %s)",
                             str,
-                            shadowedFacet.getClass().getName()));
+                            config().abbrev(shadowedFacet.getClass())));
                 });
             });
         });