You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@causeway.apache.org by da...@apache.org on 2023/09/19 07:41:21 UTC
[causeway] 02/04: CAUSEWAY-3582 : always returns 'fa-blank' as the fa icon if none has been defined otherwise.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/causeway.git
commit bd7c884e41dad0061a501e6ee9e64267531d1b8b
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Sep 19 06:46:49 2023 +0100
CAUSEWAY-3582 : always returns 'fa-blank' as the fa icon if none has been defined otherwise.
This should align icons.
---
.../annotprop/CssClassFaFacetOnMemberFromConfiguredRegex.java | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/cssclassfa/annotprop/CssClassFaFacetOnMemberFromConfiguredRegex.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/cssclassfa/annotprop/CssClassFaFacetOnMemberFromConfiguredRegex.java
index 2ac5b2a75b..9a77d443ac 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/cssclassfa/annotprop/CssClassFaFacetOnMemberFromConfiguredRegex.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/cssclassfa/annotprop/CssClassFaFacetOnMemberFromConfiguredRegex.java
@@ -34,6 +34,7 @@ import org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaFa
import org.apache.causeway.core.metamodel.facets.members.cssclassfa.CssClassFaImperativeFacetAbstract;
import org.apache.causeway.core.metamodel.object.ManagedObject;
import org.apache.causeway.core.metamodel.object.ManagedObjects;
+import org.apache.causeway.core.metamodel.postprocessors.all.CssOnActionFromConfiguredRegexPostProcessor;
import org.apache.causeway.core.metamodel.spec.ObjectSpecification;
import org.apache.causeway.core.metamodel.spec.feature.ObjectAction;
@@ -112,16 +113,16 @@ extends CssClassFaImperativeFacetAbstract {
// -- HELPER
- private Optional<String> faIconIfAnyFor(final String name) {
+ private String faIconIfAnyFor(final String name) {
for (Map.Entry<Pattern, String> entry : faIconByPattern.entrySet()) {
final Pattern pattern = entry.getKey();
final String faIcon = entry.getValue();
if (pattern.matcher(name).matches()) {
- return Optional.ofNullable(faIcon);
+ return faIcon;
}
}
- return Optional.empty();
+ return "fa-blank"; // to produce aligned menu items.
}
private Optional<CssClassFaFactory> cssClassFaFactoryForConfiguredRegexIfPossible(
@@ -154,7 +155,7 @@ extends CssClassFaImperativeFacetAbstract {
final String memberFriendlyName) {
return _Strings.nonEmpty(memberFriendlyName)
- .flatMap(this::faIconIfAnyFor)
+ .map(this::faIconIfAnyFor)
.map(_faIcon->{
final String faIcon;
final CssClassFaPosition position;