You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2015/11/27 09:25:37 UTC
[5/5] isis git commit: ISIS-1241: Merge branch 'ISIS-1241_pr-36'
ISIS-1241: Merge branch 'ISIS-1241_pr-36'
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/651fb1bb
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/651fb1bb
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/651fb1bb
Branch: refs/heads/master
Commit: 651fb1bba2b3facd75cf2b991664f933a63756db
Parents: 0845ef6 9c20aa9
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Fri Nov 27 08:24:39 2015 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Fri Nov 27 08:24:39 2015 +0000
----------------------------------------------------------------------
...annotations_manpage-Parameter_regexPattern.adoc | 14 ++++++++++----
..._annotations_manpage-Property_regexPattern.adoc | 17 ++++++++++++-----
.../apache/isis/applib/annotation/Parameter.java | 2 +-
.../apache/isis/applib/annotation/Property.java | 4 ++++
.../annotation/RegExFacetOnTypeAnnotation.java | 4 ++--
.../RegExFacetOnTypeAnnotationFactory.java | 3 ++-
.../facets/objectvalue/regex/RegExFacet.java | 1 +
.../objectvalue/regex/RegExFacetAbstract.java | 12 ++++++++++--
.../regex/RegExFacetForParameterAnnotation.java | 7 ++++---
.../RegExFacetFromRegExAnnotationOnParameter.java | 7 ++++---
.../regex/RegExFacetForPropertyAnnotation.java | 8 +++++---
.../RegExFacetForRegExAnnotationOnProperty.java | 7 ++++---
.../validate/regex/RegExFacetAnnotationTest.java | 14 +++++++-------
13 files changed, 66 insertions(+), 34 deletions(-)
----------------------------------------------------------------------