[isis] branch master updated: ISIS-2602: more polishing

[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 c333e46  ISIS-2602: more polishing
c333e46 is described below

commit c333e46a80b0ab7c49f99e356361c8c72ffc9f92
Author: ahuber@apache.org <ah...@luna>
AuthorDate: Fri Apr 9 11:15:17 2021 +0200

    ISIS-2602: more polishing
---
 .../actions/layout/ActionLayoutFacetFactory.java   |  8 ++++----
 .../members/layout/group/GroupIdAndName.java       | 23 +++++++++++-----------
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/ActionLayoutFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/ActionLayoutFacetFactory.java
index 040ebae..c020e4a 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/ActionLayoutFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/ActionLayoutFacetFactory.java
@@ -69,13 +69,13 @@ extends FacetFactoryAbstract {
         DescribedAsFacet describedAsFacet = DescribedAsFacetForActionLayoutAnnotation.create(actionLayoutIfAny, facetHolder);
         super.addFacet(describedAsFacet);
 
-        // fieldSet
-        LayoutGroupFacet fieldSetFacet = LayoutGroupFacetFromActionLayoutAnnotation.create(actionLayoutIfAny, facetHolder);
-        super.addFacet(fieldSetFacet);
-        
         // hidden
         HiddenFacet hiddenFacet = HiddenFacetForActionLayoutAnnotation.create(actionLayoutIfAny, facetHolder);
         super.addFacet(hiddenFacet);
+        
+        // layoutGroupFacet
+        LayoutGroupFacet layoutGroupFacet = LayoutGroupFacetFromActionLayoutAnnotation.create(actionLayoutIfAny, facetHolder);
+        super.addFacet(layoutGroupFacet);
 
         // named
         NamedFacet namedFacet = NamedFacetForActionLayoutAnnotation.create(actionLayoutIfAny, facetHolder);
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/layout/group/GroupIdAndName.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/layout/group/GroupIdAndName.java
index 82cbba6..53decfc 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/layout/group/GroupIdAndName.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/layout/group/GroupIdAndName.java
@@ -44,12 +44,12 @@ implements
     private static final long serialVersionUID = 1L;
 
     /**
-     * Id of a layout group (a <i>FieldSet</i> or a <i>Collection</i>).
+     * Id of a layout group (a <i>FieldSet</i> or a <i>Collection panel</i>).
      */
     private final @NonNull String id;
     
     /**
-     * (Friendly) name of a layout group (a <i>FieldSet</i> or a <i>Collection</i>).
+     * (Friendly) name of a layout group (a <i>FieldSet</i> or a <i>Collection panel</i>).
      */
     private final @NonNull String name;
 
@@ -108,10 +108,10 @@ implements
     
     // -- HELPER
     
-    /* 
-     * if id is missing tries to infer it;
-     * if name is missing tries to infer it;
-     * if cannot reason about a usable id, returns Optional.empty()
+    /** 
+     * if id is missing tries to infer it;<br>
+     * if name is missing tries to infer it;<br>
+     * if cannot reason about a usable id, returns Optional.empty()<br>
      */
     private static Optional<GroupIdAndName> inferIfOneMissing(
             final @Nullable String _id, 
@@ -139,7 +139,9 @@ implements
         return Optional.of(GroupIdAndName.of(id, name));
     }
     
-    // note: this is a copy of the original logic from GridSystemServiceBS3
+    /**
+     * @implNote this is a copy of the original logic from GridSystemServiceBS3
+     */
     private static @NonNull String inferIdFromName(final @NonNull String name) {
         if(name.isEmpty()) {
             return name;
@@ -148,7 +150,9 @@ implements
         return Character.toLowerCase(c) + name.substring(1).replaceAll("\\s+", "");
     }
     
-    // note: could potentially be improved to work similar as the title service
+    /**
+     * @implNote could potentially be improved to work similar as the title service
+     */
     private static @NonNull String inferNameFromId(final @NonNull String id) {
         return _Strings.asNaturalName2.apply(id);
     }
@@ -169,8 +173,5 @@ implements
                     : idOrName;
         
     }
-
-    
-
     
 }