You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@causeway.apache.org by ah...@apache.org on 2023/09/20 02:58:09 UTC
[causeway] branch master updated: CAUSEWAY-3582: revert commit that breaks action buttons that have no fa-icon
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/causeway.git
The following commit(s) were added to refs/heads/master by this push:
new c2786b7cea CAUSEWAY-3582: revert commit that breaks action buttons that have no fa-icon
c2786b7cea is described below
commit c2786b7ceae63b5e0a94349ff618e2012c12b2d3
Author: Andi Huber <ah...@apache.org>
AuthorDate: Wed Sep 20 04:58:02 2023 +0200
CAUSEWAY-3582: revert commit that breaks action buttons that have no
fa-icon
---
.../annotprop/CssClassFaFacetOnMemberFromConfiguredRegex.java | 9 ++++-----
1 file changed, 4 insertions(+), 5 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 a3fbe39025..cf62f2d5a6 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
@@ -113,16 +113,15 @@ extends CssClassFaImperativeFacetAbstract {
// -- HELPER
- private String faIconForNameElseFallbackToBlank(final String name) {
-
+ private Optional<String> faIconForName(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 faIcon;
+ return _Strings.nonEmpty(faIcon);
}
}
- return "fa-blank"; // to produce aligned menu items.
+ return Optional.empty();
}
private Optional<CssClassFaFactory> cssClassFaFactoryForConfiguredRegexIfPossible(
@@ -155,7 +154,7 @@ extends CssClassFaImperativeFacetAbstract {
final String memberFriendlyName) {
return _Strings.nonEmpty(memberFriendlyName)
- .map(this::faIconForNameElseFallbackToBlank)
+ .flatMap(this::faIconForName)
.map(_faIcon->{
final String faIcon;
final CssClassFaPosition position;