This is an automated email from the ASF dual-hosted git repository. danhaywood pushed a commit to branch ISIS-2222 in repository https://gitbox.apache.org/repos/asf/isis.git
commit 0adb60e6375e42c46fb7454fb851036e87944117 Author: danhaywood <[email protected]> AuthorDate: Sun Aug 30 16:20:35 2020 +0100 ISIS-2222: fixes Property regexPattern view models --- .../PropertyRegexPatternVm_updateWithParameterLayout.java | 2 +- .../regexPattern/RegexPatternEmailComMetaAnnotation.java | 14 ++++++++++++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/examples/demo/domain/src/main/java/demoapp/dom/annotDomain/Property/regexPattern/PropertyRegexPatternVm_updateWithParameterLayout.java b/examples/demo/domain/src/main/java/demoapp/dom/annotDomain/Property/regexPattern/PropertyRegexPatternVm_updateWithParameterLayout.java index 50e8727..197ab32 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/annotDomain/Property/regexPattern/PropertyRegexPatternVm_updateWithParameterLayout.java +++ b/examples/demo/domain/src/main/java/demoapp/dom/annotDomain/Property/regexPattern/PropertyRegexPatternVm_updateWithParameterLayout.java @@ -28,7 +28,7 @@ public class PropertyRegexPatternVm_updateWithParameterLayout { ) @ParameterLayout( describedAs = - "@Parameter(regexPattern = \"^[^@+]@[^\\.+]\\.com$\")" + "@Parameter(regexPattern = \"^\\w+@\\w+[.]com$\")" ) final String emailAddressParameterUsingAnnotation) { propertyRegexPatternVm.setEmailAddressPropertyUsingAnnotation(emailAddressParameterUsingAnnotation); diff --git a/examples/demo/domain/src/main/java/demoapp/dom/annotDomain/Property/regexPattern/RegexPatternEmailComMetaAnnotation.java b/examples/demo/domain/src/main/java/demoapp/dom/annotDomain/Property/regexPattern/RegexPatternEmailComMetaAnnotation.java index f1e28e5..278087f 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/annotDomain/Property/regexPattern/RegexPatternEmailComMetaAnnotation.java +++ b/examples/demo/domain/src/main/java/demoapp/dom/annotDomain/Property/regexPattern/RegexPatternEmailComMetaAnnotation.java @@ -8,19 +8,29 @@ import java.lang.annotation.Target; import java.util.regex.Pattern; import org.apache.isis.applib.annotation.Parameter; +import org.apache.isis.applib.annotation.ParameterLayout; import org.apache.isis.applib.annotation.Property; +import org.apache.isis.applib.annotation.PropertyLayout; //tag::class[] @Property( - regexPattern = "^[^@+]@[^\\.+]\\.com$" // <.> + regexPattern = "^\\w+@\\w+[.]com$" // <.> , regexPatternReplacement = "Must be .com email address" // <.> , regexPatternFlags = Pattern.CASE_INSENSITIVE // <.> ) @Parameter( - regexPattern = "^[^@+]@[^\\.+]\\.com$" // <.> + regexPattern = "^\\w+@\\w+[.]com$" // <.> , regexPatternReplacement = "Must be .com email address" // <.> , regexPatternFlags = Pattern.CASE_INSENSITIVE // <.> ) +@PropertyLayout( + describedAs = + "@Parameter(regexPattern = \"^\\w+@\\w+[.]com$\")" +) +@ParameterLayout( + describedAs = + "@Parameter(regexPattern = \"^\\w+@\\w+[.]com$\")" +) @Inherited @Target({ ElementType.METHOD, ElementType.FIELD, // <.>
