[isis] branch master updated: ISIS-1720: use the new 'canonical' naming for collections when inferring a name a BS3Tab that contains same collection

[ah...@apache.org]

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 381b2a6  ISIS-1720: use the new 'canonical' naming for collections when inferring a name a BS3Tab that contains same collection
381b2a6 is described below

commit 381b2a6f6a5cd2f75643927fb1ba6b46b83a8348
Author: andi-huber <ah...@apache.org>
AuthorDate: Thu Jul 1 19:04:29 2021 +0200

    ISIS-1720: use the new 'canonical' naming for collections when inferring
    a name a BS3Tab that contains same collection
---
 .../bootstrap3/GridSystemServiceBootstrap.java     | 26 +++-------------------
 1 file changed, 3 insertions(+), 23 deletions(-)

diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/bootstrap3/GridSystemServiceBootstrap.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/bootstrap3/GridSystemServiceBootstrap.java
index 4bf28e9..6af68dc 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/bootstrap3/GridSystemServiceBootstrap.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/bootstrap3/GridSystemServiceBootstrap.java
@@ -50,16 +50,13 @@ import org.apache.isis.applib.layout.grid.bootstrap3.BS3Tab;
 import org.apache.isis.applib.layout.grid.bootstrap3.BS3TabGroup;
 import org.apache.isis.applib.layout.grid.bootstrap3.Size;
 import org.apache.isis.applib.mixins.layout.LayoutMixinConstants;
-import org.apache.isis.applib.services.i18n.TranslationContext;
 import org.apache.isis.commons.internal.base._NullSafe;
-import org.apache.isis.commons.internal.base._Strings;
 import org.apache.isis.commons.internal.collections._Lists;
 import org.apache.isis.commons.internal.collections._Maps;
 import org.apache.isis.commons.internal.collections._Sets;
 import org.apache.isis.commons.internal.exceptions._Exceptions;
 import org.apache.isis.commons.internal.resources._Resources;
 import org.apache.isis.core.metamodel.facets.actions.position.ActionPositionFacet;
-import org.apache.isis.core.metamodel.facets.all.named.MemberNamedFacet;
 import org.apache.isis.core.metamodel.facets.members.layout.group.GroupIdAndName;
 import org.apache.isis.core.metamodel.facets.members.layout.group.LayoutGroupFacet;
 import org.apache.isis.core.metamodel.layout.LayoutFacetUtil.LayoutDataFactory;
@@ -488,26 +485,9 @@ public class GridSystemServiceBootstrap extends GridSystemServiceAbstract<BS3Gri
             final BS3Tab bs3Tab = new BS3Tab();
 
             val feature = objectSpec.getCollectionElseFail(collectionId);
-            val featureId = feature.getFeatureIdentifier();
-
-            val featureFriendlyName =
-            feature.lookupNonFallbackFacet(MemberNamedFacet.class)
-            .map(MemberNamedFacet::getSpecialization)
-            .map(specialization->
-                specialization.fold(
-                        hasStaticText->hasStaticText.translated(),
-                        //TODO[ISIS-1720] imperative naming not supported here, is this an issue?
-                        hasImperativeText->null))
-            .filter(_Strings::isNotEmpty)
-            .orElseGet(()->
-                // falling back to member-natural-name
-                objectSpec.getTranslationService()
-                        .translate(
-                                TranslationContext.forTabIdentifier(featureId),
-                                featureId.getMemberNaturalName())
-            );
-
-            bs3Tab.setName(featureFriendlyName);
+            val featureCanonicalFriendlyName = feature.getCanonicalFriendlyName();
+
+            bs3Tab.setName(featureCanonicalFriendlyName);
             tabGroup.getTabs().add(bs3Tab);
             bs3Tab.setOwner(tabGroup);