You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2021/07/20 12:14:51 UTC
[isis] branch master updated: ISIS-2811: make fa-icon pattern
matching case-insensitive
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 8b915a5 ISIS-2811: make fa-icon pattern matching case-insensitive
8b915a5 is described below
commit 8b915a5f5023a0443d793ff411d551635b810636
Author: Andi Huber <ah...@apache.org>
AuthorDate: Tue Jul 20 14:14:41 2021 +0200
ISIS-2811: make fa-icon pattern matching case-insensitive
---
.../apache/isis/core/config/IsisConfiguration.java | 28 ++++++++++++----------
...CssClassFaFacetOnMemberFromConfiguredRegex.java | 1 +
2 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/core/config/src/main/java/org/apache/isis/core/config/IsisConfiguration.java b/core/config/src/main/java/org/apache/isis/core/config/IsisConfiguration.java
index 63c069b..f693a85 100644
--- a/core/config/src/main/java/org/apache/isis/core/config/IsisConfiguration.java
+++ b/core/config/src/main/java/org/apache/isis/core/config/IsisConfiguration.java
@@ -34,6 +34,12 @@ import java.util.Optional;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
+import static java.lang.annotation.ElementType.ANNOTATION_TYPE;
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
import javax.activation.DataSource;
import javax.validation.Constraint;
import javax.validation.ConstraintValidator;
@@ -42,6 +48,10 @@ import javax.validation.Payload;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.core.env.ConfigurableEnvironment;
+import org.springframework.validation.annotation.Validated;
+
import org.apache.isis.applib.IsisModuleApplib;
import org.apache.isis.applib.annotation.ActionLayout;
import org.apache.isis.applib.annotation.DomainObject;
@@ -56,6 +66,8 @@ import org.apache.isis.applib.services.userreg.EmailNotificationService;
import org.apache.isis.applib.services.userreg.UserRegistrationService;
import org.apache.isis.applib.services.userui.UserMenu;
import org.apache.isis.commons.internal.context._Context;
+import org.apache.isis.core.config.IsisConfiguration.Core;
+import org.apache.isis.core.config.IsisConfiguration.Viewer;
import org.apache.isis.core.config.metamodel.facets.DefaultViewConfiguration;
import org.apache.isis.core.config.metamodel.facets.EditingObjectsConfiguration;
import org.apache.isis.core.config.metamodel.facets.PublishingPolicies.ActionPublishingPolicy;
@@ -64,15 +76,7 @@ import org.apache.isis.core.config.metamodel.facets.PublishingPolicies.PropertyP
import org.apache.isis.core.config.metamodel.services.ApplicationFeaturesInitConfiguration;
import org.apache.isis.core.config.metamodel.specloader.IntrospectionMode;
import org.apache.isis.core.config.viewer.wicket.DialogMode;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.core.env.ConfigurableEnvironment;
-import org.springframework.validation.annotation.Validated;
-import static java.lang.annotation.ElementType.ANNOTATION_TYPE;
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.PARAMETER;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
import lombok.Data;
import lombok.Getter;
import lombok.Setter;
@@ -167,8 +171,8 @@ public class IsisConfiguration {
*/
private String loginSuccessUrl = "/wicket";
}
-
-
+
+
}
@@ -3411,14 +3415,14 @@ public class IsisConfiguration {
private final Pattern pattern;
private final String string;
}
- private static Map<Pattern, String> asMap(String... mappings) {
+ private static Map<Pattern, String> asMap(final String... mappings) {
return new LinkedHashMap<>(Arrays.stream(mappings).map(mapping -> {
final String[] parts = mapping.split(":");
if (parts.length != 2) {
return null;
}
try {
- return new PatternToString(Pattern.compile(parts[0]), parts[1]);
+ return new PatternToString(Pattern.compile(parts[0], Pattern.CASE_INSENSITIVE), parts[1]);
} catch(Exception ex) {
return null;
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/cssclassfa/annotprop/CssClassFaFacetOnMemberFromConfiguredRegex.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/cssclassfa/annotprop/CssClassFaFacetOnMemberFromConfiguredRegex.java
index 8980c7d..adbd615 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/cssclassfa/annotprop/CssClassFaFacetOnMemberFromConfiguredRegex.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/cssclassfa/annotprop/CssClassFaFacetOnMemberFromConfiguredRegex.java
@@ -25,6 +25,7 @@ import java.util.function.Supplier;
import java.util.regex.Pattern;
import java.util.stream.Stream;
+import org.apache.isis.applib.annotation.ActionLayout;
import org.apache.isis.applib.layout.component.CssClassFaPosition;
import org.apache.isis.commons.internal.base._Strings;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;