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:35 UTC
[3/5] isis git commit: ISIS-1241: Merge branch 'ISIS-1241' of
https://github.com/sanderginn/isis into ISIS-1241_pr-36
ISIS-1241: Merge branch 'ISIS-1241' of https://github.com/sanderginn/isis into 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/f14944c4
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/f14944c4
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/f14944c4
Branch: refs/heads/master
Commit: f14944c496873d4db4f801d6193bcebf372b2db3
Parents: 0845ef6 0086935
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Fri Nov 27 07:49:20 2015 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Fri Nov 27 07:49:20 2015 +0000
----------------------------------------------------------------------
.../org/apache/isis/applib/annotation/Parameter.java | 2 +-
.../org/apache/isis/applib/annotation/Property.java | 4 ++++
.../regex/annotation/RegExFacetOnTypeAnnotation.java | 4 ++--
.../annotation/RegExFacetOnTypeAnnotationFactory.java | 3 ++-
.../facets/objectvalue/regex/RegExFacet.java | 1 +
.../facets/objectvalue/regex/RegExFacetAbstract.java | 12 ++++++++++--
.../regex/RegExFacetForParameterAnnotation.java | 7 ++++---
.../RegExFacetFromRegExAnnotationOnParameter.java | 7 ++++---
.../regex/RegExFacetForPropertyAnnotation.java | 8 +++++---
.../regex/RegExFacetForRegExAnnotationOnProperty.java | 7 ++++---
.../validate/regex/RegExFacetAnnotationTest.java | 14 +++++++-------
11 files changed, 44 insertions(+), 25 deletions(-)
----------------------------------------------------------------------